From d4d460d365e88b6bc1e6051947e947a62c4e9a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 6 Dec 2011 14:40:56 +0000 Subject: [PATCH] redesign; refs #107 --- swisssurfer/src/browser.hxx | 99 ++++++++--- swisssurfer/src/browser.ui | 26 ++- swisssurfer/src/certificate.ui | 3 + swisssurfer/src/downloadmanager.hxx | 11 +- swisssurfer/src/main.cxx | 7 +- swisssurfer/src/pinentry.hxx | 4 + swisssurfer/src/pinentry.ui | 261 ++++++++++++++++++---------- swisssurfer/src/qmake.pro.in | 2 +- swisssurfer/src/resources.qrc | 2 + swisssurfer/src/swisssurfer_de.ts | 252 ++++++++++++++++----------- swisssurfer/src/swisssurfer_en.ts | 251 +++++++++++++++----------- swisssurfer/src/swisssurfer_fr.ts | 252 ++++++++++++++++----------- swisssurfer/src/swisssurfer_it.ts | 251 +++++++++++++++----------- 13 files changed, 891 insertions(+), 530 deletions(-) diff --git a/swisssurfer/src/browser.hxx b/swisssurfer/src/browser.hxx index b5501d9..1a461b7 100644 --- a/swisssurfer/src/browser.hxx +++ b/swisssurfer/src/browser.hxx @@ -61,14 +61,15 @@ class Browser: public QMainWindow, protected Ui::Browser { Browser(const QString& actlib, const QStringList& urls = QStringList(), QSettings* settings=0, Settings::MimeTypes mimeTypes = Settings::MimeTypes(), - bool kiosk = false, bool login = true): - _url(0), _find(0), + bool kiosk = false, bool login = true, bool quirks=true): + _url(0), _find(new ButtonLineEdit), _kiosk(kiosk), _settings(mimeTypes, this, settings, !kiosk), _errorLog(this), _logincertificate(this), _proxy("http://swisssign.com", this), _showErrorLog(0), - _startUrl(urls.size()) { + _startUrl(urls.size()), + _quirks(quirks), _search(new ButtonLineEdit) { LOG<addPermanentWidget(_find); + _find->add(actionUnFind); + _find->add(actionClearFind); + _find->hide(); statusBar()->addPermanentWidget(_progress = new QProgressBar()); _progress -> setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + statusBar()->addPermanentWidget(new QLabel("-")); statusBar()->addPermanentWidget(_zoom = new QSlider(Qt::Horizontal)); + statusBar()->addPermanentWidget(new QLabel("+")); _zoom->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); _zoom->setMinimum(10); _zoom->setMaximum(190); @@ -90,15 +97,18 @@ class Browser: public QMainWindow, protected Ui::Browser { _zoom->setPageStep(10); _zoom->setTickPosition(QSlider::TicksAbove); assert(connect(_zoom, SIGNAL(valueChanged(int)), SLOT(zoom(int)))); + if (!_quirks) { + _toolbar->addAction(actionReload); + _toolbar->addAction(actionStop); + } if (!_kiosk) { QComboBox* combo(new QComboBox(_toolbar)); _url = combo; - combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); combo->setInsertPolicy(QComboBox::NoInsert); combo->setLineEdit(new ButtonLineEdit(combo)); + combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); combo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred)); - combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); combo->setEditable(!_kiosk); assert(connect(combo, SIGNAL(currentIndexChanged(const QString&)), SLOT(load(QString)))); @@ -106,20 +116,39 @@ class Browser: public QMainWindow, protected Ui::Browser { SLOT(load()))); assert(connect(combo->lineEdit(), SIGNAL(textChanged(QString)), SLOT(goodUrl()))); + if (_quirks) { + dynamic_cast(combo->lineEdit())->add + (actionStop); dynamic_cast(combo->lineEdit())->add - (actionAddBookmark); - dynamic_cast(combo->lineEdit())->add - (actionClearLocation); + (actionReload); + } + if (!_quirks) { + dynamic_cast(combo->lineEdit())->add + (actionAddBookmark); + dynamic_cast(combo->lineEdit())->add + (actionClearLocation); + } _editbookmarks = std::auto_ptr(new EditBookmarks(combo, this)); } else { QLineEdit* label(new QLineEdit(_toolbar)); _url = label; label->setReadOnly(true); + _url->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, + QSizePolicy::Minimum)); } - _url->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, - QSizePolicy::Preferred)); _toolbar->addWidget(_url); + _toolbar->addWidget(_search=new ButtonLineEdit); + _search->add(actionSearch); + if (!_quirks) _search->add(actionClearSearch); + _search->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, + QSizePolicy::Minimum)); + assert(connect(_search, SIGNAL(returnPressed()), + SLOT(on_actionSearch_triggered()))); + if (_quirks) { + _toolbar->addAction(actionAddBookmark); + _toolbar->addAction(actionHome); + } assert(connect(&_errorLog, SIGNAL(reset()), SLOT(errorReset()))); assert(connect(&_networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(finished(QNetworkReply*)))); @@ -439,7 +468,7 @@ class Browser: public QMainWindow, protected Ui::Browser { assert(connect(browser->page()->networkAccessManager(), SIGNAL(sslErrors(QNetworkReply*, const QList&)), SLOT(sslErrors(QNetworkReply*, const QList&)))); - _tabs->setCurrentIndex(_tabs->addTab(browser, "*empty*")); + _tabs->setCurrentIndex(_tabs->addTab(browser, tr("New Tab"))); _tabs->setTabsClosable(_tabs->count()>1); return browser; } @@ -494,9 +523,13 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionAddBookmark_triggered() { - if (qobject_cast(_url)) - qobject_cast(_url)->addItem - (qobject_cast(_url)->currentText()); + QComboBox* url(qobject_cast(_url)); + if (_url) { + url->addItem(url->currentText()); + QAction* a(_bookmarks->addAction(url->currentText())); + a->setData(url->currentText()); + connect(a, SIGNAL(triggered(bool)), SLOT(loadFromHistory())); + } } void on_actionEditBookmarks_triggered() { @@ -632,18 +665,15 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionClearFind_triggered() { - if (!_find) return; _find->clear(); _find->setFocus(); } void on_actionFind_triggered() { - if (!_find) { - statusBar()->addPermanentWidget(_find = new ButtonLineEdit); + if (_find->isHidden()) { _find->setText(qobject_cast(_tabs->currentWidget()) ->selectedText()); - _find->addAction(actionUnFind); - _find->addAction(actionClearFind); + _find->show(); } disconnect(_find, SIGNAL(returnPressed()), this, SLOT(rfind())); disconnect(_find, SIGNAL(textEdited(QString)), this, SLOT(rfind())); @@ -654,12 +684,10 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionReverseFind_triggered() { - if (!_find) { - statusBar()->addPermanentWidget(_find = new ButtonLineEdit); - _find->add(actionUnFind); - _find->add(actionClearFind); + if (_find->isHidden()) { _find->setText(qobject_cast(_tabs->currentWidget()) ->selectedText()); + _find->show(); } disconnect(_find, SIGNAL(returnPressed()), this, SLOT(find())); disconnect(_find, SIGNAL(textEdited(QString)), this, SLOT(find())); @@ -689,7 +717,17 @@ class Browser: public QMainWindow, protected Ui::Browser { } void on_actionUnFind_triggered() { - delete _find; _find=0; + _find->hide(); + } + + void on_actionSearch_triggered() { + load(tr("http://google.com/search?hl=%2&q=%1") + .arg(_search->text()) + .arg(QLocale::system().name().left(2))); + } + + void on_actionClearSearch_triggered() { + _search->clear(); } void on_actionProxy_triggered() { @@ -758,8 +796,16 @@ class Browser: public QMainWindow, protected Ui::Browser { QStringList urls(_settings()->value("Window/Urls").toStringList()); urls.sort(); urls.removeDuplicates(); - if (qobject_cast(_url)) + if (qobject_cast(_url)) { + qobject_cast(_url)->clear(); qobject_cast(_url)->addItems(urls); + } + _bookmarks->clear(); + for (QStringList::iterator it(urls.begin()); it!=urls.end(); ++it) { + QAction* a(_bookmarks->addAction(*it)); + a->setData(*it); + connect(a, SIGNAL(triggered(bool)), SLOT(loadFromHistory())); + } QStringList tabs(_settings()->value("Window/Tabs").toStringList()); while (_tabs->count()>1) _tabs->removeTab(0); for (QStringList::iterator it(tabs.begin()); it!=tabs.end(); ++it) { @@ -1478,6 +1524,7 @@ class Browser: public QMainWindow, protected Ui::Browser { QPushButton* _showErrorLog; std::auto_ptr _editbookmarks; bool _startUrl; + bool _quirks; + ButtonLineEdit* _search; }; - #endif diff --git a/swisssurfer/src/browser.ui b/swisssurfer/src/browser.ui index e8e3184..a26b070 100644 --- a/swisssurfer/src/browser.ui +++ b/swisssurfer/src/browser.ui @@ -57,10 +57,8 @@ false - - @@ -114,9 +112,15 @@ + + + Bookmarks + + + @@ -457,6 +461,24 @@ &Load Session + + + + :/icons/find:/icons/find + + + Search + + + + + + :/icons/clearlocation:/icons/clearlocation + + + Clear Search + + diff --git a/swisssurfer/src/certificate.ui b/swisssurfer/src/certificate.ui index 648500a..9b0a434 100644 --- a/swisssurfer/src/certificate.ui +++ b/swisssurfer/src/certificate.ui @@ -31,6 +31,9 @@ true + + false + true diff --git a/swisssurfer/src/downloadmanager.hxx b/swisssurfer/src/downloadmanager.hxx index 7c225a1..822ba30 100644 --- a/swisssurfer/src/downloadmanager.hxx +++ b/swisssurfer/src/downloadmanager.hxx @@ -108,12 +108,15 @@ class DownloadManager: public QObject { public Q_SLOTS: void add(QNetworkReply* reply) { - LOG<url().toString(); + LOG<<_downloads.size()<url().toString(); + LOG<(sender())); if (_downloads[reply].error.size()) error(_downloads[reply].error); diff --git a/swisssurfer/src/main.cxx b/swisssurfer/src/main.cxx index 93022b0..80fc336 100644 --- a/swisssurfer/src/main.cxx +++ b/swisssurfer/src/main.cxx @@ -309,6 +309,7 @@ int main(int argv, char** argc) try { QWebSettings::globalSettings()->setAttribute (QWebSettings::PluginsEnabled, true); bool silent(false); + bool quirks(false); bool login(false); Settings::MimeTypes mimetypes; QStringList args(app.arguments()); @@ -322,6 +323,7 @@ int main(int argv, char** argc) try { " -h, --help show this help text\n" " -k, --kiosk no url bar\n" " if you sepcify -k and -s, -k must be first\n" + " -q, --quirks alternate user interface\n" " -n, --no-settings don't load or store any settings\n" " --login ask for smartcard password at startup\n" " -l, --lib path to file libengine_act.so\n" @@ -348,6 +350,8 @@ int main(int argv, char** argc) try { } else if ((*it=="-k" || *it=="--kiosk")) { silent=true; settings.reset(); + } else if ((*it=="-q" || *it=="--quirks")) { + quirks=true; } else if ((*it=="-n" || *it=="--no-settings")) { settings.reset(); } else if (*it=="--login") { @@ -398,7 +402,8 @@ int main(int argv, char** argc) try { QSslConfiguration::setDefaultConfiguration(sslConfig); //............................................................................ if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories(); - Browser browser(actlib, urls, settings.get(), mimetypes, silent, login); + Browser browser(actlib, urls, settings.get(), mimetypes, silent, + login, quirks); return app.exec(); } catch (std::exception& x) { std::cerr<<"**** Error: "<setCurrentIndex(s?1:0); + } private: QEventLoop _run; }; diff --git a/swisssurfer/src/pinentry.ui b/swisssurfer/src/pinentry.ui index 4cf41bc..68d0882 100644 --- a/swisssurfer/src/pinentry.ui +++ b/swisssurfer/src/pinentry.ui @@ -6,113 +6,188 @@ 0 0 - 655 - 480 + 603 + 494 Certificate PIN Entry + + false + - - - - 0 - 0 - + + + Please enter your PIN to unlock Certificate + + + + + + + PIN: + + + _pin + + + + + + + QLineEdit::Password + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + Name: + + + + + + + TextLabel + + + + + + + E-Mail: + + + + + + + TextLabel + + + + + + + SuisseID Number: + + + + + + + TextLabel + + + + + + + + + + + 0 + 0 + + + + 0 + + + + + + + + 0 + 0 + + + + %1 PIN attempts left + + + true + + + + + + + + + + + + 0 + 0 + + + + bad or locked certificate + + + true + + + + + + + + + + + + + + + - Please enter your PIN to unlock Certificate: + Show Certificate Details - + true + + false + - - - - - PIN: - - - _pin - - - - - - - QLineEdit::Password - - - - - - - - 0 - 0 - - - - 1 - - - - - - - - 0 - 0 - - - - %1 PIN attempts left - - - true - - - - - - - - - - - - 0 - 0 - - - - bad or locked certificate - - - true - - - - - - - - - - - - - - - 0 - 0 - + + + 0 + + + + + + + + 0 + 0 + + + + + + @@ -135,7 +210,9 @@ 1 - + + + buttonBox diff --git a/swisssurfer/src/qmake.pro.in b/swisssurfer/src/qmake.pro.in index 0b7a1d4..184c0a4 100644 --- a/swisssurfer/src/qmake.pro.in +++ b/swisssurfer/src/qmake.pro.in @@ -23,7 +23,7 @@ macx { win32 { QMAKE_LIBS += -lwinhttp -lgdi32 -lws2_32 QMAKE_LIBS += /opt/local/i586-mingw32msvc/lib/winscard.a - CONFIG += console release + CONFIG += release } ICON = swisssurfer.icns diff --git a/swisssurfer/src/resources.qrc b/swisssurfer/src/resources.qrc index ac1cab0..ceb035c 100644 --- a/swisssurfer/src/resources.qrc +++ b/swisssurfer/src/resources.qrc @@ -1,5 +1,7 @@ + resources/icons/sscd_missing.png + resources/icons/sscd_ready.png resources/icons/about.png resources/icons/addbookmark.png resources/icons/back.png diff --git a/swisssurfer/src/swisssurfer_de.ts b/swisssurfer/src/swisssurfer_de.ts index 48b4185..c3a6f23 100644 --- a/swisssurfer/src/swisssurfer_de.ts +++ b/swisssurfer/src/swisssurfer_de.ts @@ -44,383 +44,404 @@ - + &File - + Edit - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + Ctrl+W - + &Proxy... - + + Bookmarks + + + + &Quit - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + + New Tab - + Add New Tab - + Ctrl+T - + Find - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - + &Proxy ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar - + &Close Tab - + Sa&ve Session - + &Load Session - - + + Search + + + + + Clear Search + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + SSL Not Supported - + SSL is not supported on your system - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + opening new window - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - + + background-color: white neutral find - - + + background-color: #ADA background-color: #7F7 text found - - + + background-color: #F77 background-color: lightred text not found - + + http://google.com/search?hl=%2&q=%1 + + + + About - + %8 Version: %1 Builddate: %2 @@ -440,42 +461,42 @@ openssl-%7 - + %1 - + launching application ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error @@ -575,12 +596,12 @@ openssl-%7 - + Attribute - + Value @@ -704,13 +725,13 @@ openssl-%7 - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> <h1>Network Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> <h1>SSL Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -764,26 +785,52 @@ openssl-%7 - - Please enter your PIN to unlock Certificate: - Please enter your Certificate PIN to authenticate: + + Please enter your PIN to unlock Certificate - + PIN: - + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + %1 PIN attempts left - + bad or locked certificate + + + Show Certificate Details + + there are %1 PIN attempts left @@ -812,12 +859,13 @@ openssl-%7 - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text -k, --kiosk no url bar if you sepcify -k and -s, -k must be first + -q, --quirks alternate user interface -n, --no-settings don't load or store any settings --login ask for smartcard password at startup -l, --lib <file> path to file libengine_act.so @@ -839,27 +887,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_en.ts b/swisssurfer/src/swisssurfer_en.ts index 1cf5de0..d2e82bd 100644 --- a/swisssurfer/src/swisssurfer_en.ts +++ b/swisssurfer/src/swisssurfer_en.ts @@ -43,363 +43,384 @@ - + &File - + Edit - + History - + Info - + neu laden - + F5 - + stoppen - - + + Esc - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + Ctrl+W - + &Proxy... - + + Bookmarks + + + + &Quit - + Print ... - + Print Pre&view ... - + Quick &Print - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + + New Tab - + Add New Tab - + Ctrl+T - + Find - + find in page - + Ctrl+F - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - + &Proxy ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar - + &Close Tab - + Sa&ve Session - + &Load Session - + + Search + + + + + Clear Search + + + + Checking: %1 - + SSL Not Supported - + SSL is not supported on your system - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + Reading: %1 - + Illegal URL: %1 - + Zoom: %1% - + opening new window - + Print Document - + %1 - %2 statusbar actionBack_hovered %1=url %2=title - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - + + background-color: white neutral find - - + + background-color: #ADA background-color: #7F7 text found - - + + background-color: #F77 background-color: lightred text not found - + + http://google.com/search?hl=%2&q=%1 + + + + About - + %8 Version: %1 Builddate: %2 @@ -419,58 +440,58 @@ openssl-%7 - + %1 - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url - + launching application ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error @@ -570,12 +591,12 @@ openssl-%7 - + Attribute - + Value @@ -698,12 +719,12 @@ openssl-%7 - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -755,25 +776,52 @@ openssl-%7 - - Please enter your PIN to unlock Certificate: + + Please enter your PIN to unlock Certificate - + PIN: - + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + %1 PIN attempts left - + bad or locked certificate + + + Show Certificate Details + + there are %1 PIN attempts left @@ -802,12 +850,13 @@ openssl-%7 - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text -k, --kiosk no url bar if you sepcify -k and -s, -k must be first + -q, --quirks alternate user interface -n, --no-settings don't load or store any settings --login ask for smartcard password at startup -l, --lib <file> path to file libengine_act.so @@ -829,27 +878,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_fr.ts b/swisssurfer/src/swisssurfer_fr.ts index 48b4185..c3a6f23 100644 --- a/swisssurfer/src/swisssurfer_fr.ts +++ b/swisssurfer/src/swisssurfer_fr.ts @@ -44,383 +44,404 @@ - + &File - + Edit - + Info - + History - + neu laden - + F5 - + stoppen - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + Ctrl+W - + &Proxy... - + + Bookmarks + + + + &Quit - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + + New Tab - + Add New Tab - + Ctrl+T - + Find - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - + &Proxy ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar - + &Close Tab - + Sa&ve Session - + &Load Session - - + + Search + + + + + Clear Search + + + + + Esc - + find in page - + Ctrl+F - + Print ... - + Quick &Print &Print - + Print Pre&view ... - + Checking: %1 Opening: %1 - + Reading: %1 Reading: %1% - + Zoom: %1% - + Illegal URL: %1 - + Print Document - + %1 - %2 Back to %1 - %2 statusbar actionBack_hovered %1=url %2=title - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url - + Forbidden: %1 - + SSL Not Supported - + SSL is not supported on your system - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + opening new window - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - + + background-color: white neutral find - - + + background-color: #ADA background-color: #7F7 text found - - + + background-color: #F77 background-color: lightred text not found - + + http://google.com/search?hl=%2&q=%1 + + + + About - + %8 Version: %1 Builddate: %2 @@ -440,42 +461,42 @@ openssl-%7 - + %1 - + launching application ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error @@ -575,12 +596,12 @@ openssl-%7 - + Attribute - + Value @@ -704,13 +725,13 @@ openssl-%7 - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> <h1>Network Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> <h1>SSL Error</h2><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -764,26 +785,52 @@ openssl-%7 - - Please enter your PIN to unlock Certificate: - Please enter your Certificate PIN to authenticate: + + Please enter your PIN to unlock Certificate - + PIN: - + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + %1 PIN attempts left - + bad or locked certificate + + + Show Certificate Details + + there are %1 PIN attempts left @@ -812,12 +859,13 @@ openssl-%7 - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text -k, --kiosk no url bar if you sepcify -k and -s, -k must be first + -q, --quirks alternate user interface -n, --no-settings don't load or store any settings --login ask for smartcard password at startup -l, --lib <file> path to file libengine_act.so @@ -839,27 +887,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help diff --git a/swisssurfer/src/swisssurfer_it.ts b/swisssurfer/src/swisssurfer_it.ts index 446452a..e237bfe 100644 --- a/swisssurfer/src/swisssurfer_it.ts +++ b/swisssurfer/src/swisssurfer_it.ts @@ -43,361 +43,382 @@ - + &File - + Edit - + History - + Info - + neu laden - + F5 - + stoppen - - + + Esc - + zurückkehren - + weitergehen - + Startseite - + Ctrl+Home - + &New Browser - + New Browser Window - + Ctrl+N - + Ctrl+W - + &Proxy... - + + Bookmarks + + + + &Quit - + Print ... - + Print Pre&view ... - + Quick &Print - + Ctrl+P - + Next Tab - + Shift+Right - + Previous Tab - + Shift+Left - + + New Tab - + Add New Tab - + Ctrl+T - + Find - + find in page - + Ctrl+F - + Close Find - + &About - + &Settings ... - + &Reverse Find - + Ctrl+R - + Error Log - + show error logs - + User Login Certificate - + &Proxy ... - + Clear Location - + clear location bar - + Add Bookmark - + add bookmark to location bar - + Ctrl+D - + &Bookmarks - + Clear Find - + clear find bar - + &Close Tab - + Sa&ve Session - + &Load Session - + + Search + + + + + Clear Search + + + + SSL Not Supported - + SSL is not supported on your system - + Checking: %1 - + Forbidden: %1 - + Access Denied - + <p>Access denied due to security considerations.</p><p>You are not allowed to connect to %1. - + Reading: %1 - + Illegal URL: %1 - + Zoom: %1% - + opening new window - + Print Document - + %1 - %2 statusbar actionBack_hovered %1=url %2=title - + %1 - %2 statusbar actionForward_hovered %1=url %2=title - - + + background-color: white neutral find - - + + background-color: #ADA text found - - + + background-color: #F77 text not found - + + http://google.com/search?hl=%2&q=%1 + + + + About - + %8 Version: %1 Builddate: %2 @@ -409,58 +430,58 @@ openssl-%7 - + %1 - + Info: %1 - + done. - + %1 statusbar for hovered link %1=url - + launching application ... - + errors show error log - - + + background-color: #F77 invalid url - - + + background-color: white valid url - + authentication required - + ssl error @@ -473,12 +494,12 @@ openssl-%7 - + Attribute - + Value @@ -688,12 +709,12 @@ openssl-%7 - + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Provive:</th><td>%15</td></tr></table> @@ -745,25 +766,52 @@ openssl-%7 - - Please enter your PIN to unlock Certificate: + + Please enter your PIN to unlock Certificate - + PIN: - + + Name: + + + + + + + TextLabel + + + + + E-Mail: + + + + + SuisseID Number: + + + + %1 PIN attempts left - + bad or locked certificate + + + Show Certificate Details + + there are %1 PIN attempts left @@ -792,12 +840,13 @@ openssl-%7 - + Usage: %1 [OPTIONS...] [<url> ...] Options: -h, --help show this help text -k, --kiosk no url bar if you sepcify -k and -s, -k must be first + -q, --quirks alternate user interface -n, --no-settings don't load or store any settings --login ask for smartcard password at startup -l, --lib <file> path to file libengine_act.so @@ -819,27 +868,27 @@ Environment: - + Cannot read PEM certificate from file: %1 - + Read PEM certificates from file: %1 - + Cannot read PEM RSA key from file: %1 - + Read private key from file: %1 - + Too few arguments. Try: %1 --help