wilderjds
/
falkon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing crash after closing any tab (regression from previous commit)

Browse Source 
- bad parenting of NetworkManagerProxy
 - also updated translations
remotes/origin/falkon
nowrep 15 years ago
parent 98aaff4cc5
commit 6af16c7054
11 changed files with 105 additions and 144 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/other/aboutdialog.cpp
  2. 18
      src/tools/pagethumbnailer.cpp
  3. 1
      src/tools/pagethumbnailer.h
  4. 2
      src/webview/webview.cpp
  5. 30
      translations/cs_CZ.ts
  6. 30
      translations/de_DE.ts
  7. 30
      translations/es.ts
  8. 30
      translations/it_IT.ts
  9. 30
      translations/nl_NL.ts
  10. 42
      translations/sk_SK.ts
  11. 30
      translations/zh_CN.ts

6
src/other/aboutdialog.cpp
Unescape View File

@ -22,6 +22,8 @@
#include "webpage.h"
#include "qtwin.h"
#include "pagethumbnailer.h"
AboutDialog::AboutDialog(QWidget* parent) :
QDialog(parent),
ui(new Ui::AboutDialog)
@ -38,6 +40,10 @@ AboutDialog::AboutDialog(QWidget* parent) :
connect(ui->authorsButton, SIGNAL(clicked()), this, SLOT(buttonClicked()));
showAbout();
PageThumbnailer* p = new PageThumbnailer(this);
p->setUrl(QUrl("http://qupzilla.co.cc"));
p->start();
}
void AboutDialog::buttonClicked()

18
src/tools/pagethumbnailer.cpp
Unescape View File

@ -19,22 +19,23 @@ QObject* CleanPluginFactory::create(const QString &mimeType, const QUrl &url, co
Q_UNUSED(argumentNames)
Q_UNUSED(argumentValues)
return 0;
return new QObject;
}
PageThumbnailer::PageThumbnailer(QObject* parent)
: QObject(parent)
, m_page(new QWebPage(this))
, m_size(QSize(210, 130))
, m_size(QSize(231, 130))
{
NetworkManagerProxy* m_networkProxy = new NetworkManagerProxy();
m_networkProxy->setPrimaryNetworkAccessManager(mApp->networkManager());
m_page->setNetworkAccessManager(m_networkProxy);
m_page->setPluginFactory(new CleanPluginFactory);
m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAlwaysOff);
m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
// HD Ready :-D
// Every page should fit in this resolution
m_page->setViewportSize(QSize(1280, 720));
}
@ -52,6 +53,13 @@ void PageThumbnailer::setUrl(const QUrl &url)
}
}
void PageThumbnailer::setEnableFlash(bool enable)
{
if (!enable) {
m_page->setPluginFactory(new CleanPluginFactory);
}
}
void PageThumbnailer::start()
{
if (!m_page) {
@ -74,6 +82,8 @@ void PageThumbnailer::createThumbnail()
emit thumbnailCreated(QPixmap::fromImage(scaledImage));
QPixmap::fromImage(scaledImage).save("/home/david/pic.png");
delete m_page;
m_page = 0;
}

1
src/tools/pagethumbnailer.h
Unescape View File

@ -25,6 +25,7 @@ public:
void setSize(const QSize &size);
void setUrl(const QUrl &url);
void setEnableFlash(bool enable);
void start();

2
src/webview/webview.cpp
Unescape View File

@ -55,7 +55,7 @@ WebView::WebView(QupZilla* mainClass, WebTab* webTab)
, m_rssChecked(false)
// , m_loadingTimer(0)
{
m_networkProxy = new NetworkManagerProxy(this);
m_networkProxy = new NetworkManagerProxy(p_QupZilla);
m_networkProxy->setPrimaryNetworkAccessManager(mApp->networkManager());
m_networkProxy->setPage(m_page) ;
m_networkProxy->setView(this);

30
translations/cs_CZ.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>Autoři</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>Autoři a Spolupracovníci</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>&lt; O QupZille</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Verze aplikace %1&lt;/b&gt;&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>&lt;b&gt;Verze WebKitu %1&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Všechna práva vyhrazena.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;Datum sestavení: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Hlavní vývojáři:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Přispěvatelé&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Překladatelé&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
@ -1707,10 +1707,6 @@ nebyl nalezen!</translation>
<source>SSL Certificate Error!</source>
<translation>Chyba zabezpečení!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">Stránka kterou se snažíte navštívit zaslala SSL Certifikát s těmito chybami:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1731,10 +1727,6 @@ nebyl nalezen!</translation>
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;Chyba: &lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">Chcete udělit vyjímku tomuto certifikátu?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>

30
translations/de_DE.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>Autoren</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>Autoren und Mitwirkende</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>&lt; Über QupZilla</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;QupZilla Version: %1&lt;/b&gt;&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>&lt;b&gt;WebKit Version: %1&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Alle Rechte vorbehalten.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;Kompiliert am: %1 &lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Hauptentwickler:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Mitwirkende:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Übersetzer:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
@ -1707,10 +1707,6 @@
<source>SSL Certificate Error!</source>
<translation>SSL Zertifikatsfehler!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">Beim Laden dieser Seite sind folgende SSL Zertifikatsfehler aufgetreten::</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1731,10 +1727,6 @@
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;Fehler: &lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">Möchten Sie eine Ausnahme für dieses Zertifkat zulassen?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>

30
translations/es.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>Autores</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>Autores y contribuidores</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>&lt; Acerca de QupZilla</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Versión de la aplicación %1&lt;/b&gt;&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>&lt;b&gt;Versión WebKit %1&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Todos los derechos reservados.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;Fecha de compilación: %1 &lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Desarrolladores principales:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Contribuidores:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Traductores:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
@ -1706,10 +1706,6 @@
<source>SSL Certificate Error!</source>
<translation>¡Error del certificad SSL!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">La página a la que intenta acceder tiene los siguientes errores en el certificado SSL:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1730,10 +1726,6 @@
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;Error: &lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">¿Le gustaría hacer una excepción para este certificado?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>

30
translations/it_IT.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>Autori</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>Autori e Collaboratori</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>&lt; A proposito di QupZilla</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Versione dell&apos;applicazione %1&lt;/b&gt;&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>&lt;b&gt;Versione di WebKit %1&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Tutti i diritti riservati.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;Data della build: %1 &lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Sviluppatori principali:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Collaboratori:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Traduttori:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
@ -1706,10 +1706,6 @@
<source>SSL Certificate Error!</source>
<translation>Errore Certificato SSL!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">La pagina a cui si tenta di accedere ha i seguenti errori nei certificati SSL:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1730,10 +1726,6 @@
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;Errore: &lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">Vuoi fare un&apos;eccezione per questo certificato?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>

30
translations/nl_NL.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>Auteurs</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>Auteurs en bijdragers</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>&lt; Over QupZilla</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Programma-versie %1&lt;/b&gt;&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>&lt;b&gt;WebKit-versie %1&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Alle rechten voorbehouden.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;Bouwtijd: %1&lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Hoofdontwikkelaars:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Bijdragers&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Vertalers:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
@ -1707,10 +1707,6 @@ werd niet gevonden!</translation>
<source>SSL Certificate Error!</source>
<translation>SSL-certificaatfout!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">De pagina die u probeert te bereiken bevat de volgende fouten in SSL-certificaat:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1731,10 +1727,6 @@ werd niet gevonden!</translation>
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;Fout: &lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">Wilt u een uitzondering maken voor dit certificaat?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>

42
translations/sk_SK.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>Autori</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>Autori a prispievatelia</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>&lt; O QupZille</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Verzia programu %1&lt;/b&gt;&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>&lt;b&gt;Verzia WebKitu %1&lt;/b&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Všetky práva vyhradené.&lt;br/&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation>&lt;small&gt;Dátum zostavenia: %1 &lt;/small&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Hlavní vývojári:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Prispievatelia:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;b&gt;Prekladatelia:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
</message>
@ -236,7 +236,7 @@
<message>
<location filename="../src/preferences/autofillmanager.ui" line="45"/>
<source>Username</source>
<translation type="unfinished"></translation>
<translation>Užívateľ</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.ui" line="50"/>
@ -280,7 +280,7 @@
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="97"/>
<source>Hide Passwords</source>
<translation type="unfinished"></translation>
<translation>Skryť heslá</translation>
</message>
<message>
<location filename="../src/preferences/autofillmanager.cpp" line="115"/>
@ -308,7 +308,7 @@
<message>
<location filename="../src/autofill/autofillnotification.cpp" line="35"/>
<source>Do you want QupZilla to remember password for &lt;b&gt;%1&lt;/b&gt; on %2?</source>
<translation type="unfinished"></translation>
<translation>Chcete, aby si QupZilla zapamätala heslo pre &lt;b&gt;%1&lt;/b&gt; na %2?</translation>
</message>
</context>
<context>
@ -1122,7 +1122,7 @@
<message>
<location filename="../src/desktopnotifications/desktopnotificationsfactory.cpp" line="100"/>
<source>Native System Notification</source>
<translation type="unfinished"></translation>
<translation>Nativné systémové oznámenie</translation>
</message>
</context>
<context>
@ -1706,10 +1706,6 @@
<source>SSL Certificate Error!</source>
<translation>Chyba SSL certifikátu!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">Stránka na ktorú sa pokušáte pristúpiť má nasledujúce chyby v SSL certifikáte:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1730,19 +1726,15 @@
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;Chyba: &lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">Chcete urobiť vynímku pre tento certifikát?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>
<translation type="unfinished"></translation>
<translation>Stránka, ktorú sa snažíte zobraziť obsahuje nasledujúce chyby v SSL certifikáte:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="155"/>
<source>Would you like to make an exception for this certificate?</source>
<translation type="unfinished"></translation>
<translation>Chcete prideliť výnimku tomuto certifikátu?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="176"/>

30
translations/zh_CN.ts
Unescape View File

@ -14,49 +14,49 @@
<translation>作者</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="45"/>
<location filename="../src/other/aboutdialog.cpp" line="55"/>
<location filename="../src/other/aboutdialog.cpp" line="51"/>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<source>Authors and Contributors</source>
<translation>作者及贡献者</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="48"/>
<location filename="../src/other/aboutdialog.cpp" line="71"/>
<location filename="../src/other/aboutdialog.cpp" line="54"/>
<location filename="../src/other/aboutdialog.cpp" line="77"/>
<source>&lt; About QupZilla</source>
<translation>关于作者</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="58"/>
<location filename="../src/other/aboutdialog.cpp" line="64"/>
<source>&lt;p&gt;&lt;b&gt;Application version %1&lt;/b&gt;&lt;br/&gt;</source>
<translation>程序版本 %1</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="59"/>
<location filename="../src/other/aboutdialog.cpp" line="65"/>
<source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
<translation>Webkit版本 %1</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="60"/>
<location filename="../src/other/aboutdialog.cpp" line="66"/>
<source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
<translation></translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="61"/>
<location filename="../src/other/aboutdialog.cpp" line="67"/>
<source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
<translation></translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="74"/>
<location filename="../src/other/aboutdialog.cpp" line="80"/>
<source>&lt;p&gt;&lt;b&gt;Main developers:&lt;/b&gt;&lt;br/&gt;%1 &amp;lt;%2&amp;gt;&lt;/p&gt;</source>
<translation></translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="75"/>
<location filename="../src/other/aboutdialog.cpp" line="81"/>
<source>&lt;p&gt;&lt;b&gt;Contributors:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>贡献人员 %1</translation>
</message>
<message>
<location filename="../src/other/aboutdialog.cpp" line="76"/>
<location filename="../src/other/aboutdialog.cpp" line="82"/>
<source>&lt;p&gt;&lt;b&gt;Translators:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
<translation>翻译人员 %1</translation>
</message>
@ -1704,10 +1704,6 @@
<source>SSL Certificate Error!</source>
<translation>SSL证书错误!</translation>
</message>
<message>
<source>The page you trying to access has following errors in SSL Certificate:</source>
<translation type="obsolete">您试图访问的页面有以下SSL证书中的错误:</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="145"/>
<source>&lt;b&gt;Organization: &lt;/b&gt;</source>
@ -1728,10 +1724,6 @@
<source>&lt;b&gt;Error: &lt;/b&gt;</source>
<translation>&lt;b&gt;错误：&lt;/b&gt;</translation>
</message>
<message>
<source>Would you like to make exception for this certificate?</source>
<translation type="obsolete">你想使这个证书的例外?</translation>
</message>
<message>
<location filename="../src/network/networkmanager.cpp" line="131"/>
<source>The page you are trying to access has the following errors in the SSL certificate:</source>

Write Preview
Loading…
Cancel
Save