3.48.21

* closes:#62

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
+		httrack-doc.html lang.def README.md

Makefile.in

@@ -54,7 +54,8 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	compile config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_zlib.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -133,6 +134,7 @@ 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@
@@ -141,14 +143,12 @@ 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,6 +162,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -217,7 +218,6 @@ 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 +268,7 @@ SUBDIRS = src man m4 libtest templates lang html tests
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = INSTALL.Linux \
 		gpl-fr.txt license.txt greetings.txt history.txt \
-		httrack-doc.html lang.def
+		httrack-doc.html lang.def README.md
 
 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-2013 Xavier Roche and other contributors
+Copyright (C) 1998-2015 Xavier Roche and other contributors
 
 Welcome to HTTrack Website Copier!
 

README.md

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

@@ -0,0 +1,343 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-03-05.13; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    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
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook '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"
+# End:

config.h.in

@@ -6,9 +6,15 @@
 /* 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
 
@@ -33,6 +39,9 @@
 /* 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
 
@@ -42,6 +51,10 @@
 /* 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
 
@@ -63,16 +76,13 @@
 /* Check for libsocket */
 #undef LIBSOCKET
 
-/* LLint format */
-#undef LLINT_FORMAT
-
-/* LLint type */
-#undef LLINT_TYPE
-
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
 #undef LT_OBJDIR
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 
@@ -112,5 +122,43 @@
 /* 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,18 +1,46 @@
-AC_INIT([httrack], [3.47.27], [roche+packaging@httrack.com], [httrack], [http://www.httrack.com/])
+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_CONFIG_SRCDIR(src/httrack.c)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE
-VERSION_INFO="2:47:0"
+AM_INIT_AUTOMAKE([subdir-objects])
+VERSION_INFO="2:48:0"
 AM_MAINTAINER_MODE
-
-AC_PREREQ(2.50)
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CC
-AC_PROG_CXX
+AM_PROG_CC_C_O
 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)
@@ -20,13 +48,43 @@ AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
 # Export .libs or equivalent.
 AC_SUBST(LT_CV_OBJDIR,$lt_cv_objdir)
 
-### Default CFLAGS
-DEFAULT_CFLAGS="-Wall -Wcast-align -Wstrict-prototypes \
--Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
--Wnested-externs -D_REENTRANT"
-AC_SUBST(DEFAULT_CFLAGS)
+# 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"
+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])
+
 ### Check for platform
 #case $host in
 #AIX) AC_DEFINE(HTS_PLATFORM, 1, [Defined to build under AIX]);;
@@ -39,83 +97,31 @@ AC_SUBST(VERSION_INFO)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 
-### Check LLint format
-if test x"$ac_cv_sizeof_long" = x"8"; then
-AC_MSG_CHECKING(long printf format)
-AC_TRY_RUN([#include <stdio.h>
-main() { long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); 
-         exit (c != 1234 || d != -1); }
-],
-	[AC_MSG_RESULT(found)
-	AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format])
-	AC_DEFINE(LLINT_TYPE,long int,[LLint type])
-],
-[
-AC_TRY_RUN([#include <stdio.h>
-main() { long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); 
-         exit (c != 1234 || d != -1); }
-],
-[
-	AC_MSG_RESULT(found)
-	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
-	AC_DEFINE(LLINT_TYPE,long int,[LLint type])
-],
-[
-	AC_MSG_RESULT(no)
-	AC_MSG_RESULT(assuming not on target machine)
-	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
-	AC_DEFINE(LLINT_TYPE,int,[LLint type])
-])
-])
-elif test x"$ac_cv_sizeof_long_long" = x"8"; then
-AC_MSG_CHECKING(long long printf format)
-AC_TRY_RUN([#include <stdio.h>
-main() { long long int c = -1, d = -1; char* f = "%lld"; sscanf("1234", f, &c, &d); 
-         exit (c != 1234 || d != -1); }
-],
-	[AC_MSG_RESULT(found) 
-	AC_DEFINE(LLINT_FORMAT,"%lld",[LLint format])
-	AC_DEFINE(LLINT_TYPE,long long int,[LLint type])
-],
-[	
-AC_TRY_RUN([#include <stdio.h>
-main() { long long int c = -1, d = -1; char* f = "%ld"; sscanf("1234", f, &c, &d); 
-         exit (c != 1234 || d != -1); }
-],
-[
-	AC_MSG_RESULT(found)
-	AC_DEFINE(LLINT_FORMAT,"%ld",[LLint format])
-	AC_DEFINE(LLINT_TYPE,long long int,[LLint type])
-],
-[
-AC_TRY_RUN([#include <stdio.h>
-main() { long long int c = -1, d = -1; char* f = "%d"; sscanf("1234", f, &c, &d); 
-         exit (c != 1234 || d != -1); }
-],
-[
-	AC_MSG_RESULT(found)
-	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
-	AC_DEFINE(LLINT_TYPE,long long int,[LLint type])
-],
-[
-	AC_MSG_RESULT(no)
-	AC_MSG_RESULT(assuming not on target machine)
-	AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
-	AC_DEFINE(LLINT_TYPE,int,[LLint type])
-])
-])
-])
-else
-AC_DEFINE(LLINT_FORMAT,"%d",[LLint format])
-AC_DEFINE(LLINT_TYPE,int,[LLint type])
-fi
-
 ### check for in_addr_t
 AC_CHECK_TYPE(in_addr_t,
 AC_DEFINE(HTS_DO_NOT_REDEFINE_in_addr_t,,[Check for in_addr_t]),
 AC_MSG_WARN([*** in_addr_t not found]),
 [#include <sys/types.h>
-#include <netinet/in.h>])
+#include <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()
@@ -147,9 +153,16 @@ 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="-lcrypto -lssl"
+	OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
 	AC_DEFINE(HTS_USEOPENSSL, 1, [Check for OpenSSL])
 	],
 	[
@@ -160,6 +173,7 @@ AC_CHECK_LIB(ssl, SSL_library_init,
 	fi
 	]
 	)
+LIBS=$SAVE_LIBS
 AC_SUBST(OPENSSL_LIBS)
 fi
 
@@ -224,6 +238,10 @@ 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,3 +1,172 @@
+httrack (3.48.21-1) unstable; urgency=low
+
+  * Updated to 3.48.21 (3.48-21)
+
+ -- Xavier Roche <xavier@debian.org>  Sat, 14 Mar 2015 15:02:53 +0100
+
+httrack (3.48.20-1) unstable; urgency=low
+
+  * Updated to 3.48.20 (3.48-20)
+    closes:#765019
+
+ -- Xavier Roche <xavier@debian.org>  Wed, 15 Oct 2014 21:37:54 +0200
+
+httrack (3.48.19-1) unstable; urgency=low
+
+  * Updated to 3.48.19 (3.48-19)
+    closes:#756328
+
+ -- Xavier Roche <xavier@debian.org>  Mon, 28 Jul 2014 22:52:19 +0200
+
+httrack (3.48.18-1) unstable; urgency=low
+
+  * Updated to 3.48.18 (3.48-18)
+    closes:#755107
+
+ -- Xavier Roche <xavier@debian.org>  Thu, 17 Jul 2014 21:35:10 +0200
+
+httrack (3.48.17-1) unstable; urgency=low
+
+  * Updated to 3.48.17 (3.48-17)
+
+ -- Xavier Roche <xavier@debian.org>  Sat, 12 Jul 2014 15:21:14 +0200
+
+httrack (3.48.16-1) unstable; urgency=low
+
+  * Updated to 3.48.16 (3.48-16)
+    fixed FTBFS on ARM/MIPS again
+
+ -- Xavier Roche <xavier@debian.org>  Wed, 09 Jul 2014 07:02:08 +0200
+
+httrack (3.48.15-1) unstable; urgency=low
+
+  * Updated to 3.48.15 (3.48-15)
+    fixed FTBFS on ARM/MIPS
+
+ -- Xavier Roche <xavier@debian.org>  Tue, 08 Jul 2014 22:05:14 +0200
+
+httrack (3.48.14-1) unstable; urgency=low
+
+  * Updated to 3.48.14 (3.48-14)
+
+ -- Xavier Roche <xavier@debian.org>  Tue, 08 Jul 2014 20:36:55 +0200
+
+httrack (3.48.13-1) unstable; urgency=low
+
+  * Updated to 3.48.13 (3.48-13)
+    closes:#750931
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 08 Jun 2014 16:22:13 +0200
+
+httrack (3.48.12-1) unstable; urgency=low
+
+  * Updated to 3.48.12 (3.48-12)
+    Should fix missing/broken .h for libhttrack-dev
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 08 Jun 2014 13:19:49 +0200
+
+httrack (3.48.11-1) unstable; urgency=low
+
+  * Updated to 3.48.11 (3.48-11)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 06 Jun 2014 17:58:12 +0200
+
+httrack (3.48.10-1) unstable; urgency=low
+
+  * Updated to 3.48.10 (3.48-10)
+
+ -- Xavier Roche <xavier@debian.org>  Wed, 04 Jun 2014 19:00:07 +0200
+
+httrack (3.48.9-1) unstable; urgency=low
+
+  * Updated to 3.48.9 (3.48-9)
+
+ -- Xavier Roche <xavier@debian.org>  Wed, 21 May 2014 19:22:04 +0200
+
+httrack (3.48.8-1) unstable; urgency=low
+
+  * Updated to 3.48.8 (3.48-8)
+
+ -- Xavier Roche <xavier@debian.org>  Thu, 15 May 2014 19:21:21 +0200
+
+httrack (3.48.7-1) unstable; urgency=low
+
+  * Updated to 3.48.7 (3.48-7)
+
+ -- Xavier Roche <xavier@debian.org>  Wed, 14 May 2014 19:51:57 +0200
+
+httrack (3.48.6-1) unstable; urgency=low
+
+  * Updated to 3.48.6 (3.48-6)
+
+ -- Xavier Roche <xavier@debian.org>  Tue, 13 May 2014 21:23:02 +0200
+
+httrack (3.48.5-1) unstable; urgency=low
+
+  * Updated to 3.48.5 (3.48-5)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 02 May 2014 16:37:08 +0200
+
+httrack (3.48.4-1) unstable; urgency=low
+
+  * Updated to 3.48.4 (3.48-4)
+    closes:#746173
+
+ -- Xavier Roche <xavier@debian.org>  Sun, 27 Apr 2014 18:48:57 +0200
+
+httrack (3.48.3-1) unstable; urgency=low
+
+  * Updated to 3.48.3 (3.48-3)
+
+ -- Xavier Roche <xavier@debian.org>  Fri, 11 Apr 2014 20:31:21 +0200
+
+httrack (3.48.2-1) unstable; urgency=low
+
+  * Updated to 3.48.2 (3.48-2)
+
+ -- Xavier Roche <xavier@debian.org>  Thu, 10 Apr 2014 18:30:08 +0200
+
+httrack (3.48.1-5) unstable; urgency=low
+
+  * Really call dh_autoreconf, fix configure dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 16 Apr 2014 14:46:20 +0200
+
+httrack (3.48.1-4) unstable; urgency=low
+
+  * Cleanup in dependencies
+
+ -- Xavier Roche <xavier@debian.org>  Tue, 15 Apr 2014 22:13:19 +0200
+
+httrack (3.48.1-3) unstable; urgency=low
+
+  * Fixed FTBFS due to a missing Build-Depends: dh-autoreconf
+
+ -- Xavier Roche <xavier@debian.org>  Tue, 15 Apr 2014 21:32:03 +0200
+
+httrack (3.48.1-2) unstable; urgency=low
+
+  * Fixed removal of .a files even on architectures where .a are libraries
+    closes:#744594
+    Enable verosity of unit tests
+    Call dh_autoreconf_clean before dh_clean
+
+ -- Xavier Roche <xavier@debian.org>  Tue, 15 Apr 2014 21:02:14 +0200
+
+httrack (3.48.1-1) unstable; urgency=low
+
+  * Updated to 3.48.1 (3.48-1)
+
+ -- Xavier Roche <xavier@debian.org>  Wed, 09 Apr 2014 21:02:08 +0200
+
+httrack (3.47.27-3) unstable; urgency=low
+
+  * Do not depend on automake1.9 but on automake instead
+    see: http://lists.debian.org/debian-devel/2013/05/msg01459.html
+    closes:#724390
+
+ -- Xavier Roche <xavier@debian.org>  Thu, 26 Sep 2013 20:09:12 +0200
+
 httrack (3.47.27-1) unstable; urgency=low
 
   * Updated to 3.47.27 (3.47-27)

debian/control

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

debian/copyright

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

debian/libhttrack2.files

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

debian/rules

@@ -23,11 +23,16 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
+# as suggested by Simon McVittie
+# (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=744380)
+override_dh_auto_test:
+	VERBOSE=1 dh_auto_test
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	autoreconf -v -i
+	dh_autoreconf
 	# note: dpkg-buildflags to be removed when compat=9
 	dh_auto_configure -- --enable-online-unit-tests=auto $(shell dpkg-buildflags --export=configure)
 
@@ -50,6 +55,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	dh_auto_clean
+	dh_autoreconf_clean
 	dh_clean
 
 install: build
@@ -79,10 +85,17 @@ install: build
 	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/
 	mv $(CURDIR)/debian/httrack/usr/bin/htsserver \
 		$(CURDIR)/debian/httrack/usr/lib/httrack/
-	rm -f $(CURDIR)/debian/httrack/usr/lib/*.a
+	# remove *.la (https://wiki.debian.org/ReleaseGoals/LAFileRemoval)
 	rm -f $(CURDIR)/debian/httrack/usr/lib/*.la
-	rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.a
 	rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.la
+	# remove *.a unless we do not have *.so files
+	# see BUG #744594
+	if ls $(CURDIR)/debian/httrack/usr/lib/*.so >/dev/null 2>/dev/null ; then \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/*.a ; \
+	fi
+	if ls $(CURDIR)/debian/httrack/usr/lib/httrack/*.so >/dev/null 2>/dev/null ; then \
+		rm -f $(CURDIR)/debian/httrack/usr/lib/httrack/*.a ; \
+	fi
 	mv $(CURDIR)/debian/httrack/usr/lib/httrack/lib* \
 		$(CURDIR)/debian/httrack/usr/share/httrack/libtest/
 	mkdir -p $(CURDIR)/debian/httrack/usr/lib/httrack/libtest

history.txt

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

html/Makefile.am

@@ -7,7 +7,6 @@ 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
@@ -20,9 +19,8 @@ HelpHtmldiv_DATA = div/search.sh
 HelpHtmlimg_DATA  = img/*
 HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
-WebHtml_DATA = server/*.html
+WebHtml_DATA = server/*.html server/*.js server/*.css
 WebHtmlimages_DATA = server/images/*
-WebHtmlsfx_DATA = server/sfx/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
@@ -33,7 +31,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) $(WebHtmlsfx_DATA) \
+	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \
 	$(WebPixmap_DATA) $(WebIcon16x16_DATA) $(WebIcon32x32_DATA) $(WebIcon48x48_DATA) \
 	$(VFolderEntry_DATA) \
 	httrack.css
@@ -41,6 +39,6 @@ EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
 install-data-hook:
 	if test ! -L $(DESTDIR)$(prefix)/share/httrack/html ; then \
 		( cd $(DESTDIR)$(prefix)/share/httrack \
-			&& $(LN_S) $(htmldir) html \
+			&& $(LN_S) ../doc/httrack 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)$(WebHtmlsfxdir)" "$(DESTDIR)$(WebIcon16x16dir)" \
-	"$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" \
-	"$(DESTDIR)$(WebPixmapdir)"
+	"$(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) $(WebHtmlsfx_DATA) $(WebIcon16x16_DATA) \
+	$(WebHtmlimages_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,14 +123,12 @@ 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@
@@ -144,6 +142,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -199,7 +198,6 @@ 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@
@@ -254,7 +252,6 @@ 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
@@ -266,9 +263,8 @@ HelpHtmldiv_DATA = div/search.sh
 HelpHtmlimg_DATA = img/*
 HelpHtmlimages_DATA = images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
-WebHtml_DATA = server/*.html
+WebHtml_DATA = server/*.html server/*.js server/*.css
 WebHtmlimages_DATA = server/images/*
-WebHtmlsfx_DATA = server/sfx/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
@@ -278,7 +274,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) $(WebHtmlsfx_DATA) \
+	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \
 	$(WebPixmap_DATA) $(WebIcon16x16_DATA) $(WebIcon32x32_DATA) $(WebIcon48x48_DATA) \
 	$(VFolderEntry_DATA) \
 	httrack.css
@@ -511,27 +507,6 @@ 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=; \
@@ -657,7 +632,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)$(WebHtmlsfxdir)" "$(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)$(WebIcon16x16dir)" "$(DESTDIR)$(WebIcon32x32dir)" "$(DESTDIR)$(WebIcon48x48dir)" "$(DESTDIR)$(WebPixmapdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -714,9 +689,9 @@ install-data-am: install-HelpHtmlDATA install-HelpHtmlTxtDATA \
 	install-HelpHtmldivDATA install-HelpHtmlimagesDATA \
 	install-HelpHtmlimgDATA install-HelpHtmlrootDATA \
 	install-VFolderEntryDATA install-WebHtmlDATA \
-	install-WebHtmlimagesDATA install-WebHtmlsfxDATA \
-	install-WebIcon16x16DATA install-WebIcon32x32DATA \
-	install-WebIcon48x48DATA install-WebPixmapDATA
+	install-WebHtmlimagesDATA install-WebIcon16x16DATA \
+	install-WebIcon32x32DATA install-WebIcon48x48DATA \
+	install-WebPixmapDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
@@ -765,9 +740,9 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	uninstall-HelpHtmldivDATA uninstall-HelpHtmlimagesDATA \
 	uninstall-HelpHtmlimgDATA uninstall-HelpHtmlrootDATA \
 	uninstall-VFolderEntryDATA uninstall-WebHtmlDATA \
-	uninstall-WebHtmlimagesDATA uninstall-WebHtmlsfxDATA \
-	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
-	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA
+	uninstall-WebHtmlimagesDATA uninstall-WebIcon16x16DATA \
+	uninstall-WebIcon32x32DATA uninstall-WebIcon48x48DATA \
+	uninstall-WebPixmapDATA
 
 .MAKE: install-am install-data-am install-strip
 
@@ -778,30 +753,28 @@ uninstall-am: uninstall-HelpHtmlDATA uninstall-HelpHtmlTxtDATA \
 	install-HelpHtmlimagesDATA install-HelpHtmlimgDATA \
 	install-HelpHtmlrootDATA install-VFolderEntryDATA \
 	install-WebHtmlDATA install-WebHtmlimagesDATA \
-	install-WebHtmlsfxDATA install-WebIcon16x16DATA \
-	install-WebIcon32x32DATA install-WebIcon48x48DATA \
-	install-WebPixmapDATA install-am install-data install-data-am \
-	install-data-hook install-dvi install-dvi-am install-exec \
-	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-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-WebHtmlsfxDATA \
-	uninstall-WebIcon16x16DATA uninstall-WebIcon32x32DATA \
-	uninstall-WebIcon48x48DATA uninstall-WebPixmapDATA \
-	uninstall-am
+	uninstall-WebHtmlimagesDATA 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) $(htmldir) html \
+			&& $(LN_S) ../doc/httrack html \
 		) \
 	fi
 

html/httrack.man.html

@@ -52,8 +52,7 @@ 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;%O,
-&minus;&minus;chroot</b> ] [ <b>&minus;w,
+&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,
@@ -70,8 +69,6 @@ url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O,
 &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;%mN,
-&minus;&minus;max&minus;mms&minus;time[=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> ] [
@@ -111,7 +108,9 @@ url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O,
 &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;C,
+&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> ]
@@ -144,8 +143,7 @@ url ]... [ &minus;filter ]... [ +filter ]... [ &minus;O,
 <b>&minus;%!,
 &minus;&minus;disable&minus;security&minus;limits</b> ] [
 <b>&minus;V, &minus;&minus;userdef&minus;cmd</b> ] [
-<b>&minus;%U, &minus;&minus;user</b> ] [ <b>&minus;%W,
-&minus;&minus;callback</b> ] [ <b>&minus;K,
+<b>&minus;%W, &minus;&minus;callback</b> ] [ <b>&minus;K,
 &minus;&minus;keep&minus;links[=N]</b> ] [</p>
 
 <h2>DESCRIPTION
@@ -227,29 +225,17 @@ options:</b></p>
        cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
 <td width="11%"></td>
-<td width="4%">
+<td width="3%">
 
 
 <p>&minus;O</p></td>
-<td width="7%"></td>
+<td width="8%"></td>
 <td width="78%">
 
 
 <p>path for mirror/logfiles+cache (&minus;O path
 mirror[,path cache and logfiles]) (&minus;&minus;path
 &lt;param&gt;)</p> </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="4%">
-
-
-<p>&minus;%O</p></td>
-<td width="7%"></td>
-<td width="78%">
-
-
-<p>chroot path to, must be r00t (&minus;%O root path)
-(&minus;&minus;chroot &lt;param&gt;)</p></td></tr>
 </table>
 
 <p style="margin-left:11%; margin-top: 1em"><b>Action
@@ -475,19 +461,6 @@ hour) (&minus;&minus;max&minus;time[=N])</p></td></tr>
 
 <p>pause transfer if N bytes reached, and wait until lock
 file is deleted (&minus;&minus;max&minus;pause[=N])</p></td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="9%">
-
-
-<p>&minus;%mN</p></td>
-<td width="2%"></td>
-<td width="78%">
-
-
-<p>maximum mms stream download time in seconds (60=1
-minute, 3600=1 hour)
-(&minus;&minus;max&minus;mms&minus;time[=N])</p> </td></tr>
 </table>
 
 <p style="margin-left:11%; margin-top: 1em"><b>Flow
@@ -1049,6 +1022,32 @@ HTTP headers (&minus;F &quot;user&minus;agent name&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>
+<td width="4%">
+
+
+<p>&minus;%a</p></td>
+<td width="7%"></td>
+<td width="78%">
+
+
+<p>accepted formats (&minus;%a
+&quot;text/html,image/png;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>
+<td width="4%">
+
+
+<p>&minus;%X</p></td>
+<td width="7%"></td>
+<td width="78%">
+
+
+<p>additional HTTP header line (&minus;%X
+&quot;X&minus;Magic: 42&quot; (&minus;&minus;headers
+&lt;param&gt;)</p> </td></tr>
 </table>
 
 <p style="margin-left:11%; margin-top: 1em"><b>Log, index,
@@ -1632,18 +1631,6 @@ memory boundary checks)
 
 <p>generate transfer rate statictics every minutes
 (&minus;&minus;debug&minus;ratestats)</p> </td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="6%">
-
-
-<p>&minus;#!</p></td>
-<td width="5%"></td>
-<td width="78%">
-
-
-<p>execute a shell command (&minus;#! &quot;echo
-hello&quot;) (&minus;&minus;exec &lt;param&gt;)</p></td></tr>
 </table>
 
 <p style="margin-left:11%; margin-top: 1em"><b>Dangerous
@@ -1707,25 +1694,13 @@ specific options:</b></p>
 
 
 <p style="margin-top: 1em">execute system command after
-each files ($0 is the filename: &minus;V &quot;rm &quot;)
+each files ($0 is the filename: &minus;V &quot;rm \$0&quot;)
 (&minus;&minus;userdef&minus;cmd &lt;param&gt;)</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="4%">
 
 
-<p>&minus;%U</p></td>
-<td width="7%"></td>
-<td width="78%">
-
-
-<p>run the engine with another id when called as root
-(&minus;%U smith) (&minus;&minus;user &lt;param&gt;)</p></td></tr>
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="4%">
-
-
 <p>&minus;%W</p></td>
 <td width="7%"></td>
 <td width="78%">
@@ -2311,7 +2286,7 @@ other information you deem necessary.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Copyright (C)
-1998-2013 Xavier Roche and other contributors</p>
+1998-2015 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,79 +6,9 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -139,7 +69,7 @@ ${LANG_K3} : ${HTTRACK_WEB}
 
 <form>
 <input type="button" value="OK" onClick="window.close();"
-			onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </form>
 

html/server/addurl.html

@@ -6,75 +6,10 @@
 	<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; }
 
 
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -138,7 +73,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -150,7 +85,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -183,20 +118,20 @@ ${do:end-if}
 <form action="${thisfile}" name="form">
 <table width="100%">
 <tr><td>${LANG_T2}</td><td>http://<input name="urladr"
-			onMouseOver="info('${LANG_T10}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_T12}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_T12}'); return true" onMouseOut="info('&nbsp;'); return true"
 ></td></tr>
 <tr><td>${LANG_T6}:</td><td><input name="urlpass"
-			onMouseOver="info('${LANG_T13}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_T14}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_T14}'); return true" onMouseOut="info('&nbsp;'); return true"
 ></td></tr>
 </table>
 
@@ -204,7 +139,7 @@ ${do:end-if}
 
 <tr><td>
 <input type="button" value="OK" onClick="if (do_add()) { window.close(); }"
-			onMouseOver="info('${LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPOK}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 

html/server/error.html

@@ -6,75 +6,8 @@
 	<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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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,79 +6,8 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--

html/server/finished.html

@@ -6,75 +6,8 @@
 	<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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -103,7 +36,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -115,7 +48,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -135,9 +68,6 @@ ${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>
@@ -147,23 +77,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} : 
@@ -177,7 +107,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">
 
@@ -191,8 +121,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,79 +6,8 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -129,7 +58,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('${LANG_G21}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_G21}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 ${LANG_O16}...
 </a>
@@ -138,7 +67,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('${LANG_O17}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O17}'); return true" onMouseOut="info('&nbsp;'); return true"
    >
 ${LANG_O17}...
 </a>
@@ -149,7 +78,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
    >
 ${LANG_P16}
 </a>

html/server/index.html

@@ -6,75 +6,8 @@
 	<meta name="keywords" content="${LANG_METAKEYW}" />
 	<title>HTTrack Website Copier - Offline Browser</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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -110,7 +43,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -122,7 +55,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -180,7 +113,7 @@ ${LANG_THANKYOU}!
 
 	<tr><td align="right">
 		<input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> "
-			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 	</td></tr>
 </table>

html/server/option1.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,7 +96,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="">
@@ -178,34 +107,34 @@ ${do:end-if}
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
 <tr><td><input type="checkbox" name="parseall"  ${checked:parseall} 
-			onMouseOver="info('${LANG_I1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I31}</td></tr>
 <tr><td><input type="checkbox" name="link"      ${checked:link}     
-			onMouseOver="info('${LANG_I2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I2}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I32}</td></tr>
 <tr><td><input type="checkbox" name="testall"   ${checked:testall}  
-			onMouseOver="info('${LANG_I2b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I2b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I32b}</td></tr>
 <tr><td><input type="checkbox" name="htmlfirst" ${checked:htmlfirst}
-			onMouseOver="info('${LANG_I2c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/option10.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,37 +96,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('${LANG_G14}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_G14}'); return true" onMouseOut="info('&nbsp;'); return true"
 >:
 <input name="portprox" value="${portprox}" size="4"
-			onMouseOver="info('${LANG_G15}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_G15}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 <br>
 
 <input type="checkbox" name="ftpprox" ${checked:ftpprox}
-			onMouseOver="info('${LANG_G15c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/option11.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,7 +96,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>
@@ -183,97 +112,97 @@ ${LANG_W3}
 
 <td align="left">
 <input name="ext1" value="${ext1}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext2" value="${ext2}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext3" value="${ext3}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext4" value="${ext4}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext5" value="${ext5}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext6" value="${ext6}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext7" value="${ext7}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
 <td align="left">
 <input name="ext8" value="${ext8}"
-			onMouseOver="info('${LANG_W4}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_W5}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 <!-- -->
@@ -283,21 +212,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('${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>
+<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>
 
 </form>
 

html/server/option2.html

@@ -6,94 +6,23 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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>
 
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,62 +96,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('${LANG_I3}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_I4}'); return true" onMouseOut="info('&nbsp;'); return true"
+		onMouseOver="info('${html:LANG_I4}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
-<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>
+<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>
 </td></tr>
 <tr><td><input type="checkbox" name="errpage"   ${checked:errpage}  
-			onMouseOver="info('${LANG_I9}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I9}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I38}</td></tr>
 <tr><td><input type="checkbox" name="external"  ${checked:external} 
-			onMouseOver="info('${LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I56}</td></tr>
 <tr><td><input type="checkbox" name="hidepwd"   ${checked:hidepwd}  
-			onMouseOver="info('${LANG_I30}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I30}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I66}</td></tr>
 <tr><td><input type="checkbox" name="hidequery" ${checked:hidequery}
-			onMouseOver="info('${LANG_I30b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I30b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I67}</td></tr>
 <tr><td><input type="checkbox" name="nopurge"   ${checked:nopurge}  
-			onMouseOver="info('${LANG_I1a}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+				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>
 
 </form>

html/server/option2b.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -141,7 +70,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -155,7 +84,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}">
 
@@ -170,25 +99,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('${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>
-
+
+<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>
+
 </form>
 
 </td></tr>

html/server/option3.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,7 +96,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>
@@ -175,7 +104,7 @@ ${LANG_I40c}
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
 <tr><td><input type="checkbox" name="cache" ${checked:cache}
-			onMouseOver="info('${LANG_I5}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I5}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I34}</td></tr>
 </table>
 <br>
@@ -183,7 +112,7 @@ ${LANG_I40c}
 ${LANG_I39}
 <br>
 <select name="filter"
-			onMouseOver="info('${LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I29}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:filter:LISTDEF_4}
 </select>
@@ -192,7 +121,7 @@ ${listid:filter:LISTDEF_4}
 ${LANG_I40}
 <br>
 <select name="travel"
-			onMouseOver="info('${LANG_I11}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I11}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:travel:LISTDEF_5}
 </select>
@@ -201,7 +130,7 @@ ${listid:travel:LISTDEF_5}
 ${LANG_I40b}
 <br>
 <select name="travel2"
-			onMouseOver="info('${LANG_I11b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I11b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:travel2:LISTDEF_6}
 </select>
@@ -210,7 +139,7 @@ ${listid:travel2:LISTDEF_6}
 ${LANG_I40e}
 <br>
 <select name="travel3"
-			onMouseOver="info('${LANG_I11c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I11c}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 ${listid:travel3:LISTDEF_11}
 </select>
@@ -219,26 +148,26 @@ ${listid:travel3:LISTDEF_11}
 <!-- checkboxes -->
 <table border="0" width="100%" cellspacing="0">
 <tr><td><input type="checkbox" name="windebug" ${checked:windebug} 
-			onMouseOver="info('${LANG_I1h}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/option4.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,7 +96,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">
 
@@ -175,11 +104,11 @@ ${do:end-if}
 ${LANG_I44}
 </td><td>
 <input name="connexion" value="${connexion}" size="4"
-			onMouseOver="info('${LANG_I12}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I12}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr><tr><td></td><td>
 <input type="checkbox" name="ka" ${checked:ka} 
-			onMouseOver="info('${LANG_I47f}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I47f}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I47e}
 </td></tr>
 
@@ -187,11 +116,11 @@ ${LANG_I44}
 ${LANG_I47d}
 </td><td>
 <input name="timeout" value="${timeout}" size="4"
-			onMouseOver="info('${LANG_I13}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I13}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr><tr><td></td><td>
 <input type="checkbox" name="remt" ${checked:remt} 
-			onMouseOver="info('${LANG_I14}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I14}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I45}
 </td></tr>
 
@@ -199,7 +128,7 @@ ${LANG_I47d}
 ${LANG_I48}
 </td><td>
 <input name="retry" value="${retry}" size="4"
-			onMouseOver="info('${LANG_I17}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I17}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -207,31 +136,31 @@ ${LANG_I48}
 ${LANG_I46}
 </td><td>
 <input name="rate" value="${rate}" size="4"
-			onMouseOver="info('${LANG_I15}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I15}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr><tr><td></td><td>
 <input type="checkbox" name="rems" ${checked:rems} 
-			onMouseOver="info('${LANG_I16}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/option5.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,7 +96,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">
 
@@ -175,7 +104,7 @@ ${do:end-if}
 ${LANG_G32}
 </td><td>
 <input name="depth" value="${depth}" size="4"
-			onMouseOver="info('${LANG_I1g}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1g}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -183,7 +112,7 @@ ${LANG_G32}
 ${LANG_G32b}
 </td><td>
 <input name="depth2" value="${depth2}" size="4"
-			onMouseOver="info('${LANG_I1g2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1g2}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -191,7 +120,7 @@ ${LANG_G32b}
 ${LANG_I50}
 </td><td>
 <input name="maxhtml" value="${maxhtml}" size="4"
-			onMouseOver="info('${LANG_I18}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I18}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -199,7 +128,7 @@ ${LANG_I50}
 ${LANG_I50b}
 </td><td>
 <input name="othermax" value="${othermax}" size="4"
-			onMouseOver="info('${LANG_I19}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I19}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -207,7 +136,7 @@ ${LANG_I50b}
 ${LANG_I51}
 </td><td>
 <input name="sizemax" value="${sizemax}" size="4"
-			onMouseOver="info('${LANG_I20}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I20}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -215,7 +144,7 @@ ${LANG_I51}
 ${LANG_I65}
 </td><td>
 <input name="pausebytes" value="${pausebytes}" size="4"
-			onMouseOver="info('${LANG_I20b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I20b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -223,7 +152,7 @@ ${LANG_I65}
 ${LANG_I52}
 </td><td>
 <input name="maxtime" value="${maxtime}" size="4"
-			onMouseOver="info('${LANG_I21}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I21}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -231,7 +160,7 @@ ${LANG_I52}
 ${LANG_I54}
 </td><td>
 <input name="maxrate" value="${maxrate}" size="4"
-			onMouseOver="info('${LANG_I22}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I22}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -239,7 +168,7 @@ ${LANG_I54}
 ${LANG_I64}
 </td><td>
 <input name="maxconn" value="${maxconn}" size="4"
-			onMouseOver="info('${LANG_I22b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I22b}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -247,25 +176,25 @@ ${LANG_I64}
 ${LANG_I64b}
 </td><td>
 <input name="maxlinks" value="${maxlinks}" size="4"
-			onMouseOver="info('${LANG_I22c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </table>
 

html/server/option6.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,7 +96,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">
 
@@ -175,7 +104,7 @@ ${do:end-if}
 ${LANG_I43}
 </td><td>
 <input name="user" value="${user}" size="60"
-			onMouseOver="info('${LANG_I23}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I23}'); return true" onMouseOut="info('&nbsp;'); return true"
 >
 </td></tr>
 
@@ -183,27 +112,27 @@ ${LANG_I43}
 ${LANG_I43b}
 </td><td>
 <input name="footer" value="${footer}" size="60"
-			onMouseOver="info('${LANG_I23b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/option7.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,13 +96,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('${LANG_C3}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_C3}'); return true" onMouseOut="info('&nbsp;'); return true"
 >${url2}</textarea>
 
 <br>
@@ -181,21 +110,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('${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>
+<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>
 
 </form>
 

html/server/option8.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,72 +96,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('${LANG_I1b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I58}
 <br><br>
 
 ${LANG_I59}
 <br>
 <select name="checktype"
-			onMouseOver="info('${LANG_I1c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_I1d}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1d}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I60}
 <br><br>
 
 ${LANG_I55}
 <br>
 <select name="robots"
-			onMouseOver="info('${LANG_I28}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_I1k}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1k}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I62b}
 <br><br>
 
 <input type="checkbox" name="urlhack" ${checked:urlhack}
-			onMouseOver="info('${LANG_I1k2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1k2}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I62b2}
 <br><br>
 
 <input type="checkbox" name="toler" ${checked:toler}
-			onMouseOver="info('${LANG_I1i}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1i}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I62}
 <br><br>
 
 <input type="checkbox" name="http10" ${checked:http10}
-			onMouseOver="info('${LANG_I1j}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/option9.html

@@ -6,88 +6,17 @@
 	<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; 
-	}
-
-.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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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() {
 }
@@ -131,7 +60,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -142,18 +71,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('${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>
+<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>
 </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('${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"><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">&nbsp;</td>
 
 </tr>
@@ -167,53 +96,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('${LANG_I1e}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I1e}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I61}
 <br><br>
 
 <input type="checkbox" name="norecatch" ${checked:norecatch}
-			onMouseOver="info('${LANG_I5b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I5b}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I34b}
 <br><br>
 
 <input type="checkbox" name="logf" ${checked:logf}
-			onMouseOver="info('${LANG_I7}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I7}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I36}
 <select name="logtype"
-			onMouseOver="info('${LANG_I1f}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${LANG_I6}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_I6}'); return true" onMouseOut="info('&nbsp;'); return true"
 > ${LANG_I35}
 <br><br>
 
 <input type="checkbox" name="index2" ${checked:index2}
-			onMouseOver="info('${LANG_I6b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html: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('${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>
+<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>
 
 </form>
 

html/server/ping.js

@@ -0,0 +1,26 @@
+// 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,122 +7,55 @@
 	<META http-equiv="refresh" content="30; URL=finished.html">
 	<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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <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;
-	}
+	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 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 no_refresh() {
-}
+function do_refresh() {
+	if (!freeze) {
+		document.location.reload();
+	} else {
+		setTimeout(do_refresh, 1000);
+	}
+}
+function no_refresh() {
+}
 // -->
 </script>
 
@@ -140,7 +73,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -152,7 +85,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -198,8 +131,8 @@ ${do:end-if}
 
 </tr>
 </table>
-
-<br>
+
+<br>
 
 <table border="0" width="100%">
 <tr>
@@ -210,8 +143,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}">
@@ -219,20 +152,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('${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>
+<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>
 
 </table>
 
@@ -246,10 +179,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,75 +6,8 @@
 	<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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -119,7 +52,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -131,7 +64,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -160,18 +93,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:html: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}
@@ -267,7 +200,7 @@ ${do:end-if}
 
 
 ${do:loadhash}
-
+
 		${LANG_S11b}
 		<select name="loadprojname" onChange="form.redirect.value='step2.html'; form.submit()">
 		<option value="">&nbsp;</option>
@@ -278,30 +211,30 @@ ${do:loadhash}
 
 		${LANG_S11}
 		<input name="projname" value="${projname}"
-			onMouseOver="info('${LANG_S1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:html: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('${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('${html:html:LANG_S5}'); return true" onMouseOut="info('&nbsp;'); return true"
+		>
+
+</td></tr></table>
+
 <br>
 		${LANG_S12}
 		<input name="path" value="${path}"
-			onMouseOver="info('${LANG_S2}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:html:LANG_S2}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 		<input type="button" value="refresh" onClick="form.redirect.value='step2.html'; form.submit()">
 
@@ -310,11 +243,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('${LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
+			onMouseOver="info('${html:html: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('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 		</td></tr></table>
 

html/server/step3.html

@@ -6,75 +6,8 @@
 	<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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -128,7 +61,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -140,7 +73,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -169,7 +102,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -185,7 +118,7 @@ ${do:end-if}
 <tr><td>
 		${LANG_G31}
 		<select name="todo"
-			onMouseOver="info('${LANG_G9}'); return true" onMouseOut="info('&nbsp;'); return true"		
+			onMouseOver="info('${html:LANG_G9}'); return true" onMouseOut="info('&nbsp;'); return true"		
 		>
 		${listid:todo:LISTDEF_10}
 		</select>
@@ -198,12 +131,12 @@ ${do:end-if}
 		</td><td>
 		<input type="button" value="${LANG_G43}" 
 		       onClick="doOpenWindow()"
-			onMouseOver="info('${LANG_G24b}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_G24b}'); return true" onMouseOut="info('&nbsp;'); return true"
 			   >
 		</td></tr></table>
 		<br>
 		<textarea name="urls" cols="50" rows="8"
-			onMouseOver="info('${LANG_G11}'); return true" onMouseOut="info('&nbsp;'); return true"		
+			onMouseOver="info('${html:LANG_G11}'); return true" onMouseOut="info('&nbsp;'); return true"		
 		>
 ${do:output-mode:html}
 		${urls}
@@ -217,7 +150,7 @@ ${do:output-mode:}
 		${LANG_URLLIST}:
 		</td><td>
 		<input name="filelist" value="${filelist}" size="40"
-			onMouseOver="info('${LANG_G24c}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_G24c}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 		</td></tr></table>
 
@@ -228,7 +161,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('${LANG_G24}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_G24}'); return true" onMouseOut="info('&nbsp;'); return true"
 		>
 		</td></tr></table>
 
@@ -237,11 +170,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('${LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
+			onMouseOver="info('${html:LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
 			>
 		</td><td align="right">
 			<input name="nextBtn" type="submit" value=" ${LANG_NEXT} >> "
-			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 		</td></tr></table>
 

html/server/step4.html

@@ -6,75 +6,8 @@
 	<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; }
-
-
-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>
+	<link rel="stylesheet" type="text/css" media="screen" href="style.css">
+	<script type="text/javascript" src="ping.js" defer></script>
 
 <script language="javascript">
 <!--
@@ -110,7 +43,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('${LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_O1}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O1}
@@ -122,7 +55,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 			style="color:#FFFFFF"
 		>
 		${LANG_O5}
@@ -151,7 +84,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('${LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPHELP}'); return true" onMouseOut="info('&nbsp;'); return true"
 	>${LANG_TIPHELP}</a>
 </td>
 ${do:end-if}
@@ -163,34 +96,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 "${path}/${projname}" 
+	--path "${html:path}/${html:projname}" 
 \
 	${test:parseall:--near}
 	${test:link:--test}
@@ -203,8 +136,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}
@@ -236,8 +169,8 @@ ${do:end-if}
 	${test:maxconn:--connection-per-second=}${maxconn}
 	${test:maxlinks:--advanced-maxlinks=}${maxlinks}
 \
-	--user-agent "${user}"
-	--footer "${footer}"
+	--user-agent "${html:user}"
+	--footer "${html:footer}"
 \
 	${url2}
 \
@@ -261,7 +194,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}
@@ -338,25 +271,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('${LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
+			onMouseOver="info('${html:LANG_TIPPREV}'); return true" onMouseOut="info('&nbsp;'); return true"			
 			>
 		</td><td align="right">
 			<input name="nextBtn" type="submit" value=" ${LANG_J9} >> "
-			onMouseOver="info('${LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
+			onMouseOver="info('${html:LANG_TIPNEXT}'); return true" onMouseOut="info('&nbsp;'); return true"
 			>
 		</td></tr></table>
 

html/server/style.css

@@ -0,0 +1,66 @@
+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.def

@@ -430,6 +430,8 @@ LANG_I6
 Create a Start Page
 LANG_I6b
 Create a word database of all html pages
+LANG_I6c
+Build a complete RFC822 mail (MHT/EML) archive of the mirror
 LANG_I7
 Create error logging and report files
 LANG_I8
@@ -478,6 +480,12 @@ LANG_I23
 Browser identity
 LANG_I23b
 Comment to be placed in each HTML file
+LANG_I23c
+Languages accepted by the browser
+LANG_I23d
+Additional HTTP headers to be sent in each requests
+LANG_I23e
+HTTP referer to be sent for initial URLs
 LANG_I24
 Back to starting page
 LANG_I25
@@ -538,6 +546,8 @@ LANG_I35
 Make an index
 LANG_I35b
 Make a word database
+LANG_I35c
+Build a mail archive
 LANG_I36
 Log files
 LANG_I37
@@ -566,6 +576,12 @@ LANG_I43
 Identity
 LANG_I43b
 HTML footer
+LANG_I43c
+Languages
+LANG_I43d
+Additional HTTP Headers
+LANG_I43e
+Default referer URL
 LANG_I44
 N# connections
 LANG_I45

lang.indexes

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

lang/Cesky.txt

@@ -3,7 +3,7 @@ LANGUAGE_NAME
 LANGUAGE_FILE
 Cesky
 LANGUAGE_ISO
-cz
+cs
 LANGUAGE_AUTHOR
 Antonín Matìjèík (matejcik@volny.cz) \r \n
 LANGUAGE_CHARSET

lang/Chinese-BIG5.txt

@@ -3,7 +3,7 @@ Chinese-BIG5
 LANGUAGE_FILE
 Chinese-BIG5
 LANGUAGE_ISO
-ct
+zh_TW
 LANGUAGE_AUTHOR
 David Hing Cheong Hung (DAVEHUNG@mtr.com.hk)\r\n
 LANGUAGE_CHARSET

lang/Chinese-Simplified.txt

@@ -3,7 +3,7 @@ Chinese-Simplified
 LANGUAGE_FILE
 Chinese-Simplified
 LANGUAGE_ISO
-cs
+zh
 LANGUAGE_AUTHOR
 Brook Qin (brookqwr at sina.com) \r\n
 LANGUAGE_CHARSET

lang/Croatian.txt

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

lang/Eesti.txt

@@ -711,9 +711,9 @@ Log
 Window
 A&ken
 Help
-&Abi
+Abi
 Exit
-&Välju
+Välju
 Load default options
 Laadi vaikimisi seaded
 Save default options

lang/English.txt

@@ -372,6 +372,8 @@ Create a Start Page
 Create a Start Page
 Create a word database of all html pages
 Create a word database of all html pages
+Build a complete RFC822 mail (MHT/EML) archive of the mirror
+Build a complete RFC822 mail (MHT/EML) archive of the mirror
 Create error logging and report files
 Create error logging and report files
 Generate DOS 8-3 filenames ONLY
@@ -420,6 +422,12 @@ Browser identity
 Browser identity
 Comment to be placed in each HTML file
 Comment to be placed in each HTML file
+Languages accepted by the browser
+Languages accepted by the browser
+Additional HTTP headers to be sent in each requests
+Additional HTTP headers to be sent in each requests
+HTTP referer to be sent for initial URLs
+HTTP referer to be sent for initial URLs
 Back to starting page
 Back to starting page
 Save current preferences as default values
@@ -480,6 +488,8 @@ Make an index
 Make an index
 Make a word database
 Make a word database
+Build a mail archive
+Build a mail archive
 Log files
 Log files
 DOS names (8+3)
@@ -508,6 +518,12 @@ Identity
 Identity
 HTML footer
 HTML footer
+Languages
+Languages
+Additional HTTP Headers
+Additional HTTP Headers
+Default referer URL
+Default referer URL
 N# connections
 N# connections
 Abandon host if error
@@ -930,3 +946,33 @@ Server terminated
 Server terminated
 A fatal error has occured during this mirror
 A fatal error has occured during this mirror
+View Documentation
+View Documentation
+Go To HTTrack Website
+Go To HTTrack Website
+Go To HTTrack Forum
+Go To HTTrack Forum
+View License
+View License
+Beware: you local browser might be unable to browse files with embedded filenames
+Beware: you local browser might be unable to browse files with embedded filenames
+Recreated HTTrack internal cached resources
+Recreated HTTrack internal cached resources
+Could not create internal cached resources
+Could not create internal cached resources
+Could not get the system external storage directory
+Could not get the system external storage directory
+Could not write to:
+Could not write to:
+Read-only media (SDCARD)
+Read-only media (SDCARD)
+No storage media (SDCARD)
+No storage media (SDCARD)
+HTTrack may not be able to download websites until this problem is fixed
+HTTrack may not be able to download websites until this problem is fixed
+HTTrack: mirror '%s' stopped!
+HTTrack: mirror '%s' stopped!
+Click on this notification to restart the interrupted mirror
+Click on this notification to restart the interrupted mirror
+HTTrack: could not save profile for '%s'!
+HTTrack: could not save profile for '%s'!

lang/Finnish.txt

@@ -671,7 +671,7 @@ EI
 File
 &Tiedosto
 Options
-&Valinnat
+Valinnat
 Log
 &Loki
 Window
@@ -681,7 +681,7 @@ O&hje
 Pause transfer
 Pysäytä siirto
 Exit
-&Poistu
+Poistu
 Modify options
 &Muokkaa valintoja
 View log
@@ -713,9 +713,9 @@ Log
 Window
 &Ikkuna
 Help
-O&hje
+Ohje
 Exit
-&Poistu
+Poistu
 Load default options
 &Lataa vakioasetukset
 Save default options

lang/Francais.txt

@@ -420,6 +420,10 @@ Browser identity
 Identifiants du Navigateur Internet
 Comment to be placed in each HTML file
 Commentaire de page placé dans chaque fichier HTML
+Languages accepted by the browser
+Langues acceptée par le navigateur
+Additional HTTP headers to be sent in each requests
+En-têtes HTTP additionnels à envoyer dans chaque requête
 Back to starting page
 Retour à la page de démarrage
 Save current preferences as default values
@@ -508,6 +512,10 @@ Identity
 Identification
 HTML footer
 En-tête HTML
+Languages
+Langues
+Additional HTTP Headers
+En têtes HTTP additionnels
 N# connections
 Nombre de connexions
 Abandon host if error
@@ -721,7 +729,7 @@ Utiliser les options par d
 Save default options
 Enregistrer en tant qu'options par défaut
 Reset to default options
-Charger les options par défaut
+Initialiser les options par défaut
 Load options...
 Charger les options
 Save options as...
@@ -743,7 +751,7 @@ Enregistrer &sous...
 &Delete...
 &Effacer...
 &Browse sites...
-&Browse sites...
+&Explorer sites...
 User-defined structure
 Définir une structure personnalisée
 %n\tName of file without file type (ex: image)\r\n%N\tName of file including file type (ex: image.gif)\r\n%t\tFile type only (ex: gif)\r\n%p\tPath [without ending /] (ex: /someimages)\r\n%h\tHost name (ex: www.someweb.com)\r\n%M\tMD5 URL (128 bits, 32 ascii bytes)\r\n%Q\tMD5 query string (128 bits, 32 ascii bytes)\r\n%q\tMD5 small query string (16 bits, 4 ascii bytes)\r\n\r\n%s?\tShort name (ex: %sN)
@@ -930,3 +938,41 @@ Server terminated
 Serveur arrêté
 A fatal error has occured during this mirror
 Une erreur critique est intervenue durant l'aspiration
+View Documentation
+Lire la documentation
+Go To HTTrack Website
+Visiter le site de HTTrack
+Go To HTTrack Forum
+Visiter le forum de HTTrack
+View License
+Lire la license
+Beware: you local browser might be unable to browse files with embedded filenames
+Attention: il se pourrait que votre navigateur soit incapable de lire les fichiers contenant des espaces
+Recreated HTTrack internal cached resources
+Cache des ressources interne recréé
+Could not create internal cached resources
+Impossible de créer le cache des ressources interne
+Could not get the system external storage directory
+Impossible de localuser le système de stockage externe
+Could not write to:
+Impossible d'écrire dans:
+Read-only media (SDCARD)
+Média en lecture seule (SDCARD)
+No storage media (SDCARD)
+Pas de média (SDCARD)
+HTTrack may not be able to download websites until this problem is fixed
+Il se peut que HTTrack soit incapable de télécharger des sites tant que ce problème n'est pas réglé
+HTTrack: mirror '%s' stopped!
+HTTrack: miroir '%s' stoppé!
+Click on this notification to restart the interrupted mirror
+Cliquez sur cette notification pour redémarrer la copie interrompue
+HTTrack: could not save profile for '%s'!
+HTTrack: impossible de sauver le profil pour '%s'
+Build a complete RFC822 mail (MHT/EML) archive of the mirror
+Construire une archive email complète (MHT/EML) au format RFC822
+HTTP referer to be sent for initial URLs
+Champ HTTP referer a envoyer pour les URL initiales
+Build a mail archive
+Construire une archive mail
+Default referer URL
+Champ referer par défaut

lang/Japanese.txt

@@ -3,7 +3,7 @@ Japanese
 LANGUAGE_FILE
 Japanese
 LANGUAGE_ISO
-jp
+ja
 LANGUAGE_AUTHOR
 TAPKAL\r\n
 LANGUAGE_CHARSET

lang/Makefile.in

@@ -104,6 +104,7 @@ 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@
@@ -112,14 +113,12 @@ 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,6 +132,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -188,7 +188,6 @@ 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@

lang/Portugues-Brasil.txt

@@ -3,7 +3,7 @@ Portugu
 LANGUAGE_FILE
 Portugues-Brasil
 LANGUAGE_ISO
-pt
+pt_BR
 LANGUAGE_AUTHOR
 Paulo Neto (layoutbr at lexxa.com.br) \r\n
 LANGUAGE_CHARSET

lang/Ukrainian.txt

@@ -3,7 +3,7 @@ Ukrainian
 LANGUAGE_FILE
 Ukrainian
 LANGUAGE_ISO
-ua
+uk
 LANGUAGE_AUTHOR
 Andrij Shevchuk (http://programy.com.ua, http://vic-info.com.ua) \r\n
 LANGUAGE_CHARSET

libtest/Makefile.am

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

libtest/Makefile.in

@@ -201,6 +201,7 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -209,14 +210,12 @@ 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@
@@ -230,6 +229,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 HTTPS_SUPPORT = @HTTPS_SUPPORT@
 ICONV_LIBS = @ICONV_LIBS@
 INSTALL = @INSTALL@
@@ -285,7 +285,6 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -334,18 +333,10 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 exemplesdir = $(datadir)/httrack/libtest
 exemples_DATA = *.c *.h *.txt
-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
+EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj
+AM_CPPFLAGS = @DEFAULT_CFLAGS@ @THREADS_CFLAGS@ @V6_FLAG@ @LFS_FLAG@ \
+	-DPREFIX=\""$(prefix)"\" -DSYSCONFDIR=\""$(sysconfdir)"\" \
+	-DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" -I../src
 AM_LDFLAGS = -L../src
 
 # Examples
@@ -485,22 +476,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/callbacks-example-simple.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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
 @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 $<
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@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
 @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 `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@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
 @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, (char *) arg);
-  CHAIN_FUNCTION(opt, start, start_of_mirror, (char *) arg);
-  CHAIN_FUNCTION(opt, end, end_of_mirror, (char *) arg);
+  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);
 
   hts_log(opt, arg, "* module successfully plugged");
   return 1;                     /* success */