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

added server certificate SWISSSIGN_SERVER_GOLD_CA_2008_G2; allow reject of authentication; added meaningful about dialog; added history menu; refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-04-27 11:30:29 +00:00
parent bfdea30255
commit 94fe11262a
10 changed files with 339 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swisssurfer/configure.in
View File

@@ -6,11 +6,12 @@ DOC_DIR=doc
m4_define(x_packagename, swisssurfer)
m4_define(x_major, 1)
m4_define(x_minor, 0)
m4_define(x_minor, 1)
PACKAGENAME=x_packagename
MAJOR=x_major
MINOR=x_minor
BUILDDATE=$(date "+%d.%m.%Y")
LEAST="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
for path in . .. ../..; do
@@ -30,6 +31,7 @@ AC_CONFIG_FILES(makefile
AC_SUBST(MAJOR)
AC_SUBST(MINOR)
AC_SUBST(LEAST)
AC_SUBST(BUILDDATE)
# libtool versioning
LIB_MAJOR=m4_eval(x_major+x_minor)

5
swisssurfer/src/authentication.hxx
View File

@@ -28,6 +28,11 @@ class Authentication: public QDialog, protected Ui::Authentication {
_auth->setPassword(_password->text());
QDialog::accept();
}
virtual void reject() {
_auth->setUser(QString());
_auth->setPassword(QString());
QDialog::reject();
}
private:
QAuthenticator* _auth;
};

35
swisssurfer/src/browser.hxx
View File

@@ -449,6 +449,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
statusBar()->showMessage(tr("Zoom: %1%").arg(100.0*i/10.0));
qobject_cast<QWebView*>(_tabs->currentWidget())->setZoomFactor(i/10.0);
}
void loadFromHistory() {
load(qobject_cast<QAction*>(sender())->data().toString());
}
void on_actionHome_activated() {
LOG;
@@ -597,7 +601,16 @@ class Browser: public QMainWindow, protected Ui::Browser {
}
void on_actionAbout_triggered() {
QMessageBox::aboutQt(this);
QMessageBox::about(this, tr("About"),
tr("SwissSurfer %1 (%2)\n\n"
"%3\n"
"Using: qt-%4\n"
"Compiled: qt-%5")
.arg(VERSION)
.arg(BUILDDATE)
.arg(QString::fromStdString(pcsc::version()))
.arg(qVersion())
.arg(QT_VERSION_STR));
}
void on_actionSettings_triggered() {
@@ -1073,10 +1086,10 @@ class Browser: public QMainWindow, protected Ui::Browser {
void authenticationRequired(QNetworkReply* reply,
QAuthenticator* authenticator) {
LOG;
LOG<<reply->url().toString()<<authenticator->realm();
statusBar()->showMessage(tr("authentication required"));
Authentication auth(authenticator, this);
auth.exec();
if (auth.exec()==QDialog::Rejected) reply->abort();
}
void proxyAuthenticationRequired(const QNetworkProxy& proxy,
@@ -1139,10 +1152,17 @@ class Browser: public QMainWindow, protected Ui::Browser {
void activateTab() {
iconChanged();
actionForward->setEnabled(dynamic_cast<QWebView*>(_tabs->currentWidget())
->history()->canGoForward());
actionBack->setEnabled(dynamic_cast<QWebView*>(_tabs->currentWidget())
->history()->canGoBack());
QWebHistory* history(dynamic_cast<QWebView*>(_tabs->currentWidget())
->history());
actionForward->setEnabled(history->canGoForward());
actionBack->setEnabled(history->canGoBack());
_history->clear();
QList<QWebHistoryItem> items(history->items());
for (int i = 0; i < items.size(); ++i) {
QAction* a(_history->addAction(items[i].title()));
a->setData(items[i].url());
connect(a, SIGNAL(triggered(bool)), SLOT(loadFromHistory()));
}
}
private:
@@ -1164,7 +1184,6 @@ class Browser: public QMainWindow, protected Ui::Browser {
DownloadProcesses _downloadProcesses;
Settings _settings;
SmartCardAuth _scAuth;
};
#endif

6
swisssurfer/src/browser.ui
View File

@@ -94,6 +94,11 @@
<addaction name="separator"/>
<addaction name="actionSettings"/>
</widget>
<widget class="QMenu" name="_history">
<property name="title">
<string>History</string>
</property>
</widget>
<widget class="QMenu" name="menuInfo">
<property name="title">
<string>Info</string>
@@ -102,6 +107,7 @@
</widget>
<addaction name="menuDatei"/>
<addaction name="menuEdit"/>
<addaction name="_history"/>
<addaction name="menuInfo"/>
</widget>
<action name="actionReload">

39
swisssurfer/src/main.cxx
View File

@@ -26,6 +26,44 @@
#include <memory>
const QByteArray SWISSSIGN_SERVER_GOLD_CA_2008_G2
("-----BEGIN CERTIFICATE-----\n"
"MIIGXjCCBEagAwIBAgIIXsz6acAzJ+8wDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UE\n"
"BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEfMB0GA1UEAxMWU3dpc3NTaWdu\n"
"IEdvbGQgQ0EgLSBHMjAeFw0wODA3MDcxNzA2MDNaFw0yMzA3MDcxNzA2MDNaMFEx\n"
"CzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3\n"
"aXNzU2lnbiBTZXJ2ZXIgR29sZCBDQSAyMDA4IC0gRzIwggEiMA0GCSqGSIb3DQEB\n"
"AQUAA4IBDwAwggEKAoIBAQDNMradteMVxVvR6t+pOooZejP8r1lY85el0PB7C118\n"
"iKYv1Apfq3mZ0wt7ZdpCyd2DzKE338Ki04Qn9IidLCkKDLOSNtlQlw4Yvg12W2bU\n"
"/WVaVAeUN0Tn3VeCkdWbSRIbvTGU63X9dp5lbgEm8XyjpLAK3SKABn7dWivfWuBo\n"
"oUCy64hJ+fSWljJmqG772Qmc9p3GxfN7/L227JH4SMaOwVcJd0rkvMTi1bWa1XFp\n"
"Q3lIlxW91JBEKqBKsru1h7wOq81VwIa3a2pdFgWY8F45G7M2Om9bLL5TiJ3Emkbl\n"
"gKIFRX+GztmnQdKdY8c8rpknh/jWr6YiqYm+jV6+crGhAgMBAAGjggJEMIICQDAO\n"
"BgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUl3be\n"
"CjTlEJpAxOvYnVpTeyHMRz4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn\n"
"8O4wgf8GA1UdHwSB9zCB9DBHoEWgQ4ZBaHR0cDovL2NybC5zd2lzc3NpZ24ubmV0\n"
"LzVCMjU3Qjk2QTQ2NTUxN0VCODM5RjNDMDc4NjY1RUU4M0FFN0YwRUUwgaiggaWg\n"
"gaKGgZ9sZGFwOi8vZGlyZWN0b3J5LnN3aXNzc2lnbi5uZXQvQ049NUIyNTdCOTZB\n"
"NDY1NTE3RUI4MzlGM0MwNzg2NjVFRTgzQUU3RjBFRSUyQ089U3dpc3NTaWduJTJD\n"
"Qz1DSD9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2U/b2JqZWN0Q2xhc3M9\n"
"Y1JMRGlzdHJpYnV0aW9uUG9pbnQwYgYDVR0gBFswWTBXBglghXQBWQECAQMwSjBI\n"
"BggrBgEFBQcCARY8aHR0cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS9Td2lz\n"
"c1NpZ24tR29sZC1DUC1DUFMtUjMucGRmMHQGCCsGAQUFBwEBBGgwZjBkBggrBgEF\n"
"BQcwAoZYaHR0cDovL3N3aXNzc2lnbi5uZXQvY2dpLWJpbi9hdXRob3JpdHkvZG93\n"
"bmxvYWQvNUIyNTdCOTZBNDY1NTE3RUI4MzlGM0MwNzg2NjVFRTgzQUU3RjBFRTAN\n"
"BgkqhkiG9w0BAQUFAAOCAgEAPuJBwXDS9McQwt5Gp0xHGpeiTCr4qmBwIKM33x8J\n"
"U3xjHQ/ynptuwkI5sqQsUcfuHe6uipqA3lIJoBM8u6M65jg/tZTsLoExFE+DtOf5\n"
"pHDvUXMFwhsjv9AbkhL6X1LBZAZEMkOpnuRdR2FD0wy1Kh4Hbel9LwmmaYJdfH5a\n"
"tkKVlHsN0b6stJ6zEX0dIgi/7M4FYaAZgoxBS1OijPxFCSl0sFT6UYf0GYXcr6M+\n"
"URLc1NBofDHo/lIrTygFNfk7PIvOrBoREiOqNtE5RnuGyJa+tt2y2P3QyGBE6Ppi\n"
"e/VCCMJagmH8yel0WhuyDUJE35bpNEL34w+pJKr7ApQ1sT0yh607jGEbl53Y+vFC\n"
"Uuwo39MMqzx26notCbj0izccf+nDuW05jFQWmRc6OCI2L9Yw34r+1PQTmQe1TKx6\n"
"FqnW3WP66ZwbXfGXwwfqmjcK+42695kQYSLsDfNaxxkCBTkt+MauYgXWiOfzAnYz\n"
"R2nMQ/LHTDsTpTMkJ+eA/bHcrUJVkBHNWDiolD5C03oSFY0fPRlSnfXHRpgcOkq8\n"
"yI/OYArKo4tvQpAYPnG7ELI/j2grgRx6xutuVMYVmzhr/JnqFto5Eg32hKjA5H5+\n"
"c4Ssw1ZaGGMMb9aMFlnJi4SYoXB8MfL+SU/u1K54dM1mV/oFK6e2dtGgaYDdV86v\n"
"0qo=\n"
"-----END CERTIFICATE-----");
const QByteArray SWISSSIGN_GOLD_CA_G2
("-----BEGIN CERTIFICATE-----\n"
"MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJ\n"
@@ -148,6 +186,7 @@ int main(int argv, char** argc) try {
QSslConfiguration sslConfig(QSslConfiguration::defaultConfiguration());
QList<QSslCertificate> certs(sslConfig.caCertificates());
certs.push_back(QSslCertificate(SWISSSIGN_GOLD_CA_G2));
certs.push_back(QSslCertificate(SWISSSIGN_SERVER_GOLD_CA_2008_G2));
certs.push_back(QSslCertificate(SWISSSIGN_SILVER_CA_G2));
certs.push_back(QSslCertificate(SWISSSIGN_PLATINUM_CA_G2));
sslConfig.setCaCertificates(certs);

3
swisssurfer/src/qmake.pro.in
View File

@@ -33,3 +33,6 @@ TARGET = @PACKAGENAME@
CODECFORSRC = UTF-8
CODECFORTR = UTF-8
DEFINES += VERSION=\'\"@VERSION@\"\' BUILDDATE=\'\"@BUILDDATE@\"\'
QMAKE_CXXFLAGS += -include iostream -D\"CRYPTOKI_LOG(X)=std::clog<<\\\"CRYPTOKI_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"PCSC_LOG(X)=std::clog<<\\\"PCSC_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl\" -D\"OPENSSL_LOG(X)=std::clog<<\\\"OPENSSL_\\\"<<X<<\\\"_@_\\\"<<__PRETTY_FUNCTION__<<std::endl'" @CPPFLAGS@ @CXXFLAGS@

109
swisssurfer/src/swisssurfer_de.ts
View File

@@ -54,169 +54,174 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="99"/>
<location filename="browser.ui" line="104"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="116"/>
<location filename="browser.ui" line="99"/>
<source>History</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="122"/>
<source>neu laden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="119"/>
<location filename="browser.ui" line="125"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="131"/>
<location filename="browser.ui" line="137"/>
<source>stoppen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="146"/>
<location filename="browser.ui" line="152"/>
<source>zurückkehren</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="164"/>
<location filename="browser.ui" line="170"/>
<source>weitergehen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="179"/>
<location filename="browser.ui" line="185"/>
<source>Startseite</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="182"/>
<location filename="browser.ui" line="188"/>
<source>Ctrl+Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="190"/>
<location filename="browser.ui" line="196"/>
<source>&amp;New Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="193"/>
<location filename="browser.ui" line="199"/>
<source>New Browser Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="196"/>
<location filename="browser.ui" line="202"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="201"/>
<location filename="browser.ui" line="207"/>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="206"/>
<location filename="browser.ui" line="212"/>
<source>&amp;Proxy...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="224"/>
<location filename="browser.ui" line="230"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="229"/>
<location filename="browser.ui" line="235"/>
<source>Next Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="232"/>
<location filename="browser.ui" line="238"/>
<source>Shift+Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="237"/>
<location filename="browser.ui" line="243"/>
<source>Previous Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="240"/>
<location filename="browser.ui" line="246"/>
<source>Shift+Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="245"/>
<location filename="browser.ui" line="251"/>
<source>New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="248"/>
<location filename="browser.ui" line="254"/>
<source>Add New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="251"/>
<location filename="browser.ui" line="257"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="256"/>
<location filename="browser.ui" line="262"/>
<source>Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="267"/>
<location filename="browser.ui" line="273"/>
<source>Close Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="275"/>
<location filename="browser.ui" line="281"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="283"/>
<location filename="browser.ui" line="289"/>
<source>&amp;Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="291"/>
<location filename="browser.ui" line="297"/>
<source>&amp;Reverse Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="294"/>
<location filename="browser.ui" line="300"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="134"/>
<location filename="browser.ui" line="270"/>
<location filename="browser.ui" line="140"/>
<location filename="browser.ui" line="276"/>
<source>Esc</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="259"/>
<location filename="browser.ui" line="265"/>
<source>find in page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="262"/>
<location filename="browser.ui" line="268"/>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="211"/>
<location filename="browser.ui" line="217"/>
<source>Print ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="221"/>
<location filename="browser.ui" line="227"/>
<source>Quick &amp;Print</source>
<oldsource>&amp;Print</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="216"/>
<location filename="browser.ui" line="222"/>
<source>Print Pre&amp;view ...</source>
<translation type="unfinished"></translation>
</message>
@@ -243,34 +248,34 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="496"/>
<location filename="browser.hxx" line="500"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="517"/>
<location filename="browser.hxx" line="521"/>
<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="646"/>
<location filename="browser.hxx" line="659"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="912"/>
<location filename="browser.hxx" line="925"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -291,28 +296,42 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="536"/>
<location filename="browser.hxx" line="540"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="641"/>
<location filename="browser.hxx" line="604"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="605"/>
<source>Certificate Assistant %1 (%2)
%3
Using: qt-%4
Compiled: qt-%5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="654"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1022"/>
<location filename="browser.hxx" line="1035"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1077"/>
<location filename="browser.hxx" line="1090"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1089"/>
<location filename="browser.hxx" line="1102"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

109
swisssurfer/src/swisssurfer_en.ts
View File

@@ -54,169 +54,174 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="99"/>
<location filename="browser.ui" line="104"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="116"/>
<location filename="browser.ui" line="99"/>
<source>History</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="122"/>
<source>neu laden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="119"/>
<location filename="browser.ui" line="125"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="131"/>
<location filename="browser.ui" line="137"/>
<source>stoppen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="146"/>
<location filename="browser.ui" line="152"/>
<source>zurückkehren</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="164"/>
<location filename="browser.ui" line="170"/>
<source>weitergehen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="179"/>
<location filename="browser.ui" line="185"/>
<source>Startseite</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="182"/>
<location filename="browser.ui" line="188"/>
<source>Ctrl+Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="190"/>
<location filename="browser.ui" line="196"/>
<source>&amp;New Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="193"/>
<location filename="browser.ui" line="199"/>
<source>New Browser Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="196"/>
<location filename="browser.ui" line="202"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="201"/>
<location filename="browser.ui" line="207"/>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="206"/>
<location filename="browser.ui" line="212"/>
<source>&amp;Proxy...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="224"/>
<location filename="browser.ui" line="230"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="229"/>
<location filename="browser.ui" line="235"/>
<source>Next Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="232"/>
<location filename="browser.ui" line="238"/>
<source>Shift+Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="237"/>
<location filename="browser.ui" line="243"/>
<source>Previous Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="240"/>
<location filename="browser.ui" line="246"/>
<source>Shift+Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="245"/>
<location filename="browser.ui" line="251"/>
<source>New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="248"/>
<location filename="browser.ui" line="254"/>
<source>Add New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="251"/>
<location filename="browser.ui" line="257"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="256"/>
<location filename="browser.ui" line="262"/>
<source>Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="267"/>
<location filename="browser.ui" line="273"/>
<source>Close Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="275"/>
<location filename="browser.ui" line="281"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="283"/>
<location filename="browser.ui" line="289"/>
<source>&amp;Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="291"/>
<location filename="browser.ui" line="297"/>
<source>&amp;Reverse Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="294"/>
<location filename="browser.ui" line="300"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="134"/>
<location filename="browser.ui" line="270"/>
<location filename="browser.ui" line="140"/>
<location filename="browser.ui" line="276"/>
<source>Esc</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="259"/>
<location filename="browser.ui" line="265"/>
<source>find in page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="262"/>
<location filename="browser.ui" line="268"/>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="211"/>
<location filename="browser.ui" line="217"/>
<source>Print ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="221"/>
<location filename="browser.ui" line="227"/>
<source>Quick &amp;Print</source>
<oldsource>&amp;Print</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="216"/>
<location filename="browser.ui" line="222"/>
<source>Print Pre&amp;view ...</source>
<translation type="unfinished"></translation>
</message>
@@ -243,34 +248,34 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="496"/>
<location filename="browser.hxx" line="500"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="517"/>
<location filename="browser.hxx" line="521"/>
<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="646"/>
<location filename="browser.hxx" line="659"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="912"/>
<location filename="browser.hxx" line="925"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -291,28 +296,42 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="536"/>
<location filename="browser.hxx" line="540"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="641"/>
<location filename="browser.hxx" line="604"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="605"/>
<source>Certificate Assistant %1 (%2)
%3
Using: qt-%4
Compiled: qt-%5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="654"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1022"/>
<location filename="browser.hxx" line="1035"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1077"/>
<location filename="browser.hxx" line="1090"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1089"/>
<location filename="browser.hxx" line="1102"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

109
swisssurfer/src/swisssurfer_fr.ts
View File

@@ -54,169 +54,174 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="99"/>
<location filename="browser.ui" line="104"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="116"/>
<location filename="browser.ui" line="99"/>
<source>History</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="122"/>
<source>neu laden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="119"/>
<location filename="browser.ui" line="125"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="131"/>
<location filename="browser.ui" line="137"/>
<source>stoppen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="146"/>
<location filename="browser.ui" line="152"/>
<source>zurückkehren</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="164"/>
<location filename="browser.ui" line="170"/>
<source>weitergehen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="179"/>
<location filename="browser.ui" line="185"/>
<source>Startseite</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="182"/>
<location filename="browser.ui" line="188"/>
<source>Ctrl+Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="190"/>
<location filename="browser.ui" line="196"/>
<source>&amp;New Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="193"/>
<location filename="browser.ui" line="199"/>
<source>New Browser Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="196"/>
<location filename="browser.ui" line="202"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="201"/>
<location filename="browser.ui" line="207"/>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="206"/>
<location filename="browser.ui" line="212"/>
<source>&amp;Proxy...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="224"/>
<location filename="browser.ui" line="230"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="229"/>
<location filename="browser.ui" line="235"/>
<source>Next Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="232"/>
<location filename="browser.ui" line="238"/>
<source>Shift+Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="237"/>
<location filename="browser.ui" line="243"/>
<source>Previous Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="240"/>
<location filename="browser.ui" line="246"/>
<source>Shift+Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="245"/>
<location filename="browser.ui" line="251"/>
<source>New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="248"/>
<location filename="browser.ui" line="254"/>
<source>Add New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="251"/>
<location filename="browser.ui" line="257"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="256"/>
<location filename="browser.ui" line="262"/>
<source>Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="267"/>
<location filename="browser.ui" line="273"/>
<source>Close Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="275"/>
<location filename="browser.ui" line="281"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="283"/>
<location filename="browser.ui" line="289"/>
<source>&amp;Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="291"/>
<location filename="browser.ui" line="297"/>
<source>&amp;Reverse Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="294"/>
<location filename="browser.ui" line="300"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="134"/>
<location filename="browser.ui" line="270"/>
<location filename="browser.ui" line="140"/>
<location filename="browser.ui" line="276"/>
<source>Esc</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="259"/>
<location filename="browser.ui" line="265"/>
<source>find in page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="262"/>
<location filename="browser.ui" line="268"/>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="211"/>
<location filename="browser.ui" line="217"/>
<source>Print ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="221"/>
<location filename="browser.ui" line="227"/>
<source>Quick &amp;Print</source>
<oldsource>&amp;Print</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="216"/>
<location filename="browser.ui" line="222"/>
<source>Print Pre&amp;view ...</source>
<translation type="unfinished"></translation>
</message>
@@ -243,34 +248,34 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="496"/>
<location filename="browser.hxx" line="500"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="517"/>
<location filename="browser.hxx" line="521"/>
<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="646"/>
<location filename="browser.hxx" line="659"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="912"/>
<location filename="browser.hxx" line="925"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -291,28 +296,42 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="536"/>
<location filename="browser.hxx" line="540"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="641"/>
<location filename="browser.hxx" line="604"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="605"/>
<source>Certificate Assistant %1 (%2)
%3
Using: qt-%4
Compiled: qt-%5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="654"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1022"/>
<location filename="browser.hxx" line="1035"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1077"/>
<location filename="browser.hxx" line="1090"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1089"/>
<location filename="browser.hxx" line="1102"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>

109
swisssurfer/src/swisssurfer_it.ts
View File

@@ -54,169 +54,174 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="99"/>
<location filename="browser.ui" line="104"/>
<source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="116"/>
<location filename="browser.ui" line="99"/>
<source>History</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="122"/>
<source>neu laden</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="119"/>
<location filename="browser.ui" line="125"/>
<source>F5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="131"/>
<location filename="browser.ui" line="137"/>
<source>stoppen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="146"/>
<location filename="browser.ui" line="152"/>
<source>zurückkehren</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="164"/>
<location filename="browser.ui" line="170"/>
<source>weitergehen</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="179"/>
<location filename="browser.ui" line="185"/>
<source>Startseite</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="182"/>
<location filename="browser.ui" line="188"/>
<source>Ctrl+Home</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="190"/>
<location filename="browser.ui" line="196"/>
<source>&amp;New Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="193"/>
<location filename="browser.ui" line="199"/>
<source>New Browser Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="196"/>
<location filename="browser.ui" line="202"/>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="201"/>
<location filename="browser.ui" line="207"/>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="206"/>
<location filename="browser.ui" line="212"/>
<source>&amp;Proxy...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="224"/>
<location filename="browser.ui" line="230"/>
<source>Ctrl+P</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="229"/>
<location filename="browser.ui" line="235"/>
<source>Next Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="232"/>
<location filename="browser.ui" line="238"/>
<source>Shift+Right</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="237"/>
<location filename="browser.ui" line="243"/>
<source>Previous Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="240"/>
<location filename="browser.ui" line="246"/>
<source>Shift+Left</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="245"/>
<location filename="browser.ui" line="251"/>
<source>New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="248"/>
<location filename="browser.ui" line="254"/>
<source>Add New Tab</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="251"/>
<location filename="browser.ui" line="257"/>
<source>Ctrl+T</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="256"/>
<location filename="browser.ui" line="262"/>
<source>Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="267"/>
<location filename="browser.ui" line="273"/>
<source>Close Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="275"/>
<location filename="browser.ui" line="281"/>
<source>&amp;About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="283"/>
<location filename="browser.ui" line="289"/>
<source>&amp;Settings ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="291"/>
<location filename="browser.ui" line="297"/>
<source>&amp;Reverse Find</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="294"/>
<location filename="browser.ui" line="300"/>
<source>Ctrl+R</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="134"/>
<location filename="browser.ui" line="270"/>
<location filename="browser.ui" line="140"/>
<location filename="browser.ui" line="276"/>
<source>Esc</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="259"/>
<location filename="browser.ui" line="265"/>
<source>find in page</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="262"/>
<location filename="browser.ui" line="268"/>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="211"/>
<location filename="browser.ui" line="217"/>
<source>Print ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="221"/>
<location filename="browser.ui" line="227"/>
<source>Quick &amp;Print</source>
<oldsource>&amp;Print</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.ui" line="216"/>
<location filename="browser.ui" line="222"/>
<source>Print Pre&amp;view ...</source>
<translation type="unfinished"></translation>
</message>
@@ -243,34 +248,34 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="496"/>
<location filename="browser.hxx" line="500"/>
<source>Print Document</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="517"/>
<location filename="browser.hxx" line="521"/>
<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="646"/>
<location filename="browser.hxx" line="659"/>
<source>Info: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>done.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="659"/>
<location filename="browser.hxx" line="672"/>
<source>page load error.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="912"/>
<location filename="browser.hxx" line="925"/>
<source>%1</source>
<comment>statusbar for hovered link %1=url</comment>
<translation type="unfinished"></translation>
@@ -291,28 +296,42 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="536"/>
<location filename="browser.hxx" line="540"/>
<source>%1 - %2</source>
<comment>statusbar actionForward_hovered %1=url %2=title</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="641"/>
<location filename="browser.hxx" line="604"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="605"/>
<source>Certificate Assistant %1 (%2)
%3
Using: qt-%4
Compiled: qt-%5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="654"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1022"/>
<location filename="browser.hxx" line="1035"/>
<source>Save File As ...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1077"/>
<location filename="browser.hxx" line="1090"/>
<source>authentication required</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="browser.hxx" line="1089"/>
<location filename="browser.hxx" line="1102"/>
<source>ssl error</source>
<translation type="unfinished"></translation>
</message>