additional feature: built in library name; plus: closes #70

13 years ago · 57bce10e86
parent 7d7eb1e238
commit 57bce10e86
9 changed files with 205 additions and 298 deletions
--- a/swisssurfer/configure.in
+++ b/swisssurfer/configure.in
@ -28,6 +28,7 @@ AC_CONFIG_FILES(makefile
                src/makefile src/qmake.pro src/languages.qrc
                doc/doxyfile doc/makefile)

+# copy M4 to shell
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(LEAST)
@ -35,7 +36,7 @@ AC_SUBST(BUILDDATE)

 # libtool versioning
 LIB_MAJOR=m4_eval(x_major+x_minor)
-LIB_MINOR=x_least
+LIB_MINOR=${LEAST}
 LIB_LEAST=x_minor
 LIB_VERSION="${LIB_MAJOR}:${LIB_MINOR}:${LIB_LEAST}"
 AC_SUBST(LIB_VERSION)
@ -87,41 +88,15 @@ AC_SUBST(LRELEASE)
 AC_CHECK_PROGS([LUPDATE], [lupdate-qt4 lupdate-mac lupdate])
 test -n "$LUPDATE" || AC_MSG_ERROR([lupdate for Qt 4 not found!])
 AC_SUBST(LUPDATE)
-AC_ARG_ENABLE(static-plugins,
-  [AS_HELP_STRING([--enable-static-plugins],
-                  [links the image plugins statically])],
-  [static_plugins="$enableval"], [static_plugins="no"])
-#AM_CONDITIONAL(STATIC_PLUGINS, test "$static_plugins" = "yes")
-if test "$static_plugins" = "yes"; then
-  CXXFLAGS+=" -DPLUGINS=static"
-  STATIC_QTPLUGINS="qgif qjpeg qmng"
-  STATIC_QCONFIG="static"
-else
-  CXXFLAGS+=" -DPLUGINS=dynamic"
-  STATIC_QTPLUGINS=
-  STATIC_QCONFIG=
-fi
-AC_ARG_ENABLE(win,
-  [AS_HELP_STRING([--enable-win],
-                  [on linux, also builds windows version using mingw])],
-  [build_win="$enableval"], [build_win="no"])
-AM_CONDITIONAL(BUILD_WIN, test "$build_win" = "yes")
-AC_ARG_ENABLE(32bit-linux,
-  [AS_HELP_STRING([--enable-32bit-linux],
-                  [build for 32bit linux instead of plattform specific])],
-  [build_lin32="$enableval"], [build_lin32="no"])
-AM_CONDITIONAL(BUILD_LIN32, test "$build_lin32" = "yes")

 # Environment Variables
 AC_ARG_VAR(LUPDATE_ARGS, [arguments for qt lupdate command, e.g. -no-obsolete])
-AC_PATH_PROG(QMAKE, [qmake qmake-qt4], [])
-AC_ARG_VAR(QMAKE, [path to qmake program])
-
-# Enviropnment Variables
 AC_ARG_VAR(EDITION, [name of the edition, e.g. comol])
 AC_ARG_VAR(EDITION_USERFRIENDLY, [userfriendly name of the edition, e.g. CoMoL])
 AC_ARG_VAR(BUILDVERSION, [version of this build, e.g. v1.0])
 AC_ARG_VAR(BUILD, [build number of this build, e.g. 213])
+AC_PATH_PROG(QMAKE, [qmake qmake-qt4], [])
+AC_ARG_VAR(QMAKE, [path to qmake program])

 # export macros
 SRCDIR=${srcdir}
@ -135,27 +110,6 @@ AC_SUBST(PACKAGENAME)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(LIBS)
-AC_SUBST(QMAKE_OPTIONS)
-AC_SUBST(STATIC_QTPLUGINS)
-AC_SUBST(STATIC_QCONFIG)
-
-AC_CHECK_HEADER(xml-cxx/xml.hxx, [found="yes"], [found="no"])
-if test "$found" == "no"; then
-  AC_MSG_CHECKING([looking for xml-cxx headers])
-  for file in /usr/include /usr/local/include /opt/include \
-              /opt/local/include; do
-    if test -d ${file}/xml-cxx; then
-      CPPFLAGS+=" -I$file"
-      LDFLAGS+=" -L$(echo $file | sed 's#/include#/lib#g')"
-      found=$file
-      break;
-    fi
-  done
-  AC_MSG_RESULT([$found])
-fi
-if test "$found" == "no"; then
-  AC_MSG_ERROR([libxml-cxx not found])
-fi

 # create output
 AC_OUTPUT
@ -183,11 +137,3 @@ AC_MSG_NOTICE([Pedantic compile mode enabled!
  - all warnings for GNU g++ are enabled
  - all warnings result in an error
  - doxygen warnings are treated as error too]); fi
-if test "$build_win" == "yes"; then
-AC_MSG_NOTICE([Will cross-compile for windows
-  Requires:
-    - mingw32, mingw32-binutils, mingw32-runtime
-      - i586-mingw32msvc-g++, i586-mingw32msvc-ar,
-        i586-mingw32msvc-windres, i586-mingw32msvc-strip
-    - Boost for MinGW in ~/.wine/drive_c/Programme/Boost-1.34.1
-    - Qt for MinGW in ~/.wine/drive_c/Qt/4.4.3]); fi
--- a/swisssurfer/src/main.cxx
+++ b/swisssurfer/src/main.cxx
@ -279,7 +279,19 @@ int main(int argv, char** argc) try {
  qDebug()<<"***************************************************************";
  //----------------------------------------------------------------------------
  QStringList urls;
-  QString actlib;
+  QString actlib
+#ifdef Q_OS_LINUX
+    ("libcvP11.so")
+#else
+#ifdef Q_OS_MAC
+    ("libcvP11.dylib")
+#else
+#ifdef Q_OS_WIN
+    ("cvP11.dll")
+#endif
+#endif
+#endif
+    ;
  bool silent(false);
  bool login(false);
  Settings::MimeTypes mimetypes;
--- a/swisssurfer/src/makefile.am
+++ b/swisssurfer/src/makefile.am
@ -5,11 +5,11 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

+EXTRA_DIST = resources *.cxx *.hxx *.ui *.ts qt_*.qm *.qrc
+
 LANGS = en de fr it
-ALL_SRC = *.cxx *.hxx *.ui $(shell find resources -name .svn -prune -o \( -type f -o -type l \) -print)
+ALL_SRC = @SRCDIR@/*.[ch]xx @SRCDIR@/*.ui $(shell find @SRCDIR@ resources -name .svn -prune -o \( -type f -o -type l \) -print)

-QMAKE = @QMAKE@
-QMAKE_OPTIONS = @QMAKE_OPTIONS@
 QMAKE_PROJECT = qmake.pro
 QMAKE_MAKEFILE = makefile.qmake

@ -17,17 +17,24 @@ QMAKE_TARGET = @PACKAGENAME@

 TARGETS = ${QMAKE_TARGET}

-if BUILD_WIN
-  QMAKE_MAKEFILE_WIN = makefile.win.qmake
-  QMAKE_OPTIONS_WIN = ${QMAKE_OPTIONS} -win32 -spec cross-mingw-g++
-  QMAKE_TARGET_WIN = $(QMAKE_TARGET:%=%.exe)
-  TARGETS += ${QMAKE_TARGET_WIN}
-else
-  QMAKE_MAKEFILE_WIN =
-endif
-
 all: ${TARGETS} $(LANGS:%=@PACKAGENAME@_%.ts)

+rebuild-ts: $(LANGS)
+	${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT}
+
+${LANGS}: ${ALL_SRC}
+	-rm @PACKAGENAME@_$@.qm
+	svn revert @PACKAGENAME@_$@.ts
+	mv @PACKAGENAME@_$@.ts translation.old
+	${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT}
+	mv @PACKAGENAME@_$@.ts translation.new
+	echo '<?xml version="1.0" encoding="utf-8"?>' > @PACKAGENAME@_$@.ts
+	echo '<!DOCTYPE TS>' >> @PACKAGENAME@_$@.ts
+	echo '<TS version="2.0" language="'$@'">' >> @PACKAGENAME@_$@.ts
+	xqilla merge-translation.xquery >> @PACKAGENAME@_$@.ts
+	echo '</TS>' >> @PACKAGENAME@_$@.ts
+	rm translation.old translation.new
+
 print:
 	@echo "LANGS=${LANGS}"
 	@echo "ALL_SRC=${ALL_SRC}"
@ -36,45 +43,28 @@ print:
 	@echo "QMAKE_MAKEFILE=${QMAKE_MAKEFILE}"
 	@echo "QMAKE_TARGET=${QMAKE_TARGET}"
 	@echo "TARGETS=${TARGETS}"
-	@echo "QMAKE_MAKEFILE_WIN=${QMAKE_MAKEFILE_WIN}"
-	@echo "QMAKE_OPTIONS_WIN=${QMAKE_OPTIONS_WIN}"
-	@echo "QMAKE_TARGET_WIN=${QMAKE_TARGET_WIN}"

-%.qm: %.ts
+
+@PACKAGENAME@_%.qm: @PACKAGENAME@_%.ts
 	${LRELEASE} $<

+%.xpm: resources/%.png
+	convert $< $@ || cp $< $@
+
 %.ts: ${ALL_SRC}
 	${LUPDATE} @LUPDATE_ARGS@ ${QMAKE_PROJECT}

-if BUILD_LIN32
-${QMAKE_MAKEFILE}: ${QMAKE_PROJECT} ${ALL_SRC}
-	QMAKESPEC=linux-g++-32 ${QMAKE} ${QMAKE_OPTIONS} -o $@ $<
-else
 ${QMAKE_MAKEFILE}: ${QMAKE_PROJECT} ${ALL_SRC}
-	${QMAKE} ${QMAKE_OPTIONS} -o $@ $<
-endif
-
-${QMAKE_MAKEFILE_WIN}: ${QMAKE_PROJECT} ${ALL_SRC}
-	${QMAKE} ${QMAKE_OPTIONS_WIN} -o $@ $<
+	${QMAKE} -o $@ $<

-${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm) resources.qrc
+${QMAKE_TARGET}: ${QMAKE_MAKEFILE} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm)
 	make -f ${QMAKE_MAKEFILE}

-${QMAKE_TARGET_WIN}: ${QMAKE_MAKEFILE_WIN} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.qm) resources.qrc
-	make -f ${QMAKE_MAKEFILE_WIN}
-
-maintainer-clean-local:
-	-rm -rf ${QMAKE_TARGET}.app
-
-install-exec-local:
-	( test -f @PACKAGENAME@ && cp @PACKAGENAME@ ${bindir}/ ) \
-	|| ( test -f @PACKAGENAME@.exe && cp @PACKAGENAME@.exe ${bindir}/ ) \
-	|| ( test -d @PACKAGENAME@.app && cp -r @PACKAGENAME@.app ${bindir}/ )
-
-uninstall-local:
-	-rm -rf ${bindir}/@PACKAGENAME@{,.exe,.app}
+clean-local:
+	-rm -r ${QMAKE_TARGET}.app

-CLEANFILES = ${TARGETS} $(LANGS:%=@PACKAGENAME@_%.qm) \
+CLEANFILES = ${TARGETS} ${TARGETS:%=%.exe} $(LANGS:%=@PACKAGENAME@_%.qm) \
             *.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
-	     ${QMAKE_TARGET} ${QMAKE_TARGET_WIN}
-MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE} ${QMAKE_MAKEFILE_WIN}
+	     ${QMAKE_TARGET} \
+	     init.xpm
+MAINTAINERCLEANFILES = makefile.in ${QMAKE_MAKEFILE}
--- a/swisssurfer/src/qmake.pro.in
+++ b/swisssurfer/src/qmake.pro.in
@ -20,7 +20,8 @@ macx {
  CONFIG += x86
 }
 win32 {
-  QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32 -lwinscard
+  QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32
+  QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a
  CONFIG += console
 }
 ICON = swisssurfer.icns
--- a/swisssurfer/src/smartcardauth.hxx
+++ b/swisssurfer/src/smartcardauth.hxx
@ -113,6 +113,7 @@ class CryptokiEngine: public QObject, public openssl::Engine {
    
    virtual std::string rsaSign(const std::string& in, unsigned int type) {
      OPENSSL_LOG("log; type="<<type<<"; size="<<in.size());
+      OPENSSL_LOG(crypto::readable(in));
      if (type != NID_md5_sha1) throw std::runtime_error("wrong sign type");
      if (in.size() != 36) throw std::runtime_error("wrong msg size to sign");
      OPENSSL_LOG("ready to sign");
--- a/swisssurfer/src/swisssurfer_de.ts
+++ b/swisssurfer/src/swisssurfer_de.ts
@ -597,12 +597,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QMessageBox</name>
    <message>
-        <location filename="smartcardauth.hxx" line="216"/>
+        <location filename="smartcardauth.hxx" line="217"/>
        <source>Wrong PIN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="smartcardauth.hxx" line="217"/>
+        <location filename="smartcardauth.hxx" line="218"/>
        <source>Authentication failed, please try again.</source>
        <translation type="unfinished"></translation>
    </message>
@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="290"/>
+        <location filename="main.cxx" line="302"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@ -658,27 +658,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="335"/>
+        <location filename="main.cxx" line="347"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="341"/>
+        <location filename="main.cxx" line="353"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="348"/>
+        <location filename="main.cxx" line="360"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="365"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="364"/>
+        <location filename="main.cxx" line="376"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>
--- a/swisssurfer/src/swisssurfer_en.ts
+++ b/swisssurfer/src/swisssurfer_en.ts
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="en_US">
 <defaultcodec>UTF-8</defaultcodec>
 <context>
    <name>Authentication</name>
@ -35,7 +35,6 @@
    <message>
        <location filename="browser.ui" line="14"/>
        <source>SwissSurfer</source>
-        <oldsource>SwissSign Browser</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -54,13 +53,13 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="104"/>
-        <source>Info</source>
+        <location filename="browser.ui" line="99"/>
+        <source>History</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="99"/>
-        <source>History</source>
+        <location filename="browser.ui" line="104"/>
+        <source>Info</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -78,6 +77,12 @@
        <source>stoppen</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="browser.ui" line="141"/>
+        <location filename="browser.ui" line="277"/>
+        <source>Esc</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="browser.ui" line="153"/>
        <source>zurückkehren</source>
@ -123,6 +128,21 @@
        <source>&amp;Proxy...</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="browser.ui" line="218"/>
+        <source>Print ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="223"/>
+        <source>Print Pre&amp;view ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="228"/>
+        <source>Quick &amp;Print</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="browser.ui" line="231"/>
        <source>Ctrl+P</source>
@ -168,6 +188,16 @@
        <source>Find</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="browser.ui" line="266"/>
+        <source>find in page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="browser.ui" line="269"/>
+        <source>Ctrl+F</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="browser.ui" line="274"/>
        <source>Close Find</source>
@ -204,57 +234,48 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="141"/>
-        <location filename="browser.ui" line="277"/>
-        <source>Esc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.ui" line="266"/>
-        <source>find in page</source>
+        <location filename="browser.hxx" line="433"/>
+        <source>Checking: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="269"/>
-        <source>Ctrl+F</source>
+        <location filename="browser.hxx" line="437"/>
+        <source>SSL Not Supported</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="218"/>
-        <source>Print ...</source>
+        <location filename="browser.hxx" line="438"/>
+        <source>SSL is not supported on your system</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="228"/>
-        <source>Quick &amp;Print</source>
-        <oldsource>&amp;Print</oldsource>
+        <location filename="browser.hxx" line="443"/>
+        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.ui" line="223"/>
-        <source>Print Pre&amp;view ...</source>
+        <location filename="browser.hxx" line="444"/>
+        <source>Access Denied</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="433"/>
-        <source>Checking: %1</source>
-        <oldsource>Opening: %1</oldsource>
+        <location filename="browser.hxx" line="445"/>
+        <source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="browser.hxx" line="451"/>
        <source>Reading: %1</source>
-        <oldsource>Reading: %1%</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="466"/>
-        <source>Zoom: %1%</source>
+        <location filename="browser.hxx" line="453"/>
+        <source>Illegal URL: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="453"/>
-        <source>Illegal URL: %1</source>
+        <location filename="browser.hxx" line="466"/>
+        <source>Zoom: %1%</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -265,84 +286,53 @@
    <message>
        <location filename="browser.hxx" line="536"/>
        <source>%1 - %2</source>
-        <oldsource>Back to %1 - %2</oldsource>
        <comment>statusbar actionBack_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="678"/>
-        <source>Info: %1</source>
+        <location filename="browser.hxx" line="555"/>
+        <source>%1 - %2</source>
+        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
-        <source>done.</source>
+        <location filename="browser.hxx" line="623"/>
+        <source>About</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="691"/>
-        <source>page load error.</source>
+        <location filename="browser.hxx" line="624"/>
+        <source>SwissSurfer %1 (%2)
+
+%3
+Using: qt-%4
+Compiled: qt-%5</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="944"/>
+        <location filename="browser.hxx" line="673"/>
        <source>%1</source>
-        <comment>statusbar for hovered link %1=url</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="443"/>
-        <source>Forbidden: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="437"/>
-        <source>SSL Not Supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="438"/>
-        <source>SSL is not supported on your system</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="444"/>
-        <source>Access Denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="445"/>
-        <source>&lt;p&gt;Access denied due to security considerations.&lt;/p&gt;&lt;p&gt;You are not allowed to connect to %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="browser.hxx" line="555"/>
-        <source>%1 - %2</source>
-        <comment>statusbar actionForward_hovered %1=url %2=title</comment>
+        <location filename="browser.hxx" line="678"/>
+        <source>Info: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="623"/>
-        <source>About</source>
+        <location filename="browser.hxx" line="691"/>
+        <source>done.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="624"/>
-        <source>SwissSurfer %1 (%2)
-
-%3
-Using: qt-%4
-Compiled: qt-%5</source>
-        <oldsource>Certificate Assistant %1 (%2)
-
-%3
-Using: qt-%4
-Compiled: qt-%5</oldsource>
+        <location filename="browser.hxx" line="691"/>
+        <source>page load error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="browser.hxx" line="673"/>
+        <location filename="browser.hxx" line="944"/>
        <source>%1</source>
+        <comment>statusbar for hovered link %1=url</comment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -396,7 +386,6 @@ Compiled: qt-%5</oldsource>
    <message>
        <location filename="downloadmanager.hxx" line="48"/>
        <source>The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above.</source>
-        <oldsource>The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted.</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -482,13 +471,11 @@ Compiled: qt-%5</oldsource>
    <message>
        <location filename="downloadmanager.hxx" line="159"/>
        <source>&lt;h1&gt;Network Error&lt;/h1&gt;&lt;dl&gt;&lt;dt&gt;URL:&lt;/dt&gt;&lt;dd&gt;%1&lt;/dd&gt;&lt;dt&gt;Error Code:&lt;/dt&gt;&lt;dd&gt;%3&lt;/dd&gt;&lt;dt&gt;Error Details:&lt;/dt&gt;&lt;dd&gt;%2&lt;/dd&gt;&lt;/dl&gt;</source>
-        <oldsource>&lt;h1&gt;Network Error&lt;/h2&gt;&lt;dl&gt;&lt;dt&gt;URL:&lt;/dt&gt;&lt;dd&gt;%1&lt;/dd&gt;&lt;dt&gt;Error Code:&lt;/dt&gt;&lt;dd&gt;%3&lt;/dd&gt;&lt;dt&gt;Error Details:&lt;/dt&gt;&lt;dd&gt;%2&lt;/dd&gt;&lt;/dl&gt;</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="downloadmanager.hxx" line="200"/>
        <source>&lt;h1&gt;SSL Error&lt;/h1&gt;&lt;dl&gt;&lt;dt&gt;URL:&lt;/dt&gt;&lt;dd&gt;%1&lt;/dd&gt;&lt;dt&gt;Error Code:&lt;/dt&gt;&lt;dd&gt;%3&lt;/dd&gt;&lt;dt&gt;Error Details:&lt;/dt&gt;&lt;dd&gt;%2&lt;/dd&gt;&lt;/dl&gt;&lt;table&gt;&lt;caption&gt;Certificate Issuer&lt;/caption&gt;&lt;tr&gt;&lt;th&gt;Organization:&lt;/th&gt;&lt;td&gt;%4&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Common Name:&lt;/th&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Location:&lt;/th&gt;&lt;td&gt;%6&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Organizational Unit:&lt;/th&gt;&lt;td&gt;%7&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Country:&lt;/th&gt;&lt;td&gt;%8&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;State or Provive:&lt;/th&gt;&lt;td&gt;%9&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;table&gt;&lt;caption&gt;Certificate Subject&lt;/caption&gt;&lt;tr&gt;&lt;th&gt;Organization:&lt;/th&gt;&lt;td&gt;%10&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Common Name:&lt;/th&gt;&lt;td&gt;%11&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Location:&lt;/th&gt;&lt;td&gt;%12&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Organizational Unit:&lt;/th&gt;&lt;td&gt;%13&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Country:&lt;/th&gt;&lt;td&gt;%14&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;State or Provive:&lt;/th&gt;&lt;td&gt;%15&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
-        <oldsource>&lt;h1&gt;SSL Error&lt;/h2&gt;&lt;dl&gt;&lt;dt&gt;URL:&lt;/dt&gt;&lt;dd&gt;%1&lt;/dd&gt;&lt;dt&gt;Error Code:&lt;/dt&gt;&lt;dd&gt;%3&lt;/dd&gt;&lt;dt&gt;Error Details:&lt;/dt&gt;&lt;dd&gt;%2&lt;/dd&gt;&lt;/dl&gt;&lt;table&gt;&lt;caption&gt;Certificate Issuer&lt;/caption&gt;&lt;tr&gt;&lt;th&gt;Organization:&lt;/th&gt;&lt;td&gt;%4&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Common Name:&lt;/th&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Location:&lt;/th&gt;&lt;td&gt;%6&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Organizational Unit:&lt;/th&gt;&lt;td&gt;%7&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Country:&lt;/th&gt;&lt;td&gt;%8&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;State or Provive:&lt;/th&gt;&lt;td&gt;%9&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;table&gt;&lt;caption&gt;Certificate Subject&lt;/caption&gt;&lt;tr&gt;&lt;th&gt;Organization:&lt;/th&gt;&lt;td&gt;%10&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Common Name:&lt;/th&gt;&lt;td&gt;%11&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Location:&lt;/th&gt;&lt;td&gt;%12&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Organizational Unit:&lt;/th&gt;&lt;td&gt;%13&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;Country:&lt;/th&gt;&lt;td&gt;%14&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;th&gt;State or Provive:&lt;/th&gt;&lt;td&gt;%15&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</oldsource>
        <translation type="unfinished"></translation>
    </message>
 </context>
@ -505,13 +492,11 @@ Compiled: qt-%5</oldsource>
    <message>
        <location filename="pinentry.ui" line="14"/>
        <source>Certificate PIN Entry</source>
-        <oldsource>SwissSign Pin Entry</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="pinentry.ui" line="26"/>
        <source>Please enter your PIN to unlock Certificate:</source>
-        <oldsource>Please enter your Certificate PIN to authenticate:</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -564,6 +549,15 @@ Compiled: qt-%5</oldsource>
        <source>Issuer CA:</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="pinentry.ui" line="175"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="pinentry.ui" line="192"/>
        <location filename="pinentry.hxx" line="45"/>
@ -584,25 +578,16 @@ p, li { white-space: pre-wrap; }
        <source>certificate is bad or locked</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="pinentry.ui" line="175"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:24pt; color:#00b900;&quot;&gt;✔&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>QMessageBox</name>
    <message>
-        <location filename="smartcardauth.hxx" line="216"/>
+        <location filename="smartcardauth.hxx" line="217"/>
        <source>Wrong PIN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="smartcardauth.hxx" line="217"/>
+        <location filename="smartcardauth.hxx" line="218"/>
        <source>Authentication failed, please try again.</source>
        <translation type="unfinished"></translation>
    </message>
@ -610,7 +595,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="290"/>
+        <location filename="main.cxx" line="302"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@ -633,52 +618,30 @@ Environment:
  PROXY_PORT       proxy port number             (actual: %3)
  PROXY_HOST       proxy host name               (actual: %4)
 </source>
-        <oldsource>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
-Options:
- -h, --help        show this help text
- -k, --kiosk       no url bar
-                   if you sepcify -k and -s, -k must be first
- -n, --no-settings don&apos;t load or store any settings
- --no-login        don&apos;t ask for smartcard password
- -l, --lib &lt;file&gt;  path to file libengine_act.so
- -s, --settings &lt;file&gt;
-                   load settings from &lt;file&gt;
-                   if you sepcify -k and -s, -k must be first
- -c, --cert &lt;file&gt; load local client certificate from &lt;file&gt;
- -y, --key  &lt;file&gt; load local certificate key from &lt;file&gt;
- -m, --mime  &lt;mime&gt; &lt;ext&gt; &lt;tool&gt;
-                   start &lt;tool&gt; for mimetype &lt;mime&gt;
- &lt;url&gt;             optional full URL
-Environment:
-  LANGUAGE         &quot;de&quot;, &quot;en&quot;, ...               (actual: %5)
-  PROXY_TYPE       &quot;http&quot; or &quot;socks&quot; or &quot;&quot;       (actual: %2)
-  PROXY_PORT       proxy port number             (actual: %3)
-  PROXY_HOST       proxy host name               (actual: %4)
-</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="335"/>
+        <location filename="main.cxx" line="347"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="341"/>
+        <location filename="main.cxx" line="353"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="348"/>
+        <location filename="main.cxx" line="360"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="365"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="364"/>
+        <location filename="main.cxx" line="376"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>
@ -1011,47 +974,6 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Specifies whether locally loaded documents are allowed to access remote urls. &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;Local resources are by default restricted from accessing remote content, which means your &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Courier New,courier&apos;; font-size:medium; color:#363534;&quot;&gt;file://&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt; will not be able to access &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Courier New,courier&apos;; font-size:medium; color:#363534;&quot;&gt;http://domain.com/foo.html&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Verdana&apos;; font-size:medium; color:#363534;&quot;&gt;. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="settings.ui" line="567"/>
-        <source>Search Engines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="583"/>
-        <source>Scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="588"/>
-        <source>Query URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="596"/>
-        <source>Use %1 as placeholder for the query, use %2 as placeholder for your system language.</source>
-        <oldsource>Use &lt;QUERY&gt; as placeholder for the query.</oldsource>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="638"/>
-        <source>TBD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="644"/>
-        <source>Session Management</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="650"/>
-        <source>save window state</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="660"/>
-        <source>close mimetype helper applications on exit</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <location filename="settings.ui" line="418"/>
        <source>local content can access remote urls</source>
@ -1112,11 +1034,6 @@ p, li { white-space: pre-wrap; }
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;In the &lt;span style=&quot; font-weight:600;&quot;&gt;Program&lt;/span&gt;-column, enter &lt;span style=&quot; font-weight:600;&quot;&gt;%1&lt;/span&gt; as file name placeholder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <oldsource>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Serif&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;In the &lt;span style=&quot; font-weight:600;&quot;&gt;Program&lt;/span&gt;-column, enter &lt;span style=&quot; font-weight:600;&quot;&gt;&amp;lt;FILENAME&amp;gt;&lt;/span&gt; as file name placeholder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -1131,5 +1048,45 @@ p, li { white-space: pre-wrap; }
        <source>-</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="settings.ui" line="567"/>
+        <source>Search Engines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="583"/>
+        <source>Scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="588"/>
+        <source>Query URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="596"/>
+        <source>Use %1 as placeholder for the query, use %2 as placeholder for your system language.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="638"/>
+        <source>TBD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="644"/>
+        <source>Session Management</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="650"/>
+        <source>save window state</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settings.ui" line="660"/>
+        <source>close mimetype helper applications on exit</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/swisssurfer/src/swisssurfer_fr.ts
+++ b/swisssurfer/src/swisssurfer_fr.ts
@ -597,12 +597,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QMessageBox</name>
    <message>
-        <location filename="smartcardauth.hxx" line="216"/>
+        <location filename="smartcardauth.hxx" line="217"/>
        <source>Wrong PIN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="smartcardauth.hxx" line="217"/>
+        <location filename="smartcardauth.hxx" line="218"/>
        <source>Authentication failed, please try again.</source>
        <translation type="unfinished"></translation>
    </message>
@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="290"/>
+        <location filename="main.cxx" line="302"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@ -658,27 +658,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="335"/>
+        <location filename="main.cxx" line="347"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="341"/>
+        <location filename="main.cxx" line="353"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="348"/>
+        <location filename="main.cxx" line="360"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="365"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="364"/>
+        <location filename="main.cxx" line="376"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>
--- a/swisssurfer/src/swisssurfer_it.ts
+++ b/swisssurfer/src/swisssurfer_it.ts
@ -597,12 +597,12 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QMessageBox</name>
    <message>
-        <location filename="smartcardauth.hxx" line="216"/>
+        <location filename="smartcardauth.hxx" line="217"/>
        <source>Wrong PIN</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="smartcardauth.hxx" line="217"/>
+        <location filename="smartcardauth.hxx" line="218"/>
        <source>Authentication failed, please try again.</source>
        <translation type="unfinished"></translation>
    </message>
@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
 <context>
    <name>QObject</name>
    <message>
-        <location filename="main.cxx" line="290"/>
+        <location filename="main.cxx" line="302"/>
        <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
 Options:
 -h, --help        show this help text
@ -658,27 +658,27 @@ Environment:
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="335"/>
+        <location filename="main.cxx" line="347"/>
        <source>Cannot read PEM certificate from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="341"/>
+        <location filename="main.cxx" line="353"/>
        <source>Read PEM certificates from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="348"/>
+        <location filename="main.cxx" line="360"/>
        <source>Cannot read PEM RSA key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="353"/>
+        <location filename="main.cxx" line="365"/>
        <source>Read private key from file: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="main.cxx" line="364"/>
+        <location filename="main.cxx" line="376"/>
        <source>Too few arguments.
 Try: %1 --help</source>
        <translation type="unfinished"></translation>