web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

closes #60

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-06-08 13:00:40 +00:00
parent 166391ebde
commit 7f2e08667b
7 changed files with 133 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
swisssurfer/src/browser.hxx
+4 -10
View File
@@ -61,8 +61,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
_settings(mimeTypes, this, settings, !kiosk), _errorLog(this) { _settings(mimeTypes, this, settings, !kiosk), _errorLog(this) {
LOG<<urls; LOG<<urls;
try { try {
_scAuth = std::auto_ptr<SmartCardAuth> _networkManager.scAuth(new SmartCardAuth(actlib, this, login));
(new SmartCardAuth(actlib, this, login));
} catch (const std::exception& x) { } catch (const std::exception& x) {
LOG<<"No SmartCard Support:"<<x.what(); LOG<<"No SmartCard Support:"<<x.what();
} }
@@ -125,6 +124,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
loadWin(urls.size()); loadWin(urls.size());
if (urls.size()) load(urls.at(0)); if (urls.size()) load(urls.at(0));
for (int i(1); i<urls.size(); ++i) load(urls.at(i), newTab()); for (int i(1); i<urls.size(); ++i) load(urls.at(i), newTab());
if (!QSslSocket::supportsSsl())
QMessageBox::critical(this, tr("SSL Not Supported"),
tr("SSL is not supported on your system"));
} }
~Browser() { ~Browser() {
@@ -435,13 +437,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
void load(QUrl page, QWebView* view=0) { void load(QUrl page, QWebView* view=0) {
LOG<<page.toString(); LOG<<page.toString();
statusBar()->showMessage(tr("Checking: %1").arg(page.toString())); statusBar()->showMessage(tr("Checking: %1").arg(page.toString()));
if (page.scheme()=="https") {
LOG<<"Need to login";
if (!QSslSocket::supportsSsl())
QMessageBox::critical(this, tr("SSL Not Supported"),
tr("SSL is not supported on your system"));
if (_scAuth.get()) _scAuth->login(false);
}
if (!check(page)) { if (!check(page)) {
LOG<<"########## BLACK LISTED IGNORED ##########"; LOG<<"########## BLACK LISTED IGNORED ##########";
statusBar()->showMessage(tr("Forbidden: %1").arg(page.toString())); statusBar()->showMessage(tr("Forbidden: %1").arg(page.toString()));
@@ -1224,7 +1219,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
DownloadProcesses _downloadProcesses; DownloadProcesses _downloadProcesses;
Settings _settings; Settings _settings;
ErrorLog _errorLog; ErrorLog _errorLog;
std::auto_ptr<SmartCardAuth> _scAuth;
}; };
#endif #endif
swisssurfer/src/sslclientnetworkmanager.hxx
+13
View File
@@ -6,6 +6,7 @@
// 45678901234567890123456789012345678901234567890123456789012345678901234567890 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
#include <QtNetwork/QNetworkReply> #include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkAccessManager>
#include <smartcardauth.hxx>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#ifndef LOG #ifndef LOG
@@ -25,6 +26,10 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
LOG; LOG;
} }
void scAuth(SmartCardAuth* auth) {
_scAuth = std::auto_ptr<SmartCardAuth>(auth);
}
Q_SIGNALS: Q_SIGNALS:
void created(QNetworkReply*); void created(QNetworkReply*);
@@ -35,6 +40,10 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
const QNetworkRequest& req, const QNetworkRequest& req,
QIODevice* outgoingData = 0 ) { QIODevice* outgoingData = 0 ) {
LOG<<req.url(); LOG<<req.url();
if (req.url().scheme()=="https") {
LOG<<"Need to login";
if (_scAuth.get()) _scAuth->login(false);
}
QNetworkReply* rep QNetworkReply* rep
(QNetworkAccessManager::createRequest(op, req, outgoingData)); (QNetworkAccessManager::createRequest(op, req, outgoingData));
created(rep); created(rep);
@@ -42,4 +51,8 @@ class SslClientAuthNetworkAccessManager: public QNetworkAccessManager {
return rep; return rep;
} }
private:
std::auto_ptr<SmartCardAuth> _scAuth;
}; };
swisssurfer/src/swisssurfer_de.ts
+28 -28
View File
@@ -236,98 +236,98 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="433"/> <location filename="browser.hxx" line="439"/>
<source>Checking: %1</source> <source>Checking: %1</source>
<oldsource>Opening: %1</oldsource> <oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="451"/> <location filename="browser.hxx" line="450"/>
<source>Reading: %1</source> <source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource> <oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="466"/> <location filename="browser.hxx" line="465"/>
<source>Zoom: %1%</source> <source>Zoom: %1%</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="453"/> <location filename="browser.hxx" line="452"/>
<source>Illegal URL: %1</source> <source>Illegal URL: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="515"/> <location filename="browser.hxx" line="514"/>
<source>Print Document</source> <source>Print Document</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="536"/> <location filename="browser.hxx" line="535"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource> <oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment> <comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="678"/> <location filename="browser.hxx" line="677"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="944"/> <location filename="browser.hxx" line="943"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="443"/> <location filename="browser.hxx" line="442"/>
<source>Forbidden: %1</source> <source>Forbidden: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="437"/> <location filename="browser.hxx" line="128"/>
<source>SSL Not Supported</source> <source>SSL Not Supported</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="438"/> <location filename="browser.hxx" line="129"/>
<source>SSL is not supported on your system</source> <source>SSL is not supported on your system</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="443"/>
<source>Access Denied</source> <source>Access Denied</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="445"/> <location filename="browser.hxx" line="444"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="555"/> <location filename="browser.hxx" line="554"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment> <comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="623"/> <location filename="browser.hxx" line="622"/>
<source>About</source> <source>About</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="624"/> <location filename="browser.hxx" line="623"/>
<source>SwissSurfer %1 (%2) <source>SwissSurfer %1 (%2)
%3 %3
@@ -341,22 +341,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="673"/> <location filename="browser.hxx" line="672"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1078"/> <location filename="browser.hxx" line="1077"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1141"/> <location filename="browser.hxx" line="1140"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1153"/> <location filename="browser.hxx" line="1152"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="302"/> <location filename="main.cxx" line="305"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@@ -658,27 +658,27 @@ Environment:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="347"/> <location filename="main.cxx" line="350"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="353"/> <location filename="main.cxx" line="356"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="360"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="368"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="376"/> <location filename="main.cxx" line="379"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
swisssurfer/src/swisssurfer_en.ts
+28 -28
View File
@@ -234,74 +234,74 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="433"/> <location filename="browser.hxx" line="439"/>
<source>Checking: %1</source> <source>Checking: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="437"/> <location filename="browser.hxx" line="128"/>
<source>SSL Not Supported</source> <source>SSL Not Supported</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="438"/> <location filename="browser.hxx" line="129"/>
<source>SSL is not supported on your system</source> <source>SSL is not supported on your system</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="443"/> <location filename="browser.hxx" line="442"/>
<source>Forbidden: %1</source> <source>Forbidden: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="443"/>
<source>Access Denied</source> <source>Access Denied</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="445"/> <location filename="browser.hxx" line="444"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="451"/> <location filename="browser.hxx" line="450"/>
<source>Reading: %1</source> <source>Reading: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="453"/> <location filename="browser.hxx" line="452"/>
<source>Illegal URL: %1</source> <source>Illegal URL: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="466"/> <location filename="browser.hxx" line="465"/>
<source>Zoom: %1%</source> <source>Zoom: %1%</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="515"/> <location filename="browser.hxx" line="514"/>
<source>Print Document</source> <source>Print Document</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="536"/> <location filename="browser.hxx" line="535"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<comment>statusbar actionBack_hovered %1=url %2=title</comment> <comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="555"/> <location filename="browser.hxx" line="554"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment> <comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="623"/> <location filename="browser.hxx" line="622"/>
<source>About</source> <source>About</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="624"/> <location filename="browser.hxx" line="623"/>
<source>SwissSurfer %1 (%2) <source>SwissSurfer %1 (%2)
%3 %3
@@ -310,43 +310,43 @@ Compiled: qt-%5</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="673"/> <location filename="browser.hxx" line="672"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="678"/> <location filename="browser.hxx" line="677"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="944"/> <location filename="browser.hxx" line="943"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1078"/> <location filename="browser.hxx" line="1077"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1141"/> <location filename="browser.hxx" line="1140"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1153"/> <location filename="browser.hxx" line="1152"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -595,7 +595,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="302"/> <location filename="main.cxx" line="305"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@@ -621,27 +621,27 @@ Environment:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="347"/> <location filename="main.cxx" line="350"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="353"/> <location filename="main.cxx" line="356"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="360"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="368"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="376"/> <location filename="main.cxx" line="379"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
swisssurfer/src/swisssurfer_fr.ts
+28 -28
View File
@@ -236,98 +236,98 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="433"/> <location filename="browser.hxx" line="439"/>
<source>Checking: %1</source> <source>Checking: %1</source>
<oldsource>Opening: %1</oldsource> <oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="451"/> <location filename="browser.hxx" line="450"/>
<source>Reading: %1</source> <source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource> <oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="466"/> <location filename="browser.hxx" line="465"/>
<source>Zoom: %1%</source> <source>Zoom: %1%</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="453"/> <location filename="browser.hxx" line="452"/>
<source>Illegal URL: %1</source> <source>Illegal URL: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="515"/> <location filename="browser.hxx" line="514"/>
<source>Print Document</source> <source>Print Document</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="536"/> <location filename="browser.hxx" line="535"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource> <oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment> <comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="678"/> <location filename="browser.hxx" line="677"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="944"/> <location filename="browser.hxx" line="943"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="443"/> <location filename="browser.hxx" line="442"/>
<source>Forbidden: %1</source> <source>Forbidden: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="437"/> <location filename="browser.hxx" line="128"/>
<source>SSL Not Supported</source> <source>SSL Not Supported</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="438"/> <location filename="browser.hxx" line="129"/>
<source>SSL is not supported on your system</source> <source>SSL is not supported on your system</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="443"/>
<source>Access Denied</source> <source>Access Denied</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="445"/> <location filename="browser.hxx" line="444"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="555"/> <location filename="browser.hxx" line="554"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment> <comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="623"/> <location filename="browser.hxx" line="622"/>
<source>About</source> <source>About</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="624"/> <location filename="browser.hxx" line="623"/>
<source>SwissSurfer %1 (%2) <source>SwissSurfer %1 (%2)
%3 %3
@@ -341,22 +341,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="673"/> <location filename="browser.hxx" line="672"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1078"/> <location filename="browser.hxx" line="1077"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1141"/> <location filename="browser.hxx" line="1140"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1153"/> <location filename="browser.hxx" line="1152"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="302"/> <location filename="main.cxx" line="305"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@@ -658,27 +658,27 @@ Environment:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="347"/> <location filename="main.cxx" line="350"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="353"/> <location filename="main.cxx" line="356"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="360"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="368"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="376"/> <location filename="main.cxx" line="379"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
swisssurfer/src/swisssurfer_it.ts
+28 -28
View File
@@ -236,98 +236,98 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="433"/> <location filename="browser.hxx" line="439"/>
<source>Checking: %1</source> <source>Checking: %1</source>
<oldsource>Opening: %1</oldsource> <oldsource>Opening: %1</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="451"/> <location filename="browser.hxx" line="450"/>
<source>Reading: %1</source> <source>Reading: %1</source>
<oldsource>Reading: %1%</oldsource> <oldsource>Reading: %1%</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="466"/> <location filename="browser.hxx" line="465"/>
<source>Zoom: %1%</source> <source>Zoom: %1%</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="453"/> <location filename="browser.hxx" line="452"/>
<source>Illegal URL: %1</source> <source>Illegal URL: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="515"/> <location filename="browser.hxx" line="514"/>
<source>Print Document</source> <source>Print Document</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="536"/> <location filename="browser.hxx" line="535"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<oldsource>Back to %1 - %2</oldsource> <oldsource>Back to %1 - %2</oldsource>
<comment>statusbar actionBack_hovered %1=url %2=title</comment> <comment>statusbar actionBack_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="678"/> <location filename="browser.hxx" line="677"/>
<source>Info: %1</source> <source>Info: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>done.</source> <source>done.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="691"/> <location filename="browser.hxx" line="690"/>
<source>page load error.</source> <source>page load error.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="944"/> <location filename="browser.hxx" line="943"/>
<source>%1</source> <source>%1</source>
<comment>statusbar for hovered link %1=url</comment> <comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="443"/> <location filename="browser.hxx" line="442"/>
<source>Forbidden: %1</source> <source>Forbidden: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="437"/> <location filename="browser.hxx" line="128"/>
<source>SSL Not Supported</source> <source>SSL Not Supported</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="438"/> <location filename="browser.hxx" line="129"/>
<source>SSL is not supported on your system</source> <source>SSL is not supported on your system</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="444"/> <location filename="browser.hxx" line="443"/>
<source>Access Denied</source> <source>Access Denied</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="445"/> <location filename="browser.hxx" line="444"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="555"/> <location filename="browser.hxx" line="554"/>
<source>%1 - %2</source> <source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment> <comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="623"/> <location filename="browser.hxx" line="622"/>
<source>About</source> <source>About</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="624"/> <location filename="browser.hxx" line="623"/>
<source>SwissSurfer %1 (%2) <source>SwissSurfer %1 (%2)
%3 %3
@@ -341,22 +341,22 @@ Compiled: qt-%5</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="673"/> <location filename="browser.hxx" line="672"/>
<source>%1</source> <source>%1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1078"/> <location filename="browser.hxx" line="1077"/>
<source>Save File As ...</source> <source>Save File As ...</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1141"/> <location filename="browser.hxx" line="1140"/>
<source>authentication required</source> <source>authentication required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="browser.hxx" line="1153"/> <location filename="browser.hxx" line="1152"/>
<source>ssl error</source> <source>ssl error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -610,7 +610,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="main.cxx" line="302"/> <location filename="main.cxx" line="305"/>
<source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...] <source>Usage: %1 [OPTIONS...] [&lt;url&gt; ...]
Options: Options:
-h, --help show this help text -h, --help show this help text
@@ -658,27 +658,27 @@ Environment:
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="347"/> <location filename="main.cxx" line="350"/>
<source>Cannot read PEM certificate from file: %1</source> <source>Cannot read PEM certificate from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="353"/> <location filename="main.cxx" line="356"/>
<source>Read PEM certificates from file: %1</source> <source>Read PEM certificates from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="360"/> <location filename="main.cxx" line="363"/>
<source>Cannot read PEM RSA key from file: %1</source> <source>Cannot read PEM RSA key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="365"/> <location filename="main.cxx" line="368"/>
<source>Read private key from file: %1</source> <source>Read private key from file: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="main.cxx" line="376"/> <location filename="main.cxx" line="379"/>
<source>Too few arguments. <source>Too few arguments.
Try: %1 --help</source> Try: %1 --help</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>