From a09d6ce6e42b52a2b00aa417d17a9e4924c0aa4f Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 3 Jan 2012 21:02:35 +0100 Subject: [PATCH] Using own CA certificates database from now. Closes #111 - fixing various problems with accessing / downloading content from secured sites - using CA certificates from debian's ca-certificates package - added copyright notice for Mozilla's certificates --- bin/locale/cs_CZ.qm | Bin 85702 -> 85877 bytes scripts/make-ca-bundle.sh | 5 ++- src/adblock/adblocknetwork.cpp | 2 +- src/autofill/autofillmodel.cpp | 4 +-- src/bookmarks/bookmarkstoolbar.cpp | 6 ++-- src/data/data.qrc | 1 + src/data/html/copyright | 35 ++++++++++++++++++ src/network/networkmanager.cpp | 21 +++++++++-- src/webview/siteinfowidget.cpp | 4 +-- translations/cs_CZ.ts | 56 +++++++++++++++-------------- translations/de_DE.ts | 56 +++++++++++++++-------------- translations/el_GR.ts | 56 +++++++++++++++-------------- translations/empty.ts | 56 +++++++++++++++-------------- translations/es_ES.ts | 56 +++++++++++++++-------------- translations/fr_FR.ts | 56 +++++++++++++++-------------- translations/it_IT.ts | 56 +++++++++++++++-------------- translations/nl_NL.ts | 56 +++++++++++++++-------------- translations/pl_PL.ts | 56 +++++++++++++++-------------- translations/ru_RU.ts | 56 +++++++++++++++-------------- translations/sk_SK.ts | 4 +++ translations/zh_CN.ts | 56 +++++++++++++++-------------- 21 files changed, 400 insertions(+), 298 deletions(-) diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index f3d679d06d0371ab432e7aad4c36f9db69391b4a..28227d92dbe35482b90a8ba198344bdeef05f389 100644 GIT binary patch delta 1441 zcmXAp3s96*6vxlK-+sI7_rdqUF3Uc6F0z0tEDHz<5(WfRQ(z{jD4>k^7#}H$0+XQ# zI$COULa{(pz-N#R@$iAB1gU{qYLD?ziZY=SSh1aMxJ0dnMr;{ zZ<<2GcVa&EC0DV6?p6;#=C(#4ZU(e)lSn&ebEV{4yv^y={ZR6_9Egh@M>sthMx7#! zPMCuEign}|-d3bgLmgW96&f+01{>A@2qqeOa5WICFE;Ygn#j4d_|h|g`eeFg=?Wm@ z)A4t{l$^um%0n?HxrLhxfXM5(HPt%+rj&8-CJX@_J&#Sjlq0%7`cK~>K^J*irIn>ofwbn1vY?U z>=fE!Lwxww3JKuQ7QW5QYTx*R@0f)E&$f<|jQ^PbYA_NYb%5`lQV*bA&i5Q9OkA-8(?MO0ZK( z(b$cuTj^au4F9Npd7cNvrxL&Z*%(S+RH#R8_^+8B0U)D8btoY z4A)XOhk9SqWdJy-KG5+u}_l|VOk-QHr8qA15u&e!~{MpDq3a(%-=5x>#KlBH$<`e48XqAqIX>m6TA|$ zwNuR<;_Q)r*0P&8FYrr%z0<|{>Ry1m3&gxt-!qe)!%l5bLa+Ei)C_=gv7;o`CUHB* zCh%daxT~N7NJO=`=QPW;@H4R{E{{mE%9xMCISZ#gry64By*nQBewaF3?$!7ZUW zJt4iA?6H|z*JGbYAoYF~9UkdyF_ZQ25w?0slX4Fr)Fx?;Fxu>rrne7>??y>WcK{*t zB~w-az;BI`XMzO8S%2HI@b>Hvsxl814dy6vx=rHA@HtzDf>?Rz1p8w2oIG?t4dAI&emZ9wKy{h?%yJH_u57Wl>G#aqJL KhsKegtp5Xug}5pJ delta 1328 zcmXApeN0nV7>D2Y+}@VnOMB@prKL!vq!k2P5CkJ4PLZ-@17;#@f`A&4IHzHV6UmgR zputQte1|#}Cn}0=s0#tVhHfH$Mf`SdI$hMch>57#Sp2Hl5&n9TlarJ4`@PRO{aeLT zjiM#>&@9`zCtDhNoI{RJZ|b}~5g_z=y~W22>*@=$nW3P*HCZ+IL37CssC08q;{30^ zKaBavZP1U0yw%NsL7$OZ7>z+xC{&}1ZVOg@DpWnK0Sv4ozhK38$)d?- zG2c*$W)W)Ww#LV-&&e&$SEXYt+ExJ|*_mh80>I&w)GQ{e3GHn0xfcLCGT5rQ^8uq< z=&@LhcABT%J;p4|URe%kyd+d?TnjLEx$wn=K7hT)h0T|*@%05l2=S$?BJ$-xpg&=QFc;0kq0 z9VxMk#P(Vv!0uIIhm+rZ*&FfD#{}@AZh#p5Sp2y+5g_w#v3u+e0P{TYR10r9d=j0dkBw}hMuS7OY|shY`vDHF*NL091BPm-$B=`W6mE

&@N(Wl0h z>;A~;0<=xm{rPGp4|0VpN*oTM45gHt)vBaP=KBHbuD%0kx=H=YXdFtOpeTHwa)YW( z+4^ni7XaXhetX+Vz=%3}5VVhZOR2%+WpU@Io5TH_`b|SeekkS1 z0>1{}^)6}Ft$+9^Pf8`*ashOUrIPNqVr5f?n#Wu}QlmOda{nM5jylF8>FByzln{Da z#txp)lO}7lD*#8KtZADHFr!J9mNanFyt2IU7{Iol5Vt4=X(GhH;rbt z77%9`?fEW%ht0;Y2}VG9K6P4WOZJ7vvbc7hYd?8x4i2ECO6DDIk27D%i@XmI_@y%aMg|vRsZ#oI48U4Rnd7?wP&iMS zv!6Hia3cLNF-Hw6M K!5$a3#QYB`W0J`L diff --git a/scripts/make-ca-bundle.sh b/scripts/make-ca-bundle.sh index fe683e894..941e7f5b7 100755 --- a/scripts/make-ca-bundle.sh +++ b/scripts/make-ca-bundle.sh @@ -1,5 +1,8 @@ #!/bin/bash -cat /usr/share/ca-certificates/*/*.crt > ../other/ca-bundle.crt +# It will probably work only for Debian based distros + +cat /usr/share/ca-certificates/*/*.crt > ../src/data/data/ca-bundle.crt +cat /etc/ssl/certs/*.pem >> ../src/data/data/ca-bundle.crt read -p "Press [ENTER] to close terminal" exit diff --git a/src/adblock/adblocknetwork.cpp b/src/adblock/adblocknetwork.cpp index c1f6ba8af..2e0f02b18 100644 --- a/src/adblock/adblocknetwork.cpp +++ b/src/adblock/adblocknetwork.cpp @@ -81,7 +81,7 @@ QNetworkReply* AdBlockNetwork::block(const QNetworkRequest &request) if (blockedRule) { QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100)); - WebPage* webPage = static_cast (v.value()); + WebPage* webPage = static_cast(v.value()); if (webPage) { webPage->addAdBlockRule(blockedRule->filter(), request.url()); } diff --git a/src/autofill/autofillmodel.cpp b/src/autofill/autofillmodel.cpp index 084aae77a..791fcd98f 100644 --- a/src/autofill/autofillmodel.cpp +++ b/src/autofill/autofillmodel.cpp @@ -182,9 +182,9 @@ void AutoFillModel::post(const QNetworkRequest &request, const QByteArray &outgo m_lastOutgoingData = outgoingData; QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100)); - QWebPage* webPage = static_cast (v.value()); + QWebPage* webPage = static_cast(v.value()); v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 102)); - WebView* webView = static_cast (v.value()); + WebView* webView = static_cast(v.value()); if (!webPage || !webView) { return; } diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index f4ac22ae8..a0d76cbc9 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -102,7 +102,7 @@ void BookmarksToolbar::moveRight() return; } - ToolButton* button = static_cast (act->data().value()); + ToolButton* button = static_cast(act->data().value()); int index = m_layout->indexOf(button); if (index == m_layout->count() - 1) { @@ -139,7 +139,7 @@ void BookmarksToolbar::moveLeft() return; } - ToolButton* button = static_cast (act->data().value()); + ToolButton* button = static_cast(act->data().value()); int index = m_layout->indexOf(button); if (index == 0) { @@ -176,7 +176,7 @@ void BookmarksToolbar::removeButton() return; } - ToolButton* button = static_cast (act->data().value()); + ToolButton* button = static_cast(act->data().value()); if (!button) { return; } diff --git a/src/data/data.qrc b/src/data/data.qrc index 1ec12063e..e05b83edf 100644 --- a/src/data/data.qrc +++ b/src/data/data.qrc @@ -2,5 +2,6 @@ data/browsedata.db data/profiles.ini + data/ca-bundle.crt diff --git a/src/data/html/copyright b/src/data/html/copyright index 94be16e82..b36bb1e7c 100644 --- a/src/data/html/copyright +++ b/src/data/html/copyright @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * ============================================================ */ + ------------------------------------------------------------------------ AdBlock, LineEdit class and SqueezeLabel class: ------------------------------------------------------------------------ @@ -159,6 +160,40 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301 USA */ + +----------------------------------------------------------------------------- + CA certificates from Mozilla included in ca-bundle.crt: +----------------------------------------------------------------------------- +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. ----------------------------------------------------------------------------- QtWin class from diff --git a/src/network/networkmanager.cpp b/src/network/networkmanager.cpp index 59aa7124d..a924de8ab 100644 --- a/src/network/networkmanager.cpp +++ b/src/network/networkmanager.cpp @@ -81,6 +81,21 @@ void NetworkManager::loadSettings() QSslConfiguration::setDefaultConfiguration(config); #endif + QString certDir = mApp->PROFILEDIR + "certificates"; + QString bundlePath = certDir + "/ca-bundle.crt"; + + if (!QDir(certDir).exists()) { + QDir dir(mApp->PROFILEDIR); + dir.mkdir("certificates"); + } + + if (!QFile::exists(bundlePath)) { + QFile(":data/ca-bundle.crt").copy(bundlePath); + QFile(bundlePath).setPermissions(QFile::ReadUser | QFile::WriteUser); + } + + QSslSocket::setDefaultCaCertificates(QSslCertificate::fromPath(bundlePath)); + m_proxyFactory->loadSettings(); } @@ -94,9 +109,9 @@ void NetworkManager::setSSLConfiguration(QNetworkReply* reply) QNetworkRequest request = reply->request(); QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100)); - WebPage* webPage = static_cast (v.value()); + WebPage* webPage = static_cast(v.value()); v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 102)); - WebView* webView = static_cast (v.value()); + WebView* webView = static_cast(v.value()); if (!webPage || !webView) { return; } @@ -131,7 +146,7 @@ void NetworkManager::sslError(QNetworkReply* reply, QList errors) QNetworkRequest request = reply->request(); QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100)); - WebPage* webPage = static_cast (v.value()); + WebPage* webPage = static_cast(v.value()); if (!webPage) { return; } diff --git a/src/webview/siteinfowidget.cpp b/src/webview/siteinfowidget.cpp index 7bea3199c..b54091b70 100644 --- a/src/webview/siteinfowidget.cpp +++ b/src/webview/siteinfowidget.cpp @@ -48,7 +48,7 @@ SiteInfoWidget::SiteInfoWidget(QupZilla* mainClass, QWidget* parent) if (query.next()) { int count = query.value(0).toInt(); if (count > 3) { - ui->historyLabel->setText(tr("This is your %1. visit of this site.").arg(count)); + ui->historyLabel->setText(tr("This is your %1 visit of this site.").arg(QString::number(count) + ".")); ui->historyIcon->setPixmap(QPixmap(":/icons/locationbar/accept.png")); } else if (count == 0) { @@ -67,7 +67,7 @@ SiteInfoWidget::SiteInfoWidget(QupZilla* mainClass, QWidget* parent) else if (count == 3) { text = tr("third"); } - ui->historyLabel->setText(tr("This is your %1. visit of this site.").arg(text)); + ui->historyLabel->setText(tr("This is your %1 visit of this site.").arg(text)); } } connect(ui->pushButton, SIGNAL(clicked()), p_QupZilla, SLOT(showPageInfo())); diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index 1eb52558c..b1ba00b0d 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -1775,74 +1775,74 @@ nebyl nalezen! NetworkManager - + SSL Certificate Error! Chyba zabezpečení! - + <b>Organization: </b> <b>Organizace: </b> - + <b>Domain Name: </b> <b>Doména: </b> - + <b>Expiration Date: </b> <b>Vyprší: </b> - + <b>Error: </b> <b>Chyba: </b> - + The page you are trying to access has the following errors in the SSL certificate: Stránka kterou se snažíte navštívit zaslala SSL Certifikát s těmito chybami: - + Would you like to make an exception for this certificate? Chcete udělit vyjímku tomuto certifikátu? - + Authorization required Vyžadována autorizace - - + + Username: Uživatelské jméno: - - + + Password: Heslo: - + Save username and password on this site Uložit jméno a heslo pro tuto stránku - + A username and password are being requested by %1. The site says: "%2" Server %1 požaduje vaše uživatelské jméno a heslo s komentářem: "%2" - + Proxy authorization required Proxy autorizace - + A username and password are being requested by proxy %1. Proxy %1 požaduje uživatelské jméno a heslo. @@ -2686,32 +2686,32 @@ nebyl nalezen! QtWin - + Open new tab Otevřít nový panel - + Opens a new tab if browser is running Otevře nový panel pokud je prohlížeč spuštěný - + Open new window Otevřít nové okno - + Opens a new window if browser is running Otevře nové okno pokud je prohlížeč spuštěný - + Open download manager Otevřít správce stahování - + Opens a download manager if browser is running Otevře správce stahování pokud je prohlížeč spuštěný @@ -3905,7 +3905,6 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ - This is your <b>%1.</b> visit of this site. Toto je Vaše <b>%1.</b> návštěva této stránky. @@ -3924,6 +3923,11 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ third třetí + + + This is your <b>%1</b> visit of this site. + Toto je Vaše <b>%1</b> návštěva této stránky. + You have <b>never</b> visited this site before. @@ -4522,14 +4526,14 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Hledat "%1 .." s %2 - + No Named Page Bezejmenná stránka - - + + New tab Nový panel diff --git a/translations/de_DE.ts b/translations/de_DE.ts index a544000a6..ba25f897c 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -1767,74 +1767,74 @@ NetworkManager - + SSL Certificate Error! SSL Zertifikatsfehler! - + <b>Organization: </b> <b>Organisation: </b> - + <b>Domain Name: </b> <b>Domänen-Name: </b> - + <b>Expiration Date: </b> <b>Ablaufdatum: </b> - + <b>Error: </b> <b>Fehler: </b> - + The page you are trying to access has the following errors in the SSL certificate: Beim Laden dieser Seite sind folgende SSL Zertifikatsfehler aufgetreten: - + Would you like to make an exception for this certificate? Möchten Sie eine Ausnahme für dieses Zertifkat zulassen? - + Authorization required Authentifizierung erforderlich - - + + Username: Nutzername: - - + + Password: Passwort: - + Save username and password on this site Nutzername und Passwort für diese Seite speichern - + A username and password are being requested by %1. The site says: "%2" Bitte Nutzername und Passwort zur Anmeldung an Server %1 angeben. Statusmeldung: "%2" - + Proxy authorization required Anmeldung am Proxy erforderlich - + A username and password are being requested by proxy %1. Bitte Nutzername und Passwort zur Anmeldung an Proxy %1 angeben. @@ -2679,32 +2679,32 @@ QtWin - + Open new tab Neuen Tab öffnen - + Opens a new tab if browser is running Öffnet einen neuen Tab bei gestartetem Browser - + Open new window Neues Fenster öffnen - + Opens a new window if browser is running Öffnet ein neues Fenster bei gestartetem Browser - + Open download manager Download Manager öffnen - + Opens a download manager if browser is running Öffnet den Download Manager bei gestartetem Browser @@ -3896,7 +3896,6 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest - This is your <b>%1.</b> visit of this site. Dies ist Ihr <b>%1.</b> Besuch dieser Seite. @@ -3915,6 +3914,11 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest third dritter + + + This is your <b>%1</b> visit of this site. + + You have <b>never</b> visited this site before. @@ -4514,14 +4518,14 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Suche "%1 .." mit %2 - + No Named Page Leere Seite - - + + New tab Neuer Tab diff --git a/translations/el_GR.ts b/translations/el_GR.ts index 888704b86..d6c255e6a 100644 --- a/translations/el_GR.ts +++ b/translations/el_GR.ts @@ -1707,74 +1707,74 @@ NetworkManager - + SSL Certificate Error! Σφάλμα πιστοποιητικού SSL! - + The page you are trying to access has the following errors in the SSL certificate: Η σελίδα που προσπαθείτε να επισκεφτείτε έχει τα εξής σφάλματα στο πιστοποιητικό SSL: - + <b>Organization: </b> <b>Οργανισμός: </b> - + <b>Domain Name: </b> <b>Όνομα τομέα: </b> - + <b>Expiration Date: </b> <b>Ημερομηνία λήξης: </b> - + <b>Error: </b> <b>Σφάλμα: </b> - + Would you like to make an exception for this certificate? Θα θέλατε να κάνετε μια εξαίρεση για αυτό το πιστοποιητικό; - + Authorization required Απαιτείται εξουσιοδότηση - - + + Username: Όνομα χρήστη: - - + + Password: Κωδικός: - + Save username and password on this site Αποθήκευση ονόματος χρήστη και κωδικού σε αυτή τη σελίδα - + A username and password are being requested by %1. The site says: "%2" Ένα όνομα χρήστη και κωδικός ζητούνται από το %1. Η σελίδα λέει: "%2" - + Proxy authorization required Απαιτείται εξουσιοδότηση διαμεσολαβητή (Proxy) - + A username and password are being requested by proxy %1. Ένα όνομα χρήστη και κωδικός ζητούνται από το proxy %1. @@ -2605,32 +2605,32 @@ QtWin - + Open new tab Άνοιγμα νέας καρτέλας - + Opens a new tab if browser is running Ανοίγει μια νέα καρτέλα αν εκτελείται ο περιηγητής - + Open new window Άνοιγμα νέου παράθυρου - + Opens a new window if browser is running Ανοίγει ένα νέο παράθυρο αν εκτελείται ο περιηγητής - + Open download manager Άνοιγμα διαχειριστή λήψεων - + Opens a download manager if browser is running Ανοίγει έναν διαχειριστή λήψεων αν εκτελείται ο περιηγητής @@ -3814,7 +3814,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - This is your <b>%1.</b> visit of this site. Αυτή είναι η <b>%1.</b> επίσκεψη σας σε αυτή τη σελίδα. @@ -3838,6 +3837,11 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla third τρίτη + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4291,8 +4295,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - + + New tab Νέα καρτέλα @@ -4453,7 +4457,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Αναζήτηση "%1" με %2 - + No Named Page Ανώνυμη σελίδα diff --git a/translations/empty.ts b/translations/empty.ts index e84db96fb..c497ede4f 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -1704,74 +1704,74 @@ NetworkManager - + SSL Certificate Error! - + The page you are trying to access has the following errors in the SSL certificate: - + <b>Organization: </b> - + <b>Domain Name: </b> - + <b>Expiration Date: </b> - + <b>Error: </b> - + Would you like to make an exception for this certificate? - + Authorization required - - + + Username: - - + + Password: - + Save username and password on this site - + A username and password are being requested by %1. The site says: "%2" - + Proxy authorization required - + A username and password are being requested by proxy %1. @@ -2601,32 +2601,32 @@ QtWin - + Open new tab - + Opens a new tab if browser is running - + Open new window - + Opens a new window if browser is running - + Open download manager - + Opens a download manager if browser is running @@ -3804,7 +3804,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - This is your <b>%1.</b> visit of this site. @@ -3828,6 +3827,11 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla third + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4280,8 +4284,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - + + New tab @@ -4442,7 +4446,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + No Named Page diff --git a/translations/es_ES.ts b/translations/es_ES.ts index 4f2931269..c9f7337ca 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -1766,74 +1766,74 @@ NetworkManager - + SSL Certificate Error! ¡Error del certificad SSL! - + <b>Organization: </b> <b>Organización: </b> - + <b>Domain Name: </b> <b>Nombre del dominio: </b> - + <b>Expiration Date: </b> <b>Fecha de caducidad: </b> - + <b>Error: </b> <b>Error: </b> - + The page you are trying to access has the following errors in the SSL certificate: La página a la que está intentando acceder tiene los siguientes errores en el certificado SSL: - + Would you like to make an exception for this certificate? ¿Le gustaría hacer una excepción para este certificado? - + Authorization required Autorización requerida - - + + Username: Nombre de usuario: - - + + Password: Contraseña: - + Save username and password on this site Guardar nombre de usuario y contraseña en este sitio - + A username and password are being requested by %1. The site says: "%2" Un nombre de usuario y contraseña son requeridos por %1. El sitio dice: "%2" - + Proxy authorization required Autorización del proxy requerida - + A username and password are being requested by proxy %1. Un nombre de usuario y contraseña son requeridos por el proxy %1. @@ -2676,32 +2676,32 @@ QtWin - + Open new tab Abrir nueva pestaña - + Opens a new tab if browser is running Abrir una pestaña nueva si el navegador está ejecutándose - + Open new window Abrir nueva ventana - + Opens a new window if browser is running Abrir una ventana nueva si el navegador está ejecutándose - + Open download manager Abrir el gestor de descargas - + Opens a download manager if browser is running Abrir el gestor de descargas si el navegador está ejecutándose @@ -3893,7 +3893,6 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup - This is your <b>%1.</b> visit of this site. Ha realizado <b>%1.</b> visitas a este sitio. @@ -3917,6 +3916,11 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup third tercero + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4370,8 +4374,8 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup - - + + New tab Nueva pestaña @@ -4532,7 +4536,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup Buscar "%1 .." con %2 - + No Named Page Página en blanco diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index a40671b6c..2748f4542 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -1761,74 +1761,74 @@ n'a pas été trouvé! NetworkManager - + SSL Certificate Error! Erreur de certificat SSL! - + The page you are trying to access has the following errors in the SSL certificate: La page à laquelle vous essayez d'accéder présente les erreurs suivantes dans le certificat SSL: - + <b>Organization: </b> <b>Organisation: </b> - + <b>Domain Name: </b> <b>Nom de domaine: </b> - + <b>Expiration Date: </b> <b>Date d'expiration: </b> - + <b>Error: </b> <b>Erreur: </b> - + Would you like to make an exception for this certificate? Voulez-vous faire une exception pour ce certificat ? - + Authorization required Autorisation requise - - + + Username: Nom d'utilisateur: - - + + Password: Mot de passe: - + Save username and password on this site Enregister le nom d'utilisateur et le mot de passe pour ce site - + A username and password are being requested by %1. The site says: "%2" Un nom d'utilisateur et un mot de passe sont requis par %1. Le site dit: "%2" - + Proxy authorization required Autorisation du proxy requise - + A username and password are being requested by proxy %1. Un nom d'utilisateur et un mot de passe sont requis par le proxy %1. @@ -2659,32 +2659,32 @@ n'a pas été trouvé! QtWin - + Open new tab Ouvrir un nouvel onglet - + Opens a new tab if browser is running Ouvre un nouvel onglet si le navigateur est en marche - + Open new window Ouvrir une nouvelle fenètre - + Opens a new window if browser is running Ouvre une nouvelle fenètre si le navigateur est en marche - + Open download manager Ouvrir le gestionnaire de téléchargement - + Opens a download manager if browser is running Ouvre un gestionnaire de téléchargement si le navigateur est en marche @@ -3877,7 +3877,6 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer - This is your <b>%1.</b> visit of this site. Vous avez visité ce site <b>%1</b> fois. @@ -3901,6 +3900,11 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer third Troisième + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4355,8 +4359,8 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer - - + + New tab Nouvel onglet @@ -4517,7 +4521,7 @@ Après avoir ajouté ou retiré un certificat, il est nécessaire de redémarrer Recherche de %1.."avec %2 - + No Named Page Page non nommée diff --git a/translations/it_IT.ts b/translations/it_IT.ts index 66844ae3f..5d344b502 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -1762,74 +1762,74 @@ NetworkManager - + SSL Certificate Error! Errore Certificato SSL! - + <b>Organization: </b> <b>Organizzazione: </b> - + <b>Domain Name: </b> <b>Nome Dominio: </b> - + <b>Expiration Date: </b> <b>Data di Scadenza: </b> - + <b>Error: </b> <b>Errore: </b> - + The page you are trying to access has the following errors in the SSL certificate: La pagina cui stai cercando di accedere ha i seguenti errori nel certificato SSL: - + Would you like to make an exception for this certificate? Vuoi fare un'eccezione per questo certificato? - + Authorization required Richiesta autorizzazione - - + + Username: Nome Utente: - - + + Password: Password: - + Save username and password on this site Salva nome utente e password per questo sito - + A username and password are being requested by %1. The site says: "%2" Nome utente e password sono richiesti da %1. Questo sito: "%2" - + Proxy authorization required Richiesta autorizzazione Proxy - + A username and password are being requested by proxy %1. Nome utente e password sono richiesti dal proxy %1. @@ -2674,32 +2674,32 @@ QtWin - + Open new tab Apri nuova scheda - + Opens a new tab if browser is running Apre una nuova scheda se il browser è in esecuzione - + Open new window Apri nuova finestra - + Opens a new window if browser is running Apre una nuova finestra se il browser è in esecuzione - + Open download manager Apri gestore scaricamenti - + Opens a download manager if browser is running Apre un gestore scaricamenti se il browser è in esecuzione @@ -3892,7 +3892,6 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari - This is your <b>%1.</b> visit of this site. Questa è la tua <b>%1</b> visita a questo sito. @@ -3916,6 +3915,11 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari third terzo + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4370,8 +4374,8 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari - - + + New tab Nuova scheda @@ -4532,7 +4536,7 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari Cerca "%1 .." con %2 - + No Named Page Pagina senza nome diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 03fd628f1..3a10ee955 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -1767,74 +1767,74 @@ werd niet gevonden! NetworkManager - + SSL Certificate Error! SSL-certificaatfout! - + <b>Organization: </b> <b>Organisatie: </b> - + <b>Domain Name: </b> <b>Domeinnaam: </b> - + <b>Expiration Date: </b> <b>Vervaldatum: </b> - + <b>Error: </b> <b>Fout: </b> - + The page you are trying to access has the following errors in the SSL certificate: De pagina die u probeert te bereiken heeft de volgende fouten in het SSL-certificaat: - + Would you like to make an exception for this certificate? Wilt u een uitzondering maken voor dit certificaat? - + Authorization required Machtiging benodigd - - + + Username: Gebruikersnaam: - - + + Password: Wachtwoord: - + Save username and password on this site Sla gebruikersnaam en wachtwoord van deze site op - + A username and password are being requested by %1. The site says: "%2" Er wordt om een gebruikersnaam en wachtwoord gevraagd door %1. De site zegt: "%2" - + Proxy authorization required Proxy-machtiging benodigd - + A username and password are being requested by proxy %1. Er wordt om een gebruikersnaam en wachtwoord gevraagd door proxy %1. @@ -2678,32 +2678,32 @@ werd niet gevonden! QtWin - + Open new tab Open nieuw tabblad - + Opens a new tab if browser is running Opent een nieuw tabblad wanneer browser draait - + Open new window Open nieuw venster - + Opens a new window if browser is running Opent een nieuw venster wanneer browser draait - + Open download manager Open downloadbeheerder - + Opens a download manager if browser is running Opent een downloadbeheerder wanneer browser draait @@ -3897,7 +3897,6 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te - This is your <b>%1.</b> visit of this site. Dit is uw <b>%1.</b> bezoek aan deze site. @@ -3916,6 +3915,11 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te third derde + + + This is your <b>%1</b> visit of this site. + + You have <b>never</b> visited this site before. @@ -4514,14 +4518,14 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Zoek "%1 .." met %2 - + No Named Page Niet benoemde pagina - - + + New tab Nieuw tabblad diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 9c9524940..5a03023da 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -1836,7 +1836,7 @@ p, li { white-space: pre-wrap; } NetworkManager - + SSL Certificate Error! Błąd certyfikatu SSL! @@ -1845,22 +1845,22 @@ p, li { white-space: pre-wrap; } Strona, którą próbujesz uzyskać dostęp ma następujące błędy w certyfikacie SSL: - + <b>Organization: </b> <b>Organizacja: </b> - + <b>Domain Name: </b> <b>Domena: </b> - + <b>Expiration Date: </b> <b>Ważna do: </b> - + <b>Error: </b> <b>Błąd: </b> @@ -1869,49 +1869,49 @@ p, li { white-space: pre-wrap; } Chcesz zrobić wyjątek dla tego certyfikatu? - + The page you are trying to access has the following errors in the SSL certificate: - + Would you like to make an exception for this certificate? - + Authorization required Wymagana autoryzacja - - + + Username: Nazwa użytkownika: - - + + Password: Hasło: - + Save username and password on this site Zapisać użytkownika i hasło dla tej strony - + A username and password are being requested by %1. The site says: "%2" Nazwa użytkownika i hasło jest wymagane dla %1. Komentarz: "%2" - + Proxy authorization required Autoryzacja Proxy wymagana - + A username and password are being requested by proxy %1. Nazwa użytkownika i hasło są wymagane dla proxy %1. @@ -2771,32 +2771,32 @@ p, li { white-space: pre-wrap; } QtWin - + Open new tab Otwórz nową kartę - + Opens a new tab if browser is running Otwiera nową kartę, jeżeli aplikacja jest uruchomiona - + Open new window Otwórz nowe okno - + Opens a new window if browser is running Otwiera nowe okno, jeśli aplikacja jest uruchomiona - + Open download manager Otwórz menadżer pobierania - + Opens a download manager if browser is running Otwiera menedżera pobierania, jeżeli aplikacja jest uruchomiona @@ -4067,7 +4067,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - This is your <b>%1.</b> visit of this site. @@ -4086,6 +4085,11 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla third trzecia + + + This is your <b>%1</b> visit of this site. + + This is Your <b>%1</b> visit of this site. Toto je Vaša <b>%1</b> návšteva tejto siete. @@ -4704,14 +4708,14 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + No Named Page Strona bez nazwy - - + + New tab Nowa karta diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index c9b7ba82b..cacfef5c6 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -1711,74 +1711,74 @@ NetworkManager - + SSL Certificate Error! Ошибка сертификата SSL! - + The page you are trying to access has the following errors in the SSL certificate: Странца, на которую вы пытаетесь зайти имеет следующие ошибки в сертификате SSL: - + <b>Organization: </b> <b>Организация:</b> - + <b>Domain Name: </b> <b>Имя домена</b> - + <b>Expiration Date: </b> <b>Истекает: </b> - + <b>Error: </b> <b>Ошибка: </b> - + Would you like to make an exception for this certificate? Сделать исключение для данного сертификата? - + Authorization required Необходима авторизация - - + + Username: Имя пользователя: - - + + Password: Пароль: - + Save username and password on this site Запомнить имя пользователя и пароль для этого сайта - + A username and password are being requested by %1. The site says: "%2" %1 требует имя пользователя и пароль.Сайт сказал: "%2" - + Proxy authorization required Прокси сервер требует авторизацию - + A username and password are being requested by proxy %1. Прокси сервер %1 требует имя пользователя и пароль. @@ -2613,33 +2613,33 @@ QtWin - + Open new tab Открыть новую вкладку - + Opens a new tab if browser is running ??? Открывать новую вкладку, если браузер запущен - + Open new window Открыть новое окно - + Opens a new window if browser is running Открывать новое окно, если браузер запущен - + Open download manager Открыть менеджер загрузок - + Opens a download manager if browser is running Открывать менеджер загрузок, если браузер запущен @@ -3821,7 +3821,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - This is your <b>%1.</b> visit of this site. Это ваше <b>%1 .</b> посещение этого сайта. @@ -3845,6 +3844,11 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla third третий + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4300,8 +4304,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - + + New tab Новая вкладка @@ -4462,7 +4466,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Искать "%1 .." с %2 - + No Named Page Безымянная страница diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index cd4def848..68c27bee1 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -3113,6 +3113,10 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad You have <b>never</b> visited this site before. Túto stránku ste <b>nikdy</b> predtým nenavštívili. + + This is your <b>%1</b> visit of this site. + + SourceViewer diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 731f68cc4..c0308a86c 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -1764,74 +1764,74 @@ NetworkManager - + SSL Certificate Error! SSL证书错误! - + <b>Organization: </b> 机构 - + <b>Domain Name: </b> 域名 - + <b>Expiration Date: </b> 截止日期 - + <b>Error: </b> <b>错误：</b> - + The page you are trying to access has the following errors in the SSL certificate: 您试图访问的页面有SSL证书错误： - + Would you like to make an exception for this certificate? 你想使这个证书例外吗？ - + Authorization required 需要授权 - - + + Username: 用户名: - - + + Password: 密码: - + Save username and password on this site 保存用户名和密码 - + A username and password are being requested by %1. The site says: "%2" 要求%1的用户名和密码。该网站说：“%2” - + Proxy authorization required 需要代理授权 - + A username and password are being requested by proxy %1. 正在由代理要求用户名和密码%1. @@ -2674,32 +2674,32 @@ QtWin - + Open new tab 打开新标签页 - + Opens a new tab if browser is running 浏览器运行时打开一个新标签页 - + Open new window 打开新窗口 - + Opens a new window if browser is running 浏览器运行时打开一个新窗口 - + Open download manager 打开下载管理器 - + Opens a download manager if browser is running 浏览器运行时打开下载管理器 @@ -3889,7 +3889,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - This is your <b>%1.</b> visit of this site. 这是您的<b>%1</ B>此网站的访问。 @@ -3913,6 +3912,11 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla third 第三 + + + This is your <b>%1</b> visit of this site. + + SourceViewer @@ -4365,8 +4369,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - + + New tab 新标签 @@ -4527,7 +4531,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla 使用 %2搜索"%1 .." - + No Named Page 无命名页面