From d9b5c86dbee56b55d05635dd6c42ae45abb941e0 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sat, 24 Dec 2011 12:21:23 +0100 Subject: [PATCH] WebView now recieves only own Events. - also using static variables for qupzilla: scheme pages no need to generate it every time it is about to load --- AUTHORS | 2 +- bin/locale/cs_CZ.qm | Bin 84707 -> 84880 bytes src/network/qupzillaschemehandler.cpp | 158 +++++++++++++---------- src/plugins/speeddial.cpp | 12 +- src/plugins/speeddial.h | 2 - src/src.pro | 1 + src/webview/webview.cpp | 172 +++++++++++++------------- translations/cs_CZ.ts | 156 +++++++++++------------ translations/de_DE.ts | 156 +++++++++++------------ translations/empty.ts | 158 +++++++++++------------ translations/es_ES.ts | 156 +++++++++++------------ translations/it_IT.ts | 156 +++++++++++------------ translations/nl_NL.ts | 156 +++++++++++------------ translations/pl_PL.ts | 156 +++++++++++------------ translations/sk_SK.ts | 6 +- translations/zh_CN.ts | 156 +++++++++++------------ 16 files changed, 825 insertions(+), 778 deletions(-) diff --git a/AUTHORS b/AUTHORS index c89633606..0c1cd6aa6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ David Rosca Contributors: -Bryan (opening background tabs, closing window when closing last tab) +Bryan M Dunsmore (opening background tabs, closing window when closing last tab) Daniele Cocca (close tabs with middle click, initial work on speed dial) Jan Rajnoha (QupZilla icon) diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index b3a4786df07666f00c89733f887dd875d3c33772..ad3947334d8faa43a04dbf47bf06bf983d049550 100644 GIT binary patch delta 3372 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 delta 3120 zcmXArd0bT08^)h=XYO3)Ugi!A!Z6C>LaZ{V1bh_a7pS1-T8avSprKMKicm@^?pun> zN!$?(q}&ZP6?a6TL@iTXkOFec#4R=4`n@uL%;!5Z_nvd!^S;mfoU>w$*tl9;5zwVM z6X>i0vxWk(ML_lj8~?gwnpTju=*tG{v^{bCOR!Sif9 z>tkc%P4rtg8W{Z6#^!CjSn#wsV(_O^fED@pc+py5Toyh){1{BTklz$STL&f}Zb>oi z+e$o4rAQ+_1!{-$K#f(aRVmmi@@Z1 zOw5ykkuQ)wfpQeL3R&T~V3uZNKbi-o#PA0i^I#F{9X)^rb5XQ33GnTP9m|FQId%Bq zNMA7BdK{fk73kR&=f>OuvL4~LS^2=i5v_)@$q+I5H^*os0U_Mkk)^wwq z4SdlS@H@taSO@i(N@K`2Xj54t(tZUtW_KSz|Nza zOOCcG``zEoHg*WJv7?}^%8LRl18v+`+CrxJ!A5l;@1?g2hFd&KA1Yis#dqq%9NUW# z)f5+ci+#_O0+09cXZjeS)oR{d{@;jB;?fWb>&|~R-k;V&W?U{Vji~^1ZZ?`qZJe2F zW8LRAKAB5*8;F7KzdNc!wkJ81Zp90Q((?Vt*r%NiD4E#Bb zC)$4z)m^v7AsVRIrCa}u7991VZu2@aTF*RP$yHilu3opt|68E2Shv3*m4ZE_J9TaX zInzU3xl19v*UX&_p{Cm>eql zq6t|2t27}q7kF7AO}s|UZ9FYyHq`+|MbfmAB%t~k@ttxfOEb#e2i`v;Ee^RsWn3gJ z4hskOR~`G_d?w|!COw2-YawHYq;=U@fU;lOu$BB@agsJBP(8F!QvN-fyT>DGdwm^P z>lM* z2>1Wu&c+zQ@i|X4hB=z;mdMAzOa*qUE`0#zu!a{KLj{Lge$(i~v|Mzs3UBZ65QiXr zAANH5P~eY!e4>NdQPCIlAWh(~eoN`QQpNDq4v}46+|^gQUIPXi^p))+fxBJwRXr&8 zPG$P4bL6-E3iVfZmXqK1)&Jd-lK8Nc8ywx+;J;KEbEp_UOR^@P8e>(gEa%mLb$rZw zIa<2~-j>71Zls+4C`ah2MH-#t2=x{)=$8Dyc%q$Aj?JNb_@9^iOd=of+AsI{?ilbo znD2Bn_c6$E3W@Mwh#X(}7nmknPIyDM{c4Q-$&IIE`m^QK0@|50T~4i-MCw=Mv7U2* zJ`3cjkrZtGNjdY_1+x1A++d0nI!xmIP2OF+(&R%vlsRh$xvcLAU}}SWWGTgV=COQo zIi2A`lU!9WA6Rox{%IEJNYk4ao4ljNvkE&f6S%dwh0JxHjRBR4RyP-{(L`Tj>xaQ>$9ZLK}&W;nm>7s8K39%%)7AR4UIp0WTuBbE_nw<^a!X6~sF6;#OfSlHY60**#h!1ZIxNkNjJf^453k@S< z{swB?c%qAk;LG_87jL0W5-)ZckmFWwI9(Y*SzXXVrl~iaogM;MpBSE$l7L=cH$2Pj z1DuaAG?!6Lb;k`aN73Ya>J6_-Or+igswt)c2(+rE?}^qhrQ~&uET%}ZPX=uD#$7m)aB2tKxC@A#*G?oOMzNYPoXZjtbXfC>cvI1I&=9bIRHIiv+KXLym(W@y59Jjez|u zV{#2ywp%!Nx0v;z#>r+f6(>*L-4Z$IZh`Ss{vJxpapT2t1IU44{H320Eu}TydqsQ7 z=w@s>L>=aAF*f~4&;Pk&e4aq!UK?U;wvY;!Z%PB}?4ki(I}m}kd}Wh+>0QgqD;jU4 s@>`F*-0bKPbo4Rx3Y?gdHlc0W)VAr9Gt<&1rA*)}AGw!4d|Wu<|5t9fMgRZ+ diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index cc4492dac..10fa6a820 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -115,64 +115,80 @@ qint64 QupZillaSchemeReply::readData(char* data, qint64 maxSize) QString QupZillaSchemeReply::reportbugPage() { - QString page; - page.append(qz_readAllFileContents(":html/reportbug.html")); - page.replace("%FAVICON%", "qrc:icons/qupzilla.png"); - page.replace("%BOX-BORDER%", "qrc:html/box-border.png"); + static QString bPage; - page.replace("%TITLE%", tr("Report Issue")); - page.replace("%REPORT-ISSUE%", tr("Report Issue")); - page.replace("%PLUGINS-TEXT%", tr("If you are experiencing problems with QupZilla, please try first disable" + if (!bPage.isEmpty()) { + return bPage; + } + + bPage.append(qz_readAllFileContents(":html/reportbug.html")); + bPage.replace("%FAVICON%", "qrc:icons/qupzilla.png"); + bPage.replace("%BOX-BORDER%", "qrc:html/box-border.png"); + + bPage.replace("%TITLE%", tr("Report Issue")); + bPage.replace("%REPORT-ISSUE%", tr("Report Issue")); + bPage.replace("%PLUGINS-TEXT%", tr("If you are experiencing problems with QupZilla, please try first disable" " all plugins.
If it won't help, then please fill this form: ")); - page.replace("%EMAIL%", tr("Your E-mail")); - page.replace("%TYPE%", tr("Issue type")); - page.replace("%DESCRIPTION%", tr("Issue description")); - page.replace("%SEND%", tr("Send")); - page.replace("%E-MAIL-OPTIONAL%", tr("E-mail is optional")); - page.replace("%FIELDS-ARE-REQUIRED%", tr("Please fill all required fields!")); - return page; + bPage.replace("%EMAIL%", tr("Your E-mail")); + bPage.replace("%TYPE%", tr("Issue type")); + bPage.replace("%DESCRIPTION%", tr("Issue description")); + bPage.replace("%SEND%", tr("Send")); + bPage.replace("%E-MAIL-OPTIONAL%", tr("E-mail is optional
Note: Please use English language only.")); + bPage.replace("%FIELDS-ARE-REQUIRED%", tr("Please fill all required fields!")); + + return bPage; } QString QupZillaSchemeReply::startPage() { - QString page; - page.append(qz_readAllFileContents(":html/start.html")); - page.replace("%FAVICON%", "qrc:icons/qupzilla.png"); - page.replace("%BOX-BORDER%", "qrc:html/box-border.png"); - page.replace("%ABOUT-IMG%", "qrc:icons/other/about.png"); + static QString sPage; - page.replace("%TITLE%", tr("Start Page")); - page.replace("%BUTTON-LABEL%", tr("Google Search")); - page.replace("%SEARCH-BY-GOOGLE%", tr("Search results provided by Google")); - page.replace("%WWW%", QupZilla::WIKIADDRESS); - page.replace("%ABOUT-QUPZILLA%", tr("About QupZilla")); + if (!sPage.isEmpty()) { + return sPage; + } - return page; + sPage.append(qz_readAllFileContents(":html/start.html")); + sPage.replace("%FAVICON%", "qrc:icons/qupzilla.png"); + sPage.replace("%BOX-BORDER%", "qrc:html/box-border.png"); + sPage.replace("%ABOUT-IMG%", "qrc:icons/other/about.png"); + + sPage.replace("%TITLE%", tr("Start Page")); + sPage.replace("%BUTTON-LABEL%", tr("Google Search")); + sPage.replace("%SEARCH-BY-GOOGLE%", tr("Search results provided by Google")); + sPage.replace("%WWW%", QupZilla::WIKIADDRESS); + sPage.replace("%ABOUT-QUPZILLA%", tr("About QupZilla")); + + return sPage; } QString QupZillaSchemeReply::aboutPage() { - QString page; - page.append(qz_readAllFileContents(":html/about.html")); - page.replace("%FAVICON%", "qrc:icons/qupzilla.png"); - page.replace("%BOX-BORDER%", "qrc:html/box-border.png"); - page.replace("%ABOUT-IMG%", "qrc:icons/other/about.png"); - page.replace("%COPYRIGHT-INCLUDE%", Qt::escape(qz_readAllFileContents(":html/copyright"))); + static QString aPage; - page.replace("%TITLE%", tr("About QupZilla")); - page.replace("%ABOUT-QUPZILLA%", tr("About QupZilla")); - page.replace("%INFORMATIONS-ABOUT-VERSION%", tr("Informations about version")); - page.replace("%BROWSER-IDENTIFICATION%", tr("Browser Identification")); - page.replace("%PATHS%", tr("Paths")); - page.replace("%COPYRIGHT%", tr("Copyright")); + if (!aPage.isEmpty()) { + return aPage; + } - page.replace("%VERSION-INFO%", + aPage.append(qz_readAllFileContents(":html/about.html")); + aPage.replace("%FAVICON%", "qrc:icons/qupzilla.png"); + aPage.replace("%BOX-BORDER%", "qrc:html/box-border.png"); + aPage.replace("%ABOUT-IMG%", "qrc:icons/other/about.png"); + aPage.replace("%COPYRIGHT-INCLUDE%", Qt::escape(qz_readAllFileContents(":html/copyright"))); + + aPage.replace("%TITLE%", tr("About QupZilla")); + aPage.replace("%ABOUT-QUPZILLA%", tr("About QupZilla")); + aPage.replace("%INFORMATIONS-ABOUT-VERSION%", tr("Informations about version")); + aPage.replace("%BROWSER-IDENTIFICATION%", tr("Browser Identification")); + aPage.replace("%PATHS%", tr("Paths")); + aPage.replace("%COPYRIGHT%", tr("Copyright")); + + aPage.replace("%VERSION-INFO%", QString("
%1
%2
").arg(tr("Version"), QupZilla::VERSION) + QString("
%1
%2
").arg(tr("WebKit version"), QupZilla::WEBKITVERSION) + QString("
%1
%2
").arg(tr("Build time"), QupZilla::BUILDTIME) + QString("
%1
%2
").arg(tr("Platform"), qz_buildSystem())); - page.replace("%USER-AGENT%", WebPage::UserAgent); - page.replace("%PATHS-TEXT%", + aPage.replace("%USER-AGENT%", WebPage::UserAgent); + aPage.replace("%PATHS-TEXT%", QString("
%1
%2
").arg(tr("Profile"), mApp->getActiveProfilPath()) + QString("
%1
%2
").arg(tr("Settings"), mApp->getActiveProfilPath() + "settings.ini") + QString("
%1
%2
").arg(tr("Saved session"), mApp->getActiveProfilPath() + "session.dat") + @@ -181,14 +197,15 @@ QString QupZillaSchemeReply::aboutPage() QString("
%1
%2
").arg(tr("Themes"), mApp->THEMESDIR) + QString("
%1
%2
").arg(tr("Plugins"), mApp->PLUGINSDIR) + QString("
%1
%2
").arg(tr("Translations"), mApp->TRANSLATIONSDIR)); - page.replace("%MAIN-DEVELOPER%", tr("Main developer")); - page.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR, "nowrep@gmail.com")); - page.replace("%CONTRIBUTORS%", tr("Contributors")); - page.replace("%CONTRIBUTORS-TEXT%", authorString("Daniele Cocca", "jmc@chakra-project.org") + "
" + + aPage.replace("%MAIN-DEVELOPER%", tr("Main developer")); + aPage.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR, "nowrep@gmail.com")); + aPage.replace("%CONTRIBUTORS%", tr("Contributors")); + aPage.replace("%CONTRIBUTORS-TEXT%", authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "
" + + authorString("Daniele Cocca", "jmc@chakra-project.org") + "
" + authorString("Jan Rajnoha", "honza.rajny@hotmail.com") ); - page.replace("%TRANSLATORS%", tr("Translators")); - page.replace("%TRANSLATORS-TEXT%", authorString("Heimen Stoffels", "vistausss@gmail.com") + " (Dutch)
" + + aPage.replace("%TRANSLATORS%", tr("Translators")); + aPage.replace("%TRANSLATORS-TEXT%", authorString("Heimen Stoffels", "vistausss@gmail.com") + " (Dutch)
" + authorString("Peter Vacula", "pvacula1989@gmail.com") + " (Slovak)
" + authorString("Ján Ďanovský", "dagsoftware@yahoo.com") + " (Slovak)
" + authorString("Jonathan Hooverman", "jonathan.hooverman@gmail.com") + " (German)
" + @@ -199,33 +216,38 @@ QString QupZillaSchemeReply::aboutPage() authorString("Michał Szymanowski", "tylkobuba@gmail.com") + " (Polish)" ); - return page; + return aPage; } QString QupZillaSchemeReply::speeddialPage() { - QString page; - page.append(qz_readAllFileContents(":html/speeddial.html")); - page.replace("%FAVICON%", "qrc:icons/qupzilla.png"); - page.replace("%IMG_PLUS%", "qrc:html/plus.png"); - page.replace("%BOX-BORDER%", "qrc:html/box-border-small.png"); - page.replace("%IMG_CLOSE%", "qrc:html/close.png"); - page.replace("%IMG_EDIT%", "qrc:html/edit.png"); - page.replace("%IMG_RELOAD%", "qrc:html/reload.png"); + static QString dPage; - page.replace("%SITE-TITLE%", tr("Speed Dial")); - page.replace("%ADD-TITLE%", tr("Add New Page")); - page.replace("%TITLE-EDIT%", tr("Apply")); - page.replace("%TITLE-REMOVE%", tr("Remove")); - page.replace("%TITLE-RELOAD%", tr("Reload")); - page.replace("%TITLE-FETCHTITLE%", tr("Load title from page")); - page.replace("%JQUERY%", "qrc:html/jquery.js"); - page.replace("%JQUERY-UI%", "qrc:html/jquery-ui.js"); - page.replace("%LOADING-IMG%", mApp->plugins()->speedDial()->loadingImagePath()); - page.replace("%URL%", tr("Url")); - page.replace("%TITLE%", tr("Title")); - page.replace("%EDIT%", tr("Edit")); - page.replace("%NEW-PAGE%", tr("New Page")); + if (dPage.isEmpty()) { + dPage.append(qz_readAllFileContents(":html/speeddial.html")); + dPage.replace("%FAVICON%", "qrc:icons/qupzilla.png"); + dPage.replace("%IMG_PLUS%", "qrc:html/plus.png"); + dPage.replace("%BOX-BORDER%", "qrc:html/box-border-small.png"); + dPage.replace("%IMG_CLOSE%", "qrc:html/close.png"); + dPage.replace("%IMG_EDIT%", "qrc:html/edit.png"); + dPage.replace("%IMG_RELOAD%", "qrc:html/reload.png"); + + dPage.replace("%SITE-TITLE%", tr("Speed Dial")); + dPage.replace("%ADD-TITLE%", tr("Add New Page")); + dPage.replace("%TITLE-EDIT%", tr("Apply")); + dPage.replace("%TITLE-REMOVE%", tr("Remove")); + dPage.replace("%TITLE-RELOAD%", tr("Reload")); + dPage.replace("%TITLE-FETCHTITLE%", tr("Load title from page")); + dPage.replace("%JQUERY%", "qrc:html/jquery.js"); + dPage.replace("%JQUERY-UI%", "qrc:html/jquery-ui.js"); + dPage.replace("%LOADING-IMG%", "qrc:html/loading.gif"); + dPage.replace("%URL%", tr("Url")); + dPage.replace("%TITLE%", tr("Title")); + dPage.replace("%EDIT%", tr("Edit")); + dPage.replace("%NEW-PAGE%", tr("New Page")); + } + + QString page = dPage; page.replace("%INITIAL-SCRIPT%", mApp->plugins()->speedDial()->initialScript()); return page; diff --git a/src/plugins/speeddial.cpp b/src/plugins/speeddial.cpp index 568f169a6..aa374feef 100644 --- a/src/plugins/speeddial.cpp +++ b/src/plugins/speeddial.cpp @@ -44,7 +44,6 @@ void SpeedDial::loadSettings() } m_thumbnailsDir = mApp->getActiveProfilPath() + "thumbnails/"; - m_loadingImagePath = "qrc:html/loading.gif"; // If needed, create thumbnails directory if (!QDir(m_thumbnailsDir).exists()) { @@ -60,15 +59,6 @@ void SpeedDial::saveSettings() settings.endGroup(); } -QString SpeedDial::loadingImagePath() -{ - if (!m_loaded) { - loadSettings(); - } - - return m_loadingImagePath; -} - void SpeedDial::addWebFrame(QWebFrame* frame) { if (!m_webFrames.contains(frame)) { @@ -108,7 +98,7 @@ QString SpeedDial::initialScript() if (!QFile(imgSource).exists()) { loadThumbnail(url); - imgSource = m_loadingImagePath; + imgSource = "qrc:html/loading.gif"; if (url.isEmpty()) { imgSource = ""; diff --git a/src/plugins/speeddial.h b/src/plugins/speeddial.h index 745064539..c92720aab 100644 --- a/src/plugins/speeddial.h +++ b/src/plugins/speeddial.h @@ -39,7 +39,6 @@ public: void addWebFrame(QWebFrame* frame); QString initialScript(); - QString loadingImagePath(); signals: @@ -55,7 +54,6 @@ private: QString m_initialScript; QString m_allPages; QString m_thumbnailsDir; - QString m_loadingImagePath; QList > m_webFrames; diff --git a/src/src.pro b/src/src.pro index a5dfabdcd..015a2a7f7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -37,6 +37,7 @@ TRANSLATIONS +=../translations/cs_CZ.ts\ ../translations/it_IT.ts\ ../translations/pl_PL.ts\ ../translations/es_ES.ts\ + ../translations/fr_FR.ts\ ../translations/empty.ts\ diff --git a/src/webview/webview.cpp b/src/webview/webview.cpp index 692052628..2d79adad4 100644 --- a/src/webview/webview.cpp +++ b/src/webview/webview.cpp @@ -450,90 +450,6 @@ void WebView::checkRss() emit rssChanged(m_hasRss); } -void WebView::mousePressEvent(QMouseEvent* event) -{ - switch (event->button()) { - case Qt::XButton1: - back(); - break; - case Qt::XButton2: - forward(); - break; - case Qt::MiddleButton: - if (isUrlValid(QUrl(m_hoveredLink))) { - tabWidget()->addView(QUrl::fromEncoded(m_hoveredLink.toUtf8()), tr("New tab"), TabWidget::NewBackgroundTab); - event->accept(); - } -#ifdef Q_WS_WIN - else { - QWebView::mouseDoubleClickEvent(event); - } -#endif - break; - case Qt::LeftButton: - if (event->modifiers() == Qt::ControlModifier && isUrlValid(QUrl(m_hoveredLink))) { - tabWidget()->addView(QUrl::fromEncoded(m_hoveredLink.toUtf8()), tr("New tab"), TabWidget::NewBackgroundTab); - return; - } - default: - QWebView::mousePressEvent(event); - break; - } -} - -void WebView::keyPressEvent(QKeyEvent* event) -{ - switch (event->key()) { - case Qt::Key_C: - if (event->modifiers() == Qt::ControlModifier) { - copyText(); - return; - } - break; - - case Qt::Key_A: - if (event->modifiers() == Qt::ControlModifier) { - selectAll(); - return; - } - break; - - default: - break; - } - - QWebView::keyPressEvent(event); -} - -void WebView::resizeEvent(QResizeEvent* event) -{ - QWebView::resizeEvent(event); - emit viewportResized(m_page->viewportSize()); -} - -void WebView::mouseReleaseEvent(QMouseEvent* event) -{ - //Workaround for crash in mouseReleaseEvent when closing tab from javascript :/ - if (!m_wantsClose) { - QWebView::mouseReleaseEvent(event); - } -} - -void WebView::mouseMoveEvent(QMouseEvent* event) -{ - if (m_mouseTrack) { - if (m_navigationVisible) { - m_navigationVisible = false; - p_QupZilla->showNavigationWithFullscreen(); - } - else if (event->y() < 5) { - m_navigationVisible = true; - p_QupZilla->showNavigationWithFullscreen(); - } - } - QWebView::mouseMoveEvent(event); -} - void WebView::contextMenuEvent(QContextMenuEvent* event) { m_menu->clear(); @@ -917,6 +833,90 @@ bool WebView::isUrlValid(const QUrl &url) return false; } +void WebView::mousePressEvent(QMouseEvent* event) +{ + switch (event->button()) { + case Qt::XButton1: + back(); + break; + case Qt::XButton2: + forward(); + break; + case Qt::MiddleButton: + if (isUrlValid(QUrl(m_hoveredLink))) { + tabWidget()->addView(QUrl::fromEncoded(m_hoveredLink.toUtf8()), tr("New tab"), TabWidget::NewBackgroundTab); + event->accept(); + } +#ifdef Q_WS_WIN + else { + QWebView::mouseDoubleClickEvent(event); + } +#endif + break; + case Qt::LeftButton: + if (event->modifiers() == Qt::ControlModifier && isUrlValid(QUrl(m_hoveredLink))) { + tabWidget()->addView(QUrl::fromEncoded(m_hoveredLink.toUtf8()), tr("New tab"), TabWidget::NewBackgroundTab); + return; + } + default: + QWebView::mousePressEvent(event); + break; + } +} + +void WebView::keyPressEvent(QKeyEvent* event) +{ + switch (event->key()) { + case Qt::Key_C: + if (event->modifiers() == Qt::ControlModifier) { + copyText(); + return; + } + break; + + case Qt::Key_A: + if (event->modifiers() == Qt::ControlModifier) { + selectAll(); + return; + } + break; + + default: + break; + } + + QWebView::keyPressEvent(event); +} + +void WebView::resizeEvent(QResizeEvent* event) +{ + QWebView::resizeEvent(event); + emit viewportResized(m_page->viewportSize()); +} + +void WebView::mouseReleaseEvent(QMouseEvent* event) +{ + //Workaround for crash in mouseReleaseEvent when closing tab from javascript :/ + if (!m_wantsClose) { + QWebView::mouseReleaseEvent(event); + } +} + +void WebView::mouseMoveEvent(QMouseEvent* event) +{ + if (m_mouseTrack) { + if (m_navigationVisible) { + m_navigationVisible = false; + p_QupZilla->showNavigationWithFullscreen(); + } + else if (event->y() < 5) { + m_navigationVisible = true; + p_QupZilla->showNavigationWithFullscreen(); + } + } + QWebView::mouseMoveEvent(event); +} + /// // This function was taken and modified from QTestBrowser to fix bug #33 with flightradar24.com // You can find original source and copyright here: @@ -924,6 +924,10 @@ bool WebView::isUrlValid(const QUrl &url) /// bool WebView::eventFilter(QObject* obj, QEvent* event) { + if (obj != this) { + return false; + } + if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonDblClick || diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index 4577ee864..c46dd5b68 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -3158,210 +3158,214 @@ nebyl nalezen! Nenalezeno - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: Pokud máte problém s používáním QupZilly, zakažte prosím všechny doplňky. <br/> Pokud problém přetrvává, vyplňte tento formulář: - + Your E-mail Váš e-mail - + Issue type Typ problému - - + + Report Issue Nahlásit problém - + Issue description Popis problému - + Send Odeslat - E-mail is optional - e-mail je nepovinný + e-mail je nepovinný - + Please fill all required fields! Vyplňte prosím všechna povinná pole! - + Start Page Startovní stránka - + Google Search Vyhledávání Google - + Search results provided by Google Výsledky vyhledávání poskytuje Google - - - + + + About QupZilla O QupZille - + Informations about version Informace o verzi - + Browser Identification Identifikace prohlížeče - + Paths Cesty - + Copyright Copyright - + Version Verze - + WebKit version Verze WebKitu - + Build time Sestaveno - + Platform Platforma - + Profile Profil - + Settings Nastavení - + Saved session Uložené relace - + Pinned tabs Připíchnuté panely - + Data Data - + Themes Témata - + Plugins Doplňky - + Translations Překlady - + Main developer Hlavní vývojář - + Contributors Přispěvatelé - + Translators Překladatelé - + Speed Dial Rychlá volba - + Add New Page Přidat novou stránku - + Apply Uložit - + Load title from page Načíst titulek ze stránky - + Edit Upravit - + Remove Odstranit - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + E-mail je nepovinný<br/><b>Poznámka: </b>Používejte prosím pouze anglický jazyk. + + + Reload Načíst znovu - + Url Adresa - + Title Titulek - + New Page Nová stránka @@ -4072,7 +4076,7 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ SpeedDial - + Unable to load Nepodařilo se načíst @@ -4175,7 +4179,7 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ - + No Named Page Bezejmenná stránka @@ -4185,8 +4189,8 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Dohromady máte otevřeno %1 panelů - - + + New tab Nový panel @@ -4363,62 +4367,62 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Načítám... - + Open link in new &tab Otevřít odkaz v novém &panelu - + Open link in new &window Otevřít odkaz v novém &okně - + B&ookmark link Přidat odkaz do zá&ložek - + &Save link as... &Uložit odkaz jako... - + &Copy link address &Kopírovat adresu odkazu - + Show i&mage Zobrazit &obrázek - + Copy im&age &Kopírovat obrázek - + Copy image ad&dress Kopírovat adr&esu obrázku - + S&top &Zastavit - + Show info ab&out site Zobrazit &informace o stránce - + Show Web &Inspector Zobrazit Web &Inspektor - + &Save image as... &Uložit obrázek jako... @@ -4428,69 +4432,69 @@ Po přidání či odstranění cest k certifikátům je nutné k projevení změ Chyba při načítání stránky - + &Back &Zpět - + &Forward &Vpřed - + &Reload &Obnovit - + Book&mark page Přidat stránku do zá&ložek - + &Save page as... &Uložit stránku jako... - + Select &all Vyb&rat vše - + Show so&urce code Zobrazit zdrojový kó&d - + Search "%1 .." with %2 Hledat "%1 .." s %2 - + No Named Page Bezejmenná stránka - - - + + + New tab Nový panel - + Send link... Odeslat odkaz... - + Send image... Odeslat obrázek... - + Send page... Odeslat stránku... diff --git a/translations/de_DE.ts b/translations/de_DE.ts index 810d429d4..99e4b37b8 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -3150,210 +3150,214 @@ Nicht gefunden - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: Wenn Sie bei der Nutzung von QupZilla auf Probleme stoßen, deaktivieren Sie bitte zuerst alle Plugins. <br/> Sollte dies das Problem nicht lösen, füllen Sie bitte dieses Formular aus: - + Your E-mail Ihre E-Mail Adresse - + Issue type Fehlertyp - + Issue description Fehlerbeschreibung - + Send Senden - E-mail is optional - Angabe optional + Angabe optional - + Please fill all required fields! Bitte füllen Sie alle erforderlichen Felder aus! - + Start Page Startseite - + Google Search Google Suche - + Search results provided by Google Suchergebnisse - - - + + + About QupZilla Über QupZilla - + Informations about version Versionsinformationen - + Browser Identification Browser Indentifizierung - + Paths Pfade - + Copyright Copyright - + Main developer Hauptentwickler - + Contributors Mitwirkende - + Translators Übersetzer - + Speed Dial Schnellwahl - + Add New Page Neue Seite hinzufügen - + Apply - + Load title from page - + Edit Bearbeiten - + Remove Entfernen - + Reload Neu laden - + Url Url - + Title Titel - + New Page Neue Seite - + Version Version - - + + Report Issue Fehlerbericht senden - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + WebKit version WebKit Version - + Build time Kompiliert am - + Platform Plattform - + Profile Profile - + Settings Einstellungen - + Saved session Gespeicherte Sitzung - + Pinned tabs Angeheftete Tabs - + Data Daten - + Themes Themen - + Plugins Plugins - + Translations Übersetzungen @@ -4063,7 +4067,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest SpeedDial - + Unable to load @@ -4166,7 +4170,7 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest - + No Named Page This is displayed in the window title, when a blank tab is opened. Leere Seite @@ -4177,8 +4181,8 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Aktuell sind %1 Tabs geöffnet - - + + New tab Neuer Tab @@ -4355,62 +4359,62 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Laden... - + Open link in new &tab Link in neuem &Tab öffnen - + Open link in new &window Link in neuem &Fenster öffnen - + B&ookmark link &Lesezeichen für diesen Link hinzufügen - + &Save link as... &Ziel speichern unter... - + &Copy link address Lin&k-Adresse kopieren - + Show i&mage G&rafik anzeigen - + Copy im&age Grafik k&opieren - + Copy image ad&dress Grafika&dresse kopieren - + S&top S&topp - + Show info ab&out site S&eiteninformationen anzeigen - + Show Web &Inspector Web &Inspector anzeigen - + &Save image as... Grafik speichern &unter... @@ -4420,69 +4424,69 @@ Nachdem Speicherpfade hinzugefügt oder gelöscht wurden, muss QupZilla neu gest Seite konnte nicht geladen werden - + &Back &Zurück - + &Forward &Vor - + &Reload &Neu laden - + Book&mark page &Lesezeichen für diese Seite hinzufügen - + &Save page as... Seite speichern &unter... - + Select &all Alles au&swählen - + Show so&urce code Seitenquelltext &anzeigen - + Search "%1 .." with %2 Suche "%1 .." mit %2 - + No Named Page Leere Seite - - - + + + New tab Neuer Tab - + Send link... Link senden... - + Send image... Grafik senden... - + Send page... Seite senden... diff --git a/translations/empty.ts b/translations/empty.ts index c68040047..6eefdf867 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -3064,210 +3064,210 @@ - - + + Report Issue - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: - + Your E-mail - + Issue type - + Issue description - + Send - - E-mail is optional - - - - + Please fill all required fields! - + Start Page - + Google Search - + Search results provided by Google - - - + + + About QupZilla - + Informations about version - + Browser Identification - + Paths - + Copyright - + Version - + WebKit version - + Build time - + Platform - + Profile - + Settings - + Saved session - + Pinned tabs - + Data - + Themes - + Plugins - + Translations - + Main developer - + Contributors - + Translators - + Speed Dial - + Add New Page - + Apply - + Load title from page - + Edit - + Remove - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + Reload - + Url - + Title - + New Page @@ -3975,7 +3975,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load @@ -4078,7 +4078,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + No Named Page @@ -4088,8 +4088,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - + + New tab @@ -4270,129 +4270,129 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - - - + + + New tab - + Open link in new &tab - + Open link in new &window - + B&ookmark link - + &Save link as... - + Send link... - + &Copy link address - + Show i&mage - + Copy im&age - + Copy image ad&dress - + &Save image as... - + Send image... - + &Back - + &Forward - + &Reload - + S&top - + Book&mark page - + &Save page as... - + Send page... - + Select &all - + Show so&urce code - + Show info ab&out site - + Show Web &Inspector - + Search "%1 .." with %2 - + No Named Page diff --git a/translations/es_ES.ts b/translations/es_ES.ts index 968c2cf08..5c1de5dd8 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -3147,210 +3147,214 @@ No encontrado - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: Si experimenta problemas con QupZilla, por favor intente deshabilitar todos los plugins. <br/>Si esto no ayuda, entonces rellene este formulario: - + Your E-mail Su correo electrónico - + Issue type Tipo de error - - + + Report Issue Informar de un fallo - + Issue description Descripción del error - + Send Enviar - E-mail is optional - El correo electrónico es opcional + El correo electrónico es opcional - + Please fill all required fields! ¡Por favor rellene todos los campos requeridos! - + Start Page Página de inicio - + Google Search Búsqueda Google - + Search results provided by Google Buscar resultados proporcionados por Google - - - + + + About QupZilla Acerca de QupZilla - + Informations about version Información acerca de la versión - + Browser Identification Identificación del navegador - + Paths Rutas - + Copyright Copyright - + Version Versión - + WebKit version Versión WebKit - + Build time Fecha de compilación - + Platform Plataforma - + Profile Perfil - + Settings Preferencias - + Saved session Sesión guardada - + Pinned tabs Pestañas fijas - + Data Datos - + Themes Temas - + Plugins Plugins - + Translations Traducciones - + Main developer Desarrollador principal - + Contributors Contribuidores - + Translators Traductores - + Speed Dial Speed Dial - + Add New Page Añadir página nueva - + Apply - + Load title from page - + Edit Editar - + Remove Eliminar - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + Reload Recargar - + Url Dirección - + Title Nombre - + New Page Página nueva @@ -4060,7 +4064,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup SpeedDial - + Unable to load @@ -4163,7 +4167,7 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup - + No Named Page Página sin nombre @@ -4173,8 +4177,8 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup Actualmente tiene %1 pestañas abiertas - - + + New tab Nueva pestaña @@ -4356,129 +4360,129 @@ Después de añadir o eliminar rutas de certificados, es necesario reiniciar Qup Cargando... - - - + + + New tab Nueva pestaña - + Open link in new &tab Abrir enlace en una nueva &pestaña - + Open link in new &window Abrir enlace en una nueva &ventana - + B&ookmark link Añadir enlace a &marcadores - + &Save link as... &Guardar enlace como... - + Send link... Enviar enlace... - + &Copy link address Copi&ar la ruta del enlace - + Show i&mage &Mostrar imágen - + Copy im&age Copiar &imágen - + Copy image ad&dress C&opiar la ruta de la imágen - + &Save image as... &Guardar imágen como... - + Send image... Enviar imágen... - + &Back &Anterior - + &Forward &Siguiente - + &Reload &Recargar - + S&top &Detener - + Book&mark page Añadir esta página a &marcadores - + &Save page as... &Guardar como... - + Send page... Enviar página... - + Select &all Seleccionar &todo - + Show so&urce code Ver código &fuente de la página - + Show info ab&out site Ver &información de la página - + Show Web &Inspector Ver Inspector &Web - + Search "%1 .." with %2 Buscar "%1 .." con %2 - + No Named Page Página en blanco diff --git a/translations/it_IT.ts b/translations/it_IT.ts index e7ca61b49..9613c7a91 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -3142,210 +3142,214 @@ Non Trovato - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: Se si verificano problemi con QupZilla, prova per prima cosa a disabilitare tutti i plugin. <br/>Se non ti aiuta puoi compilare questo modulo: - + Your E-mail La tua E-mail - + Issue type Tipo di problema - - + + Report Issue Riporta problema - + Issue description Descrizione problema - + Send Invia - E-mail is optional - L'e-mail è opziomale + L'e-mail è opziomale - + Please fill all required fields! Si prega di compilare tutti i campi obbligatori! - + Start Page Avvia Pagina - + Google Search Cerca con Google - + Search results provided by Google Risultato della ricerca fornito da Google - - - + + + About QupZilla Informazioni su QupZilla - + Informations about version Informazioni sulla versione - + Browser Identification Identificazione Browser - + Paths Percorsi - + Copyright Copyright - + Version Versione - + WebKit version Versione WebKit - + Build time Rilascio versione - + Platform Piattaforma - + Profile Profilo - + Settings Impostazioni - + Saved session Salva Sessione - + Pinned tabs Segna scheda - + Data Dati - + Themes Temi - + Plugins Plugins - + Translations Traduzioni - + Main developer Sviluppatore principale - + Contributors Collaboratori - + Translators Traduttori - + Speed Dial - + Add New Page - + Apply - + Load title from page - + Edit Modifica - + Remove - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + Reload Ricarica - + Url - + Title Titolo - + New Page @@ -4055,7 +4059,7 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari SpeedDial - + Unable to load @@ -4158,7 +4162,7 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari - + No Named Page Pagina Senza Nome @@ -4168,8 +4172,8 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari Attualmente hai %1 schede aperte - - + + New tab Nuova scheda @@ -4352,129 +4356,129 @@ Dopo l'aggiunta o la rimozione dei percorsi di certificazione, è necessari Caricamento... - - - + + + New tab Nuova scheda - + Open link in new &tab Apri il link in una nuova &scheda - + Open link in new &window Apri il link in una nuova &finestra - + B&ookmark link &Aggiungi il link ai segnalibri - + &Save link as... &Salva il link come... - + Send link... Invia link... - + &Copy link address &Copia indirizzo link - + Show i&mage Mostra imma&gine - + Copy im&age Copia im&magine - + Copy image ad&dress Copia indiri&zzo immagine - + &Save image as... &Salva immagine come... - + Send image... Invia immagine... - + &Back &Indietro - + &Forward &Avanti - + &Reload &Ricarica - + S&top S&top - + Book&mark page Aggi&ungi la pagina ai Segnalibri - + &Save page as... Sa&lva pagina come... - + Send page... Invia pagina... - + Select &all Seleziona &tutto - + Show so&urce code Mostra codice so&rgente - + Show info ab&out site Mostra info su&l sito - + Show Web &Inspector Mostra Is&pettore Web - + Search "%1 .." with %2 Cerca "%1 .." con %2 - + No Named Page Pagina Senza Nome diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 8166400fb..85af758f9 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -3150,210 +3150,214 @@ werd niet gevonden! Niet gevonden - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: Indien u problemen ervaart met QupZilla, probeer dan eerst om alle plugins uit te schakelen. <br/>Mocht dat niet helpen, vul dan dit formulier in: - + Your E-mail Uw e-mailadres - + Issue type Probleemtype - - + + Report Issue Rapporteer probleem - + Issue description Probleembeschrijving - + Send Verzenden - E-mail is optional - E-mailadres is optioneel + E-mailadres is optioneel - + Please fill all required fields! Vul alstublieft alle benodigde velden in! - + Start Page Startpagina - + Google Search Google Zoeken - + Search results provided by Google Zoekresultaten gebracht door Google - - - + + + About QupZilla Over QupZilla - + Informations about version Informatie over versie - + Browser Identification Browser-identificatie - + Paths Paden - + Copyright Copyright - + Version Versie - + WebKit version WebKit-versie - + Build time Bouwtijd - + Platform Platform - + Profile Profiel - + Settings Instellingen - + Saved session Opgeslagen sessie - + Pinned tabs Vastgepinde tabbladen - + Data Data - + Themes Thema's - + Plugins Plugins - + Translations Vertalingen - + Main developer Hoofdontwikkelaar - + Contributors Bijdragers - + Translators Vertalers - + Speed Dial Speed Dial - + Add New Page Voeg nieuwe pagina toe - + Apply - + Load title from page - + Edit Bewerk - + Remove Verwijder - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + Reload Herlaad - + Url URL - + Title Titel - + New Page Nieuwe pagina @@ -4064,7 +4068,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te SpeedDial - + Unable to load @@ -4167,7 +4171,7 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te - + No Named Page Niet-benoemde pagina @@ -4177,8 +4181,8 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Eigenlijk heeft U %1 geopende tabbladen - - + + New tab Nieuw tabblad @@ -4355,62 +4359,62 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Bezig met laden... - + Open link in new &tab Open link in nieuw &tabblad - + Open link in new &window Open link in nieuw &venster - + B&ookmark link B&ladwijzer link - + &Save link as... &Sla link op als... - + &Copy link address &Kopieer linkadres - + Show i&mage Toon af&beelding - + Copy im&age &Kopieer afbeelding - + Copy image ad&dress Kopieer af&beeldingsadres - + S&top &Stop - + Show info ab&out site Toon info &over site - + Show Web &Inspector Toon Web-&inspecteur - + &Save image as... &Sla afbeelding op als... @@ -4420,69 +4424,69 @@ Na het toevoegen of verwijderen van paden, is het noodzakelijk om de browser te Mislukt om pagina te laden - + &Back &Terug - + &Forward &Vooruit - + &Reload &Herlaad - + Book&mark page &Bladwijzer pagina - + &Save page as... &Sla pagina op als... - + Select &all &Selecteer alles - + Show so&urce code &Toon broncode - + Search "%1 .." with %2 Zoek "%1 .." met %2 - + No Named Page Niet benoemde pagina - - - + + + New tab Nieuw tabblad - + Send link... Verstuur link... - + Send image... Verstuur afbeelding... - + Send page... Odeslat stránku... diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index ab75af69e..bacefac78 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -3274,12 +3274,12 @@ p, li { white-space: pre-wrap; } Jeśli doświadczasz problemów z QupZillą, proszę spróbuj najpierw wyłączyć wszystkie dodatki. <br/> Jeżeli to nie pomogło, prosze wypełnij ten formularz: - + Your E-mail Twoj E-mail - + Issue type Typ błędu @@ -3300,200 +3300,204 @@ p, li { white-space: pre-wrap; } Wysoki - - + + Report Issue - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: - + Issue description Opis błędu - + Send Wyślij - E-mail is optional - E-mail jest opcjonalny + E-mail jest opcjonalny - + Please fill all required fields! PProszę wypełnić wszystkie wymagane pola! - + Start Page Strona startowa - + Google Search Wyszukaj w Google - + Search results provided by Google Pokaż wyniki wyszukiwania w Google - - - + + + About QupZilla O QupZilli - + Informations about version Informacje o wersji - + Browser Identification IIdentyfikacja przeglądarki - + Paths Ścieżki - + Copyright Prawa autorskie - + Version Wersja - + WebKit version Wersja WebKit - + Build time Zbudowana - + Platform Platforma - + Profile - + Settings Ustawienia - + Saved session Zapisana sesja - + Pinned tabs Przypięta zakładka - + Data - + Themes Motywy - + Plugins Dodatki - + Translations Tłumaczenia - + Main developer - + Contributors - + Translators - + Speed Dial - + Add New Page - + Apply - + Load title from page - + Edit Edytuj - + Remove Usuń - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + Reload Odświerz - + Url Adres - + Title - + New Page @@ -4242,7 +4246,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load @@ -4345,7 +4349,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + No Named Page Strona bez nazwy @@ -4359,8 +4363,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Aktualnie masz %1 otwartych kart - - + + New tab Nowa karta @@ -4541,57 +4545,57 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Ładowanie... - + Open link in new &tab Otwórz link w &nowej karcie - + Open link in new &window Otwórz link w nowym &oknie - + B&ookmark link Dodaj link do &zakładek - + &Save link as... &Zapisz link jako... - + &Copy link address &Kopiuj adres linku - + Show i&mage Pokaż &obrazek - + Copy im&age &Kopiuj obraz - + Copy image ad&dress kopiuj adres& obrazka - + S&top &Zatrzymaj - + Show info ab&out site Pokaż &informacje o stronie - + Show Web &Inspector Pokaż Web Inspe&ktora @@ -4600,7 +4604,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Szukaj "%1 .." w &Google - + &Save image as... &Zapisz obrazek jako... @@ -4610,69 +4614,69 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla Błąd ładowania strony - + &Back &Cofnij - + &Forward &Dalej - + &Reload &Odśwież - + Book&mark page Dodaj&stronę do zakładek - + &Save page as... &Zapisz stronę jako... - + Select &all Zaznacz &wszystko - + Show so&urce code Pokaż kod żródłowy - + Search "%1 .." with %2 - + No Named Page Strona bez nazwy - - - + + + New tab Nowa karta - + Send link... Wyślij link... - + Send image... Wyślij obrazek... - + Send page... Wyślij stronę... diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index 99d67f70c..3ddaa3f94 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -2644,7 +2644,7 @@ E-mail is optional - E-mail je nepovinný + E-mail je nepovinný If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: @@ -2658,6 +2658,10 @@ Load title from page Načítať názov zo stránky + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + RSSManager diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 451828e4b..c300d4124 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -3145,210 +3145,214 @@ 未找到 - + If you are experiencing problems with QupZilla, please try first disable all plugins. <br/>If it won't help, then please fill this form: 如果您的QupZilla遇到问题，请首先尝试禁用所有插件。 <br/>如果没有帮助，那么请填写此表格： - + Your E-mail 您的电子信箱 - + Issue type 问题类型 - - + + Report Issue 报告问题 - + Issue description 问题描述 - + Send 发送 - E-mail is optional - 可选的E - mail + 可选的E - mail - + Please fill all required fields! 请填写所有必填字段！ - + Start Page 起始页 - + Google Search 谷歌搜索 - + Search results provided by Google 由Google提供的搜索结果 - - - + + + About QupZilla 关于 QupZilla - + Informations about version 版本信息 - + Browser Identification 浏览器标识 - + Paths 路径 - + Copyright 版权所有 - + Version 版本 - + WebKit version Webkit版本 - + Build time 构建时间 - + Platform 平台 - + Profile 配置文件 - + Settings 设置 - + Saved session 保存的会话 - + Pinned tabs 固定选项卡 - + Data 数据 - + Themes 主题 - + Plugins 插件 - + Translations 翻译 - + Main developer 主要开发者 - + Contributors 贡献者 - + Translators 翻译 - + Speed Dial 快速拨号 - + Add New Page 添加新网页 - + Apply - + Load title from page - + Edit 编辑 - + Remove 删除 - + + E-mail is optional<br/><b>Note: </b>Please use English language only. + + + + Reload 刷新 - + Url 地址 - + Title 标题 - + New Page 新网页 @@ -4056,7 +4060,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla SpeedDial - + Unable to load @@ -4159,7 +4163,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla - + No Named Page 无命名页面 @@ -4169,8 +4173,8 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla 你已有%1打开的标签 - - + + New tab 新标签 @@ -4351,129 +4355,129 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla 载入中... - - - + + + New tab 新标签 - + Open link in new &tab 在新标签中打开链接&t - + Open link in new &window 在新窗口中打开链接&w - + B&ookmark link 书签链接&o - + &Save link as... 链接另存为&S... - + Send link... 发送链接... - + &Copy link address 复制链接地址&C - + Show i&mage 显示图像&m - + Copy im&age 复制图像&a - + Copy image ad&dress 复制图像地址&d - + &Save image as... 图像另存为&S... - + Send image... 发送图像... - + &Back 后退&B - + &Forward 前进&F - + &Reload 刷新&R - + S&top 停止&t - + Book&mark page 加入书签&m - + &Save page as... 保存网页为&S... - + Send page... 发送网页... - + Select &all 选取所有&a - + Show so&urce code 显示源代码&u - + Show info ab&out site 显示有关网站的信息&o - + Show Web &Inspector 显示Web及督察&I - + Search "%1 .." with %2 使用 %2搜索"%1 .." - + No Named Page 无命名页面