diff --git a/swisssurfer/configure.in b/swisssurfer/configure.in index 14ef121..05327c8 100644 --- 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 diff --git a/swisssurfer/src/main.cxx b/swisssurfer/src/main.cxx index c6ecc23..7dda1b7 100644 --- 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; diff --git a/swisssurfer/src/makefile.am b/swisssurfer/src/makefile.am index c0b5ab5..88b95b9 100644 --- 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 '' > @PACKAGENAME@_$@.ts + echo '' >> @PACKAGENAME@_$@.ts + echo '' >> @PACKAGENAME@_$@.ts + xqilla merge-translation.xquery >> @PACKAGENAME@_$@.ts + echo '' >> @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} diff --git a/swisssurfer/src/qmake.pro.in b/swisssurfer/src/qmake.pro.in index 87c28ea..ef98506 100644 --- 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 diff --git a/swisssurfer/src/smartcardauth.hxx b/swisssurfer/src/smartcardauth.hxx index b1a7d48..1cf6b5c 100644 --- 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="< QMessageBox - + Wrong PIN - + Authentication failed, please try again. @@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -658,27 +658,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 32df3bd..708e9cc 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -1,6 +1,6 @@ - + UTF-8 Authentication @@ -35,7 +35,6 @@ SwissSurfer - SwissSign Browser @@ -54,13 +53,13 @@ - - Info + + History - - History + + Info @@ -78,6 +77,12 @@ stoppen + + + + Esc + + zurückkehren @@ -123,6 +128,21 @@ &Proxy... + + + Print ... + + + + + Print Pre&view ... + + + + + Quick &Print + + Ctrl+P @@ -168,6 +188,16 @@ Find + + + find in page + + + + + Ctrl+F + + Close Find @@ -204,57 +234,48 @@ - - - Esc - - - - - find in page + + Checking: %1 - - Ctrl+F + + SSL Not Supported - - Print ... + + SSL is not supported on your system - - Quick &Print - &Print + + Forbidden: %1 - - Print Pre&view ... + + Access Denied - - Checking: %1 - Opening: %1 + + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. Reading: %1 - Reading: %1% - - Zoom: %1% + + Illegal URL: %1 - - Illegal URL: %1 + + Zoom: %1% @@ -265,84 +286,53 @@ %1 - %2 - Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - - Info: %1 + + %1 - %2 + statusbar actionForward_hovered %1=url %2=title - - done. + + About - - page load error. + + SwissSurfer %1 (%2) + +%3 +Using: qt-%4 +Compiled: qt-%5 - + %1 - statusbar for hovered link %1=url - - - - - Forbidden: %1 - - SSL Not Supported - - - - - SSL is not supported on your system - - - - - Access Denied - - - - - <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - - - - - %1 - %2 - statusbar actionForward_hovered %1=url %2=title + + Info: %1 - - About + + done. - - SwissSurfer %1 (%2) - -%3 -Using: qt-%4 -Compiled: qt-%5 - Certificate Assistant %1 (%2) - -%3 -Using: qt-%4 -Compiled: qt-%5 + + page load error. - + %1 + statusbar for hovered link %1=url @@ -396,7 +386,6 @@ Compiled: qt-%5 The SSL/TLS handshake failed and the encrypted channel could not be established. See SSL-Errors above. - The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted. @@ -482,13 +471,11 @@ Compiled: qt-%5 <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> - <h1>SSL Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -505,13 +492,11 @@ Compiled: qt-%5 Certificate PIN Entry - SwissSign Pin Entry Please enter your PIN to unlock Certificate: - Please enter your Certificate PIN to authenticate: @@ -564,6 +549,15 @@ Compiled: qt-%5 Issuer CA: + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; color:#00b900;">✔</span></p></body></html> + + @@ -584,25 +578,16 @@ p, li { white-space: pre-wrap; } certificate is bad or locked - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; color:#00b900;">✔</span></p></body></html> - - QMessageBox - + Wrong PIN - + Authentication failed, please try again. @@ -610,7 +595,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] 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) - Usage: %1 [OPTIONS...] [<url> ...] -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't load or store any settings - --no-login don't ask for smartcard password - -l, --lib <file> path to file libengine_act.so - -s, --settings <file> - load settings from <file> - if you sepcify -k and -s, -k must be first - -c, --cert <file> load local client certificate from <file> - -y, --key <file> load local certificate key from <file> - -m, --mime <mime> <ext> <tool> - start <tool> for mimetype <mime> - <url> optional full URL -Environment: - LANGUAGE "de", "en", ... (actual: %5) - PROXY_TYPE "http" or "socks" or "" (actual: %2) - PROXY_PORT proxy port number (actual: %3) - PROXY_HOST proxy host name (actual: %4) - - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help @@ -1011,47 +974,6 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Specifies whether locally loaded documents are allowed to access remote urls. </span><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">Local resources are by default restricted from accessing remote content, which means your </span><span style=" font-family:'Courier New,courier'; font-size:medium; color:#363534;">file://</span><span style=" font-family:'Verdana'; font-size:medium; color:#363534;"> will not be able to access </span><span style=" font-family:'Courier New,courier'; font-size:medium; color:#363534;">http://domain.com/foo.html</span><span style=" font-family:'Verdana'; font-size:medium; color:#363534;">. </span></p></body></html> - - - Search Engines - - - - - Scheme - - - - - Query URL - - - - - Use %1 as placeholder for the query, use %2 as placeholder for your system language. - Use <QUERY> as placeholder for the query. - - - - - TBD - - - - - Session Management - - - - - save window state - - - - - close mimetype helper applications on exit - - local content can access remote urls @@ -1112,11 +1034,6 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the <span style=" font-weight:600;">Program</span>-column, enter <span style=" font-weight:600;">%1</span> as file name placeholder.</p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Serif'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">In the <span style=" font-weight:600;">Program</span>-column, enter <span style=" font-weight:600;">&lt;FILENAME&gt;</span> as file name placeholder.</p></body></html> @@ -1131,5 +1048,45 @@ p, li { white-space: pre-wrap; } - + + + Search Engines + + + + + Scheme + + + + + Query URL + + + + + Use %1 as placeholder for the query, use %2 as placeholder for your system language. + + + + + TBD + + + + + Session Management + + + + + save window state + + + + + close mimetype helper applications on exit + + diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 32df3bd..cd3bbee 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -597,12 +597,12 @@ p, li { white-space: pre-wrap; } QMessageBox - + Wrong PIN - + Authentication failed, please try again. @@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -658,27 +658,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 32df3bd..cd3bbee 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -597,12 +597,12 @@ p, li { white-space: pre-wrap; } QMessageBox - + Wrong PIN - + Authentication failed, please try again. @@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; } QObject - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text @@ -658,27 +658,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help