const or not const that is the question, whether we're on mac or on a different system; refs #22

master
Marc Wäckerlin 14 years ago
parent 7fa2ba91f8
commit b3023927a4
  1. 8
      openssl-act-engine/src/CertificateList.cpp
  2. 8
      openssl-act-engine/src/engine_sct.cpp
  3. 7
      qt/makefile
  4. 11
      swisssurfer/src/makefile.am
  5. 80
      swisssurfer/src/swisssurfer_de.ts
  6. 80
      swisssurfer/src/swisssurfer_en.ts
  7. 80
      swisssurfer/src/swisssurfer_fr.ts
  8. 80
      swisssurfer/src/swisssurfer_it.ts

@ -22,6 +22,12 @@
#include <sstream>
#include <string>
#if defined win32 || defined linux
#define CONST_OR_NOTCONST const
#else
#define CONST_OR_NOTCONST
#endif
CertificateList::CertificateList()
: m_num_certs(0)
@ -130,7 +136,7 @@ void CertificateList::init(SlotList& slots)
for(cert_map_t::const_iterator it = cert_temp_map.begin(); it != cert_temp_map.end();++it)
{
const act::Blob& certblob = it->first;
unsigned char *cbp = const_cast<unsigned char*>(&certblob[0]);
CONST_OR_NOTCONST unsigned char *cbp = const_cast<CONST_OR_NOTCONST unsigned char*>(&certblob[0]);
cert_p->cert = d2i_X509(NULL, &cbp, certblob.size());

@ -28,6 +28,12 @@
#include <openssl/ssl.h>
#if defined win32 || defined linux
#define CONST_OR_NOTCONST const
#else
#define CONST_OR_NOTCONST
#endif
EVP_PKEY *SecureTokenEngine::encapsule_CardKey(CardKey *ck)
{
EVP_PKEY* pk(EVP_PKEY_new());
@ -157,7 +163,7 @@ int SecureTokenEngine::loadCertCtrl(ENGINE *e, load_cert_params *p)
return NULL;
const act::Blob& certblob = co.getCertBlob();
unsigned char *cbp = const_cast<unsigned char*>(&certblob[0]);
CONST_OR_NOTCONST unsigned char *cbp = const_cast<CONST_OR_NOTCONST unsigned char*>(&certblob[0]);
p->cert = d2i_X509(NULL, &cbp, certblob.size());

@ -1,4 +1,5 @@
QT=$(shell ls -1 | sed -n 's/\(qt-.*\)\.tar\.gz/\1/p')
PREFIX=/usr/local/trolltech/qt
all: build-lin32 build
@ -6,6 +7,7 @@ maintainer-clean: clean
-rm -rf ${QT} ${QT}-lin32
install: install-lin32
rm -rf ${PREFIX}
cd ${QT} && make install
${QT}: ${QT}.tar.gz
@ -14,10 +16,11 @@ ${QT}: ${QT}.tar.gz
build: ${QT}
-cd $< && make confclean
cd $< && (echo "yes" | ./configure -opensource -prefix /usr/local/trolltech/qt)
cd $< && (echo "yes" | ./configure -opensource -prefix ${PREFIX})
cd $< && make
install-lin32:
rm -rf ${PREFIX}-32bit
cd ${QT}-lin32 && make install
${QT}-lin32: ${QT}
@ -25,7 +28,7 @@ ${QT}-lin32: ${QT}
build-lin32: ${QT}-lin32
-cd $< && make confclean
cd $< && (echo "yes" | ./configure -opensource -platform linux-g++-32 -prefix /usr/local/trolltech/qt-32bit)
cd $< && (echo "yes" | ./configure -opensource -platform linux-g++-32 -prefix ${PREFIX}-32bit)
cd $< && make
.PHONY: maintainer-clean all build install build-lin32 install-lin32

@ -17,9 +17,6 @@ QMAKE_TARGET = @PACKAGENAME@
TARGETS = ${QMAKE_TARGET}
EXTRA_SCRIPTS= swisssurfer
bin_SCRIPTS = ${EXTRA_SCRIPTS}
if BUILD_WIN
QMAKE_MAKEFILE_WIN = makefile.win.qmake
QMAKE_OPTIONS_WIN = ${QMAKE_OPTIONS} -win32 -spec cross-mingw-g++
@ -69,6 +66,14 @@ ${QMAKE_TARGET_WIN}: ${QMAKE_MAKEFILE_WIN} ${ALL_SRC} $(LANGS:%=@PACKAGENAME@_%.
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 -f @PACKAGENAME@.app && cp -r @PACKAGENAME@.app ${bindir}/ )
uninstall-local:
-rm -rf ${bindir}/@PACKAGENAME@{,.exe,.app}
CLEANFILES = ${TARGETS} $(LANGS:%=@PACKAGENAME@_%.qm) \
*.o *.obj qrc_*.cpp ui_*.h moc_*.cpp \
${QMAKE_TARGET} ${QMAKE_TARGET_WIN}

@ -193,210 +193,210 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="153"/>
<location filename="browser.hxx" line="150"/>
<source>The connection to the proxy server was refused (the proxy server is not accepting requests).</source>
<oldsource>the connection to the proxy timed out or the proxy did not reply in time to the request sent</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="165"/>
<location filename="browser.hxx" line="162"/>
<source>The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any).</source>
<oldsource>the Network Access API cannot honor the request because the protocol is not known</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="231"/>
<location filename="browser.hxx" line="228"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="243"/>
<location filename="browser.hxx" line="240"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="258"/>
<location filename="browser.hxx" line="255"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="133"/>
<location filename="browser.hxx" line="130"/>
<source>Network connection successful, remote host can be reached.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="136"/>
<location filename="browser.hxx" line="133"/>
<source>The remote server refused the connection (the server is not accepting requests).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="139"/>
<location filename="browser.hxx" line="136"/>
<source>The remote server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="142"/>
<location filename="browser.hxx" line="139"/>
<source>The remote host name was not found (invalid hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="144"/>
<location filename="browser.hxx" line="141"/>
<source>The connection to the remote server timed out.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="146"/>
<location filename="browser.hxx" line="143"/>
<source>The operation was canceled via calls to abort() or close() before it was finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="149"/>
<location filename="browser.hxx" line="146"/>
<source>The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="156"/>
<location filename="browser.hxx" line="153"/>
<source>The proxy server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="159"/>
<location filename="browser.hxx" line="156"/>
<source>The proxy host name was not found (invalid proxy hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="162"/>
<location filename="browser.hxx" line="159"/>
<source>The connection to the proxy timed out or the proxy did not reply in time to the request sent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="169"/>
<location filename="browser.hxx" line="166"/>
<source>The access to the remote content was denied (similar to HTTP error 401).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="172"/>
<location filename="browser.hxx" line="169"/>
<source>The operation requested on the remote content is not permitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="175"/>
<location filename="browser.hxx" line="172"/>
<source>The remote content was not found at the server (similar to HTTP error 404).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="178"/>
<location filename="browser.hxx" line="175"/>
<source>The remote server requires authentication to serve the content but the credentials provided were not accepted (if any).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="182"/>
<location filename="browser.hxx" line="179"/>
<source>The Network Access API cannot honor the request because the protocol is not known.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="185"/>
<location filename="browser.hxx" line="182"/>
<source>The requested operation is invalid for this protocol.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="187"/>
<location filename="browser.hxx" line="184"/>
<source>An unknown network-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="189"/>
<location filename="browser.hxx" line="186"/>
<source>An unknown proxy-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="191"/>
<location filename="browser.hxx" line="188"/>
<source>An unknonwn error related to the remote content was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="194"/>
<location filename="browser.hxx" line="191"/>
<source>A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="197"/>
<location filename="browser.hxx" line="194"/>
<source>&lt;strong&gt;Unknown network error (code: %1).&lt;/string&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="245"/>
<location filename="browser.hxx" line="242"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="305"/>
<location filename="browser.hxx" line="302"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="326"/>
<location filename="browser.hxx" line="323"/>
<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="453"/>
<location filename="browser.hxx" line="452"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="466"/>
<location filename="browser.hxx" line="465"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="719"/>
<location filename="browser.hxx" line="718"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="234"/>
<location filename="browser.hxx" line="231"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="235"/>
<location filename="browser.hxx" line="232"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="236"/>
<location filename="browser.hxx" line="233"/>
<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="345"/>
<location filename="browser.hxx" line="342"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="448"/>
<location filename="browser.hxx" line="447"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="820"/>
<location filename="browser.hxx" line="819"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="875"/>
<location filename="browser.hxx" line="874"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="890"/>
<location filename="browser.hxx" line="889"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

@ -193,210 +193,210 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="153"/>
<location filename="browser.hxx" line="150"/>
<source>The connection to the proxy server was refused (the proxy server is not accepting requests).</source>
<oldsource>the connection to the proxy timed out or the proxy did not reply in time to the request sent</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="165"/>
<location filename="browser.hxx" line="162"/>
<source>The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any).</source>
<oldsource>the Network Access API cannot honor the request because the protocol is not known</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="231"/>
<location filename="browser.hxx" line="228"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="243"/>
<location filename="browser.hxx" line="240"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="258"/>
<location filename="browser.hxx" line="255"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="133"/>
<location filename="browser.hxx" line="130"/>
<source>Network connection successful, remote host can be reached.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="136"/>
<location filename="browser.hxx" line="133"/>
<source>The remote server refused the connection (the server is not accepting requests).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="139"/>
<location filename="browser.hxx" line="136"/>
<source>The remote server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="142"/>
<location filename="browser.hxx" line="139"/>
<source>The remote host name was not found (invalid hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="144"/>
<location filename="browser.hxx" line="141"/>
<source>The connection to the remote server timed out.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="146"/>
<location filename="browser.hxx" line="143"/>
<source>The operation was canceled via calls to abort() or close() before it was finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="149"/>
<location filename="browser.hxx" line="146"/>
<source>The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="156"/>
<location filename="browser.hxx" line="153"/>
<source>The proxy server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="159"/>
<location filename="browser.hxx" line="156"/>
<source>The proxy host name was not found (invalid proxy hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="162"/>
<location filename="browser.hxx" line="159"/>
<source>The connection to the proxy timed out or the proxy did not reply in time to the request sent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="169"/>
<location filename="browser.hxx" line="166"/>
<source>The access to the remote content was denied (similar to HTTP error 401).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="172"/>
<location filename="browser.hxx" line="169"/>
<source>The operation requested on the remote content is not permitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="175"/>
<location filename="browser.hxx" line="172"/>
<source>The remote content was not found at the server (similar to HTTP error 404).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="178"/>
<location filename="browser.hxx" line="175"/>
<source>The remote server requires authentication to serve the content but the credentials provided were not accepted (if any).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="182"/>
<location filename="browser.hxx" line="179"/>
<source>The Network Access API cannot honor the request because the protocol is not known.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="185"/>
<location filename="browser.hxx" line="182"/>
<source>The requested operation is invalid for this protocol.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="187"/>
<location filename="browser.hxx" line="184"/>
<source>An unknown network-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="189"/>
<location filename="browser.hxx" line="186"/>
<source>An unknown proxy-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="191"/>
<location filename="browser.hxx" line="188"/>
<source>An unknonwn error related to the remote content was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="194"/>
<location filename="browser.hxx" line="191"/>
<source>A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="197"/>
<location filename="browser.hxx" line="194"/>
<source>&lt;strong&gt;Unknown network error (code: %1).&lt;/string&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="245"/>
<location filename="browser.hxx" line="242"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="305"/>
<location filename="browser.hxx" line="302"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="326"/>
<location filename="browser.hxx" line="323"/>
<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="453"/>
<location filename="browser.hxx" line="452"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="466"/>
<location filename="browser.hxx" line="465"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="719"/>
<location filename="browser.hxx" line="718"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="234"/>
<location filename="browser.hxx" line="231"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="235"/>
<location filename="browser.hxx" line="232"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="236"/>
<location filename="browser.hxx" line="233"/>
<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="345"/>
<location filename="browser.hxx" line="342"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="448"/>
<location filename="browser.hxx" line="447"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="820"/>
<location filename="browser.hxx" line="819"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="875"/>
<location filename="browser.hxx" line="874"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="890"/>
<location filename="browser.hxx" line="889"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

@ -193,210 +193,210 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="153"/>
<location filename="browser.hxx" line="150"/>
<source>The connection to the proxy server was refused (the proxy server is not accepting requests).</source>
<oldsource>the connection to the proxy timed out or the proxy did not reply in time to the request sent</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="165"/>
<location filename="browser.hxx" line="162"/>
<source>The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any).</source>
<oldsource>the Network Access API cannot honor the request because the protocol is not known</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="231"/>
<location filename="browser.hxx" line="228"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="243"/>
<location filename="browser.hxx" line="240"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="258"/>
<location filename="browser.hxx" line="255"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="133"/>
<location filename="browser.hxx" line="130"/>
<source>Network connection successful, remote host can be reached.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="136"/>
<location filename="browser.hxx" line="133"/>
<source>The remote server refused the connection (the server is not accepting requests).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="139"/>
<location filename="browser.hxx" line="136"/>
<source>The remote server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="142"/>
<location filename="browser.hxx" line="139"/>
<source>The remote host name was not found (invalid hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="144"/>
<location filename="browser.hxx" line="141"/>
<source>The connection to the remote server timed out.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="146"/>
<location filename="browser.hxx" line="143"/>
<source>The operation was canceled via calls to abort() or close() before it was finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="149"/>
<location filename="browser.hxx" line="146"/>
<source>The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="156"/>
<location filename="browser.hxx" line="153"/>
<source>The proxy server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="159"/>
<location filename="browser.hxx" line="156"/>
<source>The proxy host name was not found (invalid proxy hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="162"/>
<location filename="browser.hxx" line="159"/>
<source>The connection to the proxy timed out or the proxy did not reply in time to the request sent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="169"/>
<location filename="browser.hxx" line="166"/>
<source>The access to the remote content was denied (similar to HTTP error 401).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="172"/>
<location filename="browser.hxx" line="169"/>
<source>The operation requested on the remote content is not permitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="175"/>
<location filename="browser.hxx" line="172"/>
<source>The remote content was not found at the server (similar to HTTP error 404).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="178"/>
<location filename="browser.hxx" line="175"/>
<source>The remote server requires authentication to serve the content but the credentials provided were not accepted (if any).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="182"/>
<location filename="browser.hxx" line="179"/>
<source>The Network Access API cannot honor the request because the protocol is not known.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="185"/>
<location filename="browser.hxx" line="182"/>
<source>The requested operation is invalid for this protocol.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="187"/>
<location filename="browser.hxx" line="184"/>
<source>An unknown network-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="189"/>
<location filename="browser.hxx" line="186"/>
<source>An unknown proxy-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="191"/>
<location filename="browser.hxx" line="188"/>
<source>An unknonwn error related to the remote content was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="194"/>
<location filename="browser.hxx" line="191"/>
<source>A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="197"/>
<location filename="browser.hxx" line="194"/>
<source>&lt;strong&gt;Unknown network error (code: %1).&lt;/string&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="245"/>
<location filename="browser.hxx" line="242"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="305"/>
<location filename="browser.hxx" line="302"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="326"/>
<location filename="browser.hxx" line="323"/>
<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="453"/>
<location filename="browser.hxx" line="452"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="466"/>
<location filename="browser.hxx" line="465"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="719"/>
<location filename="browser.hxx" line="718"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="234"/>
<location filename="browser.hxx" line="231"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="235"/>
<location filename="browser.hxx" line="232"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="236"/>
<location filename="browser.hxx" line="233"/>
<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="345"/>
<location filename="browser.hxx" line="342"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="448"/>
<location filename="browser.hxx" line="447"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="820"/>
<location filename="browser.hxx" line="819"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="875"/>
<location filename="browser.hxx" line="874"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="890"/>
<location filename="browser.hxx" line="889"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

@ -193,210 +193,210 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="153"/>
<location filename="browser.hxx" line="150"/>
<source>The connection to the proxy server was refused (the proxy server is not accepting requests).</source>
<oldsource>the connection to the proxy timed out or the proxy did not reply in time to the request sent</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="165"/>
<location filename="browser.hxx" line="162"/>
<source>The proxy requires authentication in order to honour the request but did not accept any credentials offered (if any).</source>
<oldsource>the Network Access API cannot honor the request because the protocol is not known</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="231"/>
<location filename="browser.hxx" line="228"/>
<source>Checking: %1</source>
<oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="243"/>
<location filename="browser.hxx" line="240"/>
<source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="258"/>
<location filename="browser.hxx" line="255"/>
<source>Zoom: %1%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="133"/>
<location filename="browser.hxx" line="130"/>
<source>Network connection successful, remote host can be reached.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="136"/>
<location filename="browser.hxx" line="133"/>
<source>The remote server refused the connection (the server is not accepting requests).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="139"/>
<location filename="browser.hxx" line="136"/>
<source>The remote server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="142"/>
<location filename="browser.hxx" line="139"/>
<source>The remote host name was not found (invalid hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="144"/>
<location filename="browser.hxx" line="141"/>
<source>The connection to the remote server timed out.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="146"/>
<location filename="browser.hxx" line="143"/>
<source>The operation was canceled via calls to abort() or close() before it was finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="149"/>
<location filename="browser.hxx" line="146"/>
<source>The SSL/TLS handshake failed and the encrypted channel could not be established. The sslErrors() signal should have been emitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="156"/>
<location filename="browser.hxx" line="153"/>
<source>The proxy server closed the connection prematurely, before the entire reply was received and processed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="159"/>
<location filename="browser.hxx" line="156"/>
<source>The proxy host name was not found (invalid proxy hostname).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="162"/>
<location filename="browser.hxx" line="159"/>
<source>The connection to the proxy timed out or the proxy did not reply in time to the request sent.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="169"/>
<location filename="browser.hxx" line="166"/>
<source>The access to the remote content was denied (similar to HTTP error 401).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="172"/>
<location filename="browser.hxx" line="169"/>
<source>The operation requested on the remote content is not permitted.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="175"/>
<location filename="browser.hxx" line="172"/>
<source>The remote content was not found at the server (similar to HTTP error 404).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="178"/>
<location filename="browser.hxx" line="175"/>
<source>The remote server requires authentication to serve the content but the credentials provided were not accepted (if any).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="182"/>
<location filename="browser.hxx" line="179"/>
<source>The Network Access API cannot honor the request because the protocol is not known.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="185"/>
<location filename="browser.hxx" line="182"/>
<source>The requested operation is invalid for this protocol.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="187"/>
<location filename="browser.hxx" line="184"/>
<source>An unknown network-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="189"/>
<location filename="browser.hxx" line="186"/>
<source>An unknown proxy-related error was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="191"/>
<location filename="browser.hxx" line="188"/>
<source>An unknonwn error related to the remote content was detected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="194"/>
<location filename="browser.hxx" line="191"/>
<source>A breakdown in protocol was detected (parsing error, invalid or unexpected responses, etc.).</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="197"/>
<location filename="browser.hxx" line="194"/>
<source>&lt;strong&gt;Unknown network error (code: %1).&lt;/string&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="245"/>
<location filename="browser.hxx" line="242"/>
<source>Illegal URL: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="305"/>
<location filename="browser.hxx" line="302"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="326"/>
<location filename="browser.hxx" line="323"/>
<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="453"/>
<location filename="browser.hxx" line="452"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="466"/>
<location filename="browser.hxx" line="465"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="719"/>
<location filename="browser.hxx" line="718"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="234"/>
<location filename="browser.hxx" line="231"/>
<source>Forbidden: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="235"/>
<location filename="browser.hxx" line="232"/>
<source>Access Denied</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="236"/>
<location filename="browser.hxx" line="233"/>
<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="345"/>
<location filename="browser.hxx" line="342"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="448"/>
<location filename="browser.hxx" line="447"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="820"/>
<location filename="browser.hxx" line="819"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="875"/>
<location filename="browser.hxx" line="874"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="890"/>
<location filename="browser.hxx" line="889"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

Loading…
Cancel
Save