additional feature: built in library name; plus: closes #70
This commit is contained in:
Marc Wäckerlin
@@ -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;
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
## 1 2 3 4 5 6 7 8
|
||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
|
||||
|
||||
LANGS = en de fr it
|
||||
ALL_SRC = *.cxx *.hxx *.ui $(shell find resources -name .svn -prune -o \( -type f -o -type l \) -print)
|
||||
EXTRA_DIST = resources *.cxx *.hxx *.ui *.ts qt_*.qm *.qrc
|
||||
|
||||
LANGS = en de fr it
|
||||
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} -o $@ $<
|
||||
|
||||
${QMAKE_MAKEFILE_WIN}: ${QMAKE_PROJECT} ${ALL_SRC}
|
||||
${QMAKE} ${QMAKE_OPTIONS_WIN} -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}
|
||||
clean-local:
|
||||
-rm -r ${QMAKE_TARGET}.app
|
||||
|
||||
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}
|
||||
|
||||
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}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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...] [<url> ...]
|
||||
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>
|
||||
|
||||
@@ -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>&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&view ...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.ui" line="228"/>
|
||||
<source>Quick &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>
|
||||
@@ -203,53 +233,39 @@
|
||||
<source>show error logs</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="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="218"/>
|
||||
<source>Print ...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.ui" line="228"/>
|
||||
<source>Quick &Print</source>
|
||||
<oldsource>&Print</oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.ui" line="223"/>
|
||||
<source>Print Pre&view ...</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="433"/>
|
||||
<source>Checking: %1</source>
|
||||
<oldsource>Opening: %1</oldsource>
|
||||
<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="443"/>
|
||||
<source>Forbidden: %1</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><p>Access denied due to security considerations.</p><p>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>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
@@ -257,6 +273,11 @@
|
||||
<source>Illegal URL: %1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="466"/>
|
||||
<source>Zoom: %1%</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="515"/>
|
||||
<source>Print Document</source>
|
||||
@@ -265,10 +286,34 @@
|
||||
<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="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="623"/>
|
||||
<source>About</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>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="673"/>
|
||||
<source>%1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="678"/>
|
||||
<source>Info: %1</source>
|
||||
@@ -290,61 +335,6 @@
|
||||
<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><p>Access denied due to security considerations.</p><p>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>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="623"/>
|
||||
<source>About</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>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="673"/>
|
||||
<source>%1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="browser.hxx" line="1078"/>
|
||||
<source>Save File As ...</source>
|
||||
@@ -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><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></source>
|
||||
<oldsource><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></oldsource>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="downloadmanager.hxx" line="200"/>
|
||||
<source><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></source>
|
||||
<oldsource><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></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><!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></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><!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></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...] [<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)
|
||||
</source>
|
||||
<oldsource>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)
|
||||
</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; }
|
||||
<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></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 <QUERY> 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; }
|
||||
</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></source>
|
||||
<oldsource><!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></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>
|
||||
|
||||
@@ -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...] [<url> ...]
|
||||
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>
|
||||
|
||||
@@ -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...] [<url> ...]
|
||||
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>
|
||||
|
||||
Reference in New Issue
Block a user