Updated translations.

BUILDING

@@ -60,7 +60,7 @@ Available Defines
     $ export NAME="value"
 
  General:
-     PORTABLE_BUILD       QupZilla won't write any data outside of path of exection.
+   PORTABLE_BUILD         QupZilla won't write any data outside of path of exection.
                           It will also disable plugins by default.
                           (disabled by default)
                           
@@ -68,7 +68,7 @@ Available Defines
                           $ export PORTABLE_BUILD="true"
                           
                           
-     USE_WEBGL            Enable WebGL. You need to build QupZilla with WebKit built
+   USE_WEBGL              Enable WebGL. You need to build QupZilla with WebKit built
                           with WebGL support, otherwise you won't be able to compile
                           without errors.
                           (disabled by default)
@@ -76,6 +76,20 @@ Available Defines
                           example:
                           $ export USE_WEBGL="true"
 
+   NONBLOCK_JS_DIALOGS    Enable non-blocking JavaScript dialogs from alert() prompt()
+                          and confirm() functions. They are shown inside page and are not 
+                          blocking application window.
+                          However, due to synchronous API, there is a possible crash when 
+                          closing browser windows with opened dialogs.
+                          If you can take this risk and/or make sure you aren't closing browser
+                          with opened dialogs, you may enable this option.
+                          These dialogs are much more beautiful than normal QDialogs.
+                          (disabled by default)
+                          
+                          example:
+                          $ export NONBLOCK_JS_DIALOGS="true"                          
+                          
+                       
  Windows specific defines:
  
      W7API                Enable Windows 7 API support

src/data/icons.qrc

@@ -49,7 +49,6 @@
         <file>icons/exeicons/qupzilla64.png</file>
         <file>icons/exeicons/qupzilla128.png</file>
         <file>icons/exeicons/qupzilla256.png</file>
-        <file>icons/menu/informations.png</file>
         <file>icons/faenza/user-bookmarks.png</file>
         <file>icons/other/adblock-disabled.png</file>
         <file>icons/menu/search-icon.png</file>

src/webview/popupwebview.cpp

@@ -0,0 +1,183 @@
+#include "popupwebview.h"
+#include "popupwebpage.h"
+#include "mainapplication.h"
+#include "iconprovider.h"
+
+PopupWebView::PopupWebView(QWidget* parent)
+    : WebView(parent)
+    , m_page(0)
+    , m_clickedFrame(0)
+    , m_menu(new QMenu(this))
+{
+}
+
+void PopupWebView::setWebPage(PopupWebPage* page)
+{
+    if (m_page == page) {
+        return;
+    }
+
+    if (m_page) {
+        delete m_page;
+        m_page = 0;
+    }
+
+    m_page = page;
+    m_page->setParent(this);
+    setPage(m_page);
+
+    // Set default zoom
+    setZoom(mApp->defaultZoom());
+}
+
+PopupWebPage* PopupWebView::webPage()
+{
+    return m_page;
+}
+
+QWidget* PopupWebView::overlayForJsAlert()
+{
+    return this;
+}
+
+void PopupWebView::closeView()
+{
+    parentWidget()->close();
+}
+
+void PopupWebView::contextMenuEvent(QContextMenuEvent *event)
+{
+    m_menu->clear();
+    m_clickedFrame = 0;
+
+    QWebFrame* frameAtPos = page()->frameAt(event->pos());
+    QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());
+
+    if (!r.linkUrl().isEmpty() && r.linkUrl().scheme() != "javascript") {
+        if (page()->selectedText() == r.linkText()) {
+            findText("");
+        }
+        m_menu->addAction(tr("Open link in new &window"), this, SLOT(openUrlInNewWindow()))->setData(r.linkUrl());
+        m_menu->addSeparator();
+        m_menu->addAction(QIcon::fromTheme("document-save"), tr("&Save link as..."), this, SLOT(downloadLinkToDisk()))->setData(r.linkUrl());
+        m_menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send link..."), this, SLOT(sendLinkByMail()))->setData(r.linkUrl());
+        m_menu->addAction(QIcon::fromTheme("edit-copy"), tr("&Copy link address"), this, SLOT(copyLinkToClipboard()))->setData(r.linkUrl());
+        m_menu->addSeparator();
+        if (!selectedText().isEmpty()) {
+            m_menu->addAction(pageAction(QWebPage::Copy));
+        }
+    }
+
+    if (!r.imageUrl().isEmpty()) {
+        if (!m_menu->isEmpty()) {
+            m_menu->addSeparator();
+        }
+        m_menu->addAction(tr("Show i&mage"), this, SLOT(openActionUrl()))->setData(r.imageUrl());
+        m_menu->addAction(tr("Copy im&age"), this, SLOT(copyImageToClipboard()))->setData(r.imageUrl());
+        m_menu->addAction(QIcon::fromTheme("edit-copy"), tr("Copy image ad&dress"), this, SLOT(copyLinkToClipboard()))->setData(r.imageUrl());
+        m_menu->addSeparator();
+        m_menu->addAction(QIcon::fromTheme("document-save"), tr("&Save image as..."), this, SLOT(downloadLinkToDisk()))->setData(r.imageUrl());
+        m_menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send image..."), this, SLOT(sendLinkByMail()))->setData(r.imageUrl());
+        m_menu->addSeparator();
+        //menu->addAction(tr("Block image"), this, SLOT(blockImage()))->setData(r.imageUrl().toString());
+        if (!selectedText().isEmpty()) {
+            m_menu->addAction(pageAction(QWebPage::Copy));
+        }
+    }
+
+    QWebElement element = r.element();
+    if (!element.isNull() && (element.tagName().toLower() == "input" || element.tagName().toLower() == "textarea" ||
+                              element.tagName().toLower() == "video" || element.tagName().toLower() == "audio")) {
+        if (m_menu->isEmpty()) {
+            page()->createStandardContextMenu()->popup(QCursor::pos());
+            return;
+        }
+    }
+
+    if (m_menu->isEmpty() && selectedText().isEmpty()) {
+        QAction* action = m_menu->addAction(tr("&Back"), this, SLOT(back()));
+        action->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowBack));
+        action->setEnabled(history()->canGoBack());
+
+        action = m_menu->addAction(tr("&Forward"), this, SLOT(forward()));
+        action->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowForward));
+        action->setEnabled(history()->canGoForward());
+
+        m_menu->addAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this, SLOT(reload()));
+        action = m_menu->addAction(IconProvider::standardIcon(QStyle::SP_BrowserStop), tr("S&top"), this, SLOT(stop()));
+        action->setEnabled(isLoading());
+        m_menu->addSeparator();
+
+        if (frameAtPos && page()->mainFrame() != frameAtPos) {
+            m_clickedFrame = frameAtPos;
+            QMenu* menu = new QMenu(tr("This frame"));
+            menu->addAction(tr("Show &only this frame"), this, SLOT(loadClickedFrame()));
+            menu->addSeparator();
+            menu->addAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this, SLOT(reloadClickedFrame()));
+            menu->addAction(QIcon::fromTheme("document-print"), tr("Print frame"), this, SLOT(printClickedFrame()));
+            menu->addSeparator();
+            menu->addAction(QIcon::fromTheme("zoom-in"), tr("Zoom &in"), this, SLOT(clickedFrameZoomIn()));
+            menu->addAction(QIcon::fromTheme("zoom-out"), tr("&Zoom out"), this, SLOT(clickedFrameZoomOut()));
+            menu->addAction(QIcon::fromTheme("zoom-original"), tr("Reset"), this, SLOT(clickedFrameZoomReset()));
+            menu->addSeparator();
+            menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce of frame"), this, SLOT(showClickedFrameSource()));
+
+            m_menu->addMenu(menu);
+        }
+
+        m_menu->addSeparator();
+        m_menu->addAction(QIcon::fromTheme("document-save"), tr("&Save page as..."), this, SLOT(downloadLinkToDisk()))->setData(url());
+        m_menu->addAction(QIcon::fromTheme("edit-copy"), tr("&Copy page link"), this, SLOT(copyLinkToClipboard()))->setData(url());
+        m_menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send page link..."), this, SLOT(sendLinkByMail()))->setData(url());
+        m_menu->addAction(QIcon::fromTheme("document-print"), tr("&Print page"), this, SLOT(printPage()));
+        m_menu->addSeparator();
+        m_menu->addAction(QIcon::fromTheme("edit-select-all"), tr("Select &all"), this, SLOT(selectAll()));
+        m_menu->addSeparator();
+        m_menu->addAction(QIcon::fromTheme("text-html"), tr("Show so&urce code"), this, SLOT(showSource()));
+        m_menu->addSeparator();
+        m_menu->addAction(QIcon::fromTheme("dialog-information"), tr("Show info ab&out site"), this, SLOT(showSiteInfo()));
+    }
+
+    if (!selectedText().isEmpty()) {
+        QString selectedText = page()->selectedText();
+
+        m_menu->addAction(pageAction(QWebPage::Copy));
+        m_menu->addAction(QIcon::fromTheme("mail-message-new"), tr("Send text..."), this, SLOT(sendLinkByMail()))->setData(selectedText);
+        m_menu->addSeparator();
+
+        QString langCode = mApp->getActiveLanguage().left(2);
+        QUrl googleTranslateUrl = QUrl(QString("http://translate.google.com/#auto|%1|%2").arg(langCode, selectedText));
+        m_menu->addAction(QIcon(":icons/menu/translate.png"), tr("Google Translate"), this, SLOT(openActionUrl()))->setData(googleTranslateUrl);
+        m_menu->addAction(tr("Dictionary"), this, SLOT(openActionUrl()))->setData("http://" + (langCode != "" ? langCode + "." : langCode) + "wiktionary.org/wiki/Special:Search?search=" + selectedText);
+        m_menu->addSeparator();
+
+        QString selectedString = selectedText.trimmed();
+        if (!selectedString.contains(".")) {
+            // Try to add .com
+            selectedString.append(".com");
+        }
+        QUrl guessedUrl = QUrl::fromUserInput(selectedString);
+
+        if (isUrlValid(guessedUrl)) {
+            m_menu->addAction(QIcon(":/icons/menu/popup.png"), tr("Go to &web address"), this, SLOT(openActionUrl()))->setData(guessedUrl);
+        }
+    }
+
+#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
+//    still bugged? in 4.8 RC (it shows selection of webkit's internal source, not html from page)
+//    it may or may not be bug, but this implementation is useless for us
+//
+//    if (!selectedHtml().isEmpty())
+//        menu->addAction(tr("Show source of selection"), this, SLOT(showSourceOfSelection()));
+#endif
+
+    if (!m_menu->isEmpty()) {
+        //Prevent choosing first option with double rightclick
+        QPoint pos = QCursor::pos();
+        QPoint p(pos.x(), pos.y() + 1);
+        m_menu->popup(p);
+        return;
+    }
+
+    WebView::contextMenuEvent(event);
+}

src/webview/popupwebview.h

@@ -0,0 +1,35 @@
+#ifndef POPUPWEBVIEW_H
+#define POPUPWEBVIEW_H
+
+#include <QMenu>
+
+#include "webview.h"
+
+class PopupWebPage;
+class PopupWebView : public WebView
+{
+    Q_OBJECT
+public:
+    explicit PopupWebView(QWidget* parent = 0);
+
+    void setWebPage(PopupWebPage* page);
+    PopupWebPage* webPage();
+
+    QWidget* overlayForJsAlert();
+
+signals:
+
+public slots:
+    void closeView();
+
+private slots:
+
+private:
+    void contextMenuEvent(QContextMenuEvent* event);
+
+    PopupWebPage* m_page;
+    QWebFrame* m_clickedFrame;
+    QMenu* m_menu;
+};
+
+#endif // POPUPWEBVIEW_H

translations/sk_SK.ts

@@ -374,6 +374,26 @@
         <source>Please press Finish to complete importing process.</source>
         <translation>Prosím stlačte Dokončiť pre dokončenie importu.</translation>
     </message>
+    <message>
+        <source>No Error</source>
+        <translation type="unfinished">Žiadna chyba</translation>
+    </message>
+    <message>
+        <source>Unable to open file.</source>
+        <translation type="unfinished">Nepodarilo sa otvoriť súbor.</translation>
+    </message>
+    <message>
+        <source>Cannot evaluate JSON code.</source>
+        <translation type="unfinished">Nie je možné spustiť JSON kód.</translation>
+    </message>
+    <message>
+        <source>File does not exists.</source>
+        <translation type="unfinished">Súbor neexistuje.</translation>
+    </message>
+    <message>
+        <source>Unable to open database. Is Firefox running?</source>
+        <translation type="unfinished">Nepodarilo sa otvoriť databázu. Je Firefox zapnutý?</translation>
+    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -677,7 +697,7 @@
     </message>
     <message>
         <source>&lt;not set in certificate&gt;</source>
-        <translation>&lt;nie je súčasťou certifikátu&gt;</translation>
+        <translation type="obsolete">&lt;nie je súčasťou certifikátu&gt;</translation>
     </message>
     <message>
         <source>Organizational Unit (OU):</source>
@@ -700,15 +720,15 @@
     <name>ChromeImporter</name>
     <message>
         <source>No Error</source>
-        <translation>Žiadna chyba</translation>
+        <translation type="obsolete">Žiadna chyba</translation>
     </message>
     <message>
         <source>Cannot evaluate JSON code.</source>
-        <translation>Nie je možné spustiť JSON kód.</translation>
+        <translation type="obsolete">Nie je možné spustiť JSON kód.</translation>
     </message>
     <message>
         <source>Unable to open file.</source>
-        <translation>Nepodarilo sa otvoriť súbor.</translation>
+        <translation type="obsolete">Nepodarilo sa otvoriť súbor.</translation>
     </message>
 </context>
 <context>
@@ -774,11 +794,11 @@
     </message>
     <message>
         <source>No more informations available.</source>
-        <translation>Žiadne ďalšie dostupné informácie.</translation>
+        <translation type="obsolete">Žiadne ďalšie dostupné informácie.</translation>
     </message>
     <message>
         <source>Show more informations about object</source>
-        <translation>Zobraziť viac informácií o objekte</translation>
+        <translation type="obsolete">Zobraziť viac informácií o objekte</translation>
     </message>
     <message>
         <source>&lt;b&gt;Value&lt;/b&gt;</source>
@@ -796,6 +816,14 @@
         <source>Delete object</source>
         <translation>Vymazať objekt</translation>
     </message>
+    <message>
+        <source>Show more information about object</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No more information available.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CloseDialog</name>
@@ -899,7 +927,7 @@
     <name>DesktopNotificationsFactory</name>
     <message>
         <source>Native System Notification</source>
-        <translation>Nativné systémové oznámenie</translation>
+        <translation type="obsolete">Nativné systémové oznámenie</translation>
     </message>
 </context>
 <context>
@@ -1129,15 +1157,15 @@
     <name>FirefoxImporter</name>
     <message>
         <source>No Error</source>
-        <translation>Žiadna chyba</translation>
+        <translation type="obsolete">Žiadna chyba</translation>
     </message>
     <message>
         <source>Unable to open database. Is Firefox running?</source>
-        <translation>Nepodarilo sa otvoriť databázu. Je Firefox zapnutý?</translation>
+        <translation type="obsolete">Nepodarilo sa otvoriť databázu. Je Firefox zapnutý?</translation>
     </message>
     <message>
         <source>File does not exists.</source>
-        <translation>Súbor neexistuje.</translation>
+        <translation type="obsolete">Súbor neexistuje.</translation>
     </message>
 </context>
 <context>
@@ -1305,11 +1333,11 @@
     <name>HtmlImporter</name>
     <message>
         <source>No Error</source>
-        <translation>Žiadna chyba</translation>
+        <translation type="obsolete">Žiadna chyba</translation>
     </message>
     <message>
         <source>Unable to open file.</source>
-        <translation>Nepodarilo sa otvoriť súbor.</translation>
+        <translation type="obsolete">Nepodarilo sa otvoriť súbor.</translation>
     </message>
 </context>
 <context>
@@ -1335,6 +1363,10 @@
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show information about this page</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MainApplication</name>
@@ -1445,11 +1477,11 @@
     <name>OperaImporter</name>
     <message>
         <source>No Error</source>
-        <translation>Žiadna chyba</translation>
+        <translation type="obsolete">Žiadna chyba</translation>
     </message>
     <message>
         <source>Unable to open file.</source>
-        <translation>Nepodarilo sa otvoriť súbor.</translation>
+        <translation type="obsolete">Nepodarilo sa otvoriť súbor.</translation>
     </message>
 </context>
 <context>
@@ -1522,6 +1554,140 @@
         <translation>WebKit pluginy</translation>
     </message>
 </context>
+<context>
+    <name>PopupWebView</name>
+    <message>
+        <source>Open link in new &amp;window</source>
+        <translation type="unfinished">Otvoriť odkaz v novom &amp;okne</translation>
+    </message>
+    <message>
+        <source>&amp;Save link as...</source>
+        <translation type="unfinished">&amp;Uložiť odkaz ako...</translation>
+    </message>
+    <message>
+        <source>Send link...</source>
+        <translation type="unfinished">Odoslať odkaz...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy link address</source>
+        <translation type="unfinished">&amp;Kopírovať adresu odkazu</translation>
+    </message>
+    <message>
+        <source>Show i&amp;mage</source>
+        <translation type="unfinished">Zobraziť o&amp;brázok</translation>
+    </message>
+    <message>
+        <source>Copy im&amp;age</source>
+        <translation type="unfinished">Kopírov&amp;ať obrázok</translation>
+    </message>
+    <message>
+        <source>Copy image ad&amp;dress</source>
+        <translation type="unfinished">Kopírovať a&amp;dresu obrázku</translation>
+    </message>
+    <message>
+        <source>&amp;Save image as...</source>
+        <translation type="unfinished">&amp;Uložiť obrázok ako...</translation>
+    </message>
+    <message>
+        <source>Send image...</source>
+        <translation type="unfinished">Odoslať obrázok...</translation>
+    </message>
+    <message>
+        <source>&amp;Back</source>
+        <translation type="unfinished">&amp;Späť</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished">&amp;Dopredu</translation>
+    </message>
+    <message>
+        <source>&amp;Reload</source>
+        <translation type="unfinished">&amp;Obnoviť</translation>
+    </message>
+    <message>
+        <source>S&amp;top</source>
+        <translation type="unfinished">Zas&amp;taviť</translation>
+    </message>
+    <message>
+        <source>This frame</source>
+        <translation type="unfinished">Tento rám</translation>
+    </message>
+    <message>
+        <source>Show &amp;only this frame</source>
+        <translation type="unfinished">Zobraziť &amp;len tento rám</translation>
+    </message>
+    <message>
+        <source>Print frame</source>
+        <translation type="unfinished">Vytlačiť rám</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;in</source>
+        <translation type="unfinished">Zoo&amp;m +</translation>
+    </message>
+    <message>
+        <source>&amp;Zoom out</source>
+        <translation type="unfinished">Z&amp;oom -</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished">Resetovať</translation>
+    </message>
+    <message>
+        <source>Show so&amp;urce of frame</source>
+        <translation type="unfinished">Zobraziť &amp;zdrojový kód rámu</translation>
+    </message>
+    <message>
+        <source>&amp;Save page as...</source>
+        <translation type="unfinished">Uložiť &amp;stránku ako...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy page link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send page link...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select &amp;all</source>
+        <translation type="unfinished">Vybr&amp;ať všetko</translation>
+    </message>
+    <message>
+        <source>Show so&amp;urce code</source>
+        <translation type="unfinished">Zobraziť zdro&amp;jový kód</translation>
+    </message>
+    <message>
+        <source>Show info ab&amp;out site</source>
+        <translation type="unfinished">Z&amp;obraziť informácie o stránke</translation>
+    </message>
+    <message>
+        <source>Send text...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Google Translate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to &amp;web address</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PopupWindow</name>
+    <message>
+        <source>%1 - QupZilla</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Preferences</name>
     <message>
@@ -2104,6 +2270,14 @@
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Tento súbor nie je kompatibilný s OpenSearh 1.1.</translation>
     </message>
+    <message>
+        <source>&lt;not set in certificate&gt;</source>
+        <translation type="unfinished">&lt;nie je súčasťou certifikátu&gt;</translation>
+    </message>
+    <message>
+        <source>Native System Notification</source>
+        <translation type="unfinished">Nativné systémové oznámenie</translation>
+    </message>
 </context>
 <context>
     <name>QtWin</name>
@@ -2471,13 +2645,17 @@
         <translation type="unfinished">QupZilla</translation>
     </message>
     <message>
-        <source> - QupZilla</source>
+        <source>Information about application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information about application</source>
+        <source>%1 - QupZilla</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You have successfully added RSS feed &quot;%1&quot;.</source>
+        <translation type="unfinished">Úspešne ste pridali RSS odberl &quot;%1&quot;.</translation>
+    </message>
 </context>
 <context>
     <name>QupZillaSchemeReply</name>
@@ -2543,7 +2721,7 @@
     </message>
     <message>
         <source>Informations about version</source>
-        <translation>Informácie o verzii</translation>
+        <translation type="obsolete">Informácie o verzii</translation>
     </message>
     <message>
         <source>About QupZilla</source>
@@ -2705,6 +2883,10 @@
         <source>Change size of pages:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Information about version</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RSSManager</name>
@@ -2811,7 +2993,7 @@ Prosím pridajte nejaké kliknutím na RSS ikonku v navigačnom paneli na strán
     </message>
     <message>
         <source>You have successfully added RSS feed &quot;%1&quot;.</source>
-        <translation>Úspešne ste pridali RSS odberl &quot;%1&quot;.</translation>
+        <translation type="obsolete">Úspešne ste pridali RSS odberl &quot;%1&quot;.</translation>
     </message>
 </context>
 <context>
@@ -2833,11 +3015,11 @@ Prosím pridajte nejaké kliknutím na RSS ikonku v navigačnom paneli na strán
     <name>ReloadStopButton</name>
     <message>
         <source>Stop</source>
-        <translation>Zastaviť</translation>
+        <translation type="obsolete">Zastaviť</translation>
     </message>
     <message>
         <source>Reload</source>
-        <translation>Obnoviť</translation>
+        <translation type="obsolete">Obnoviť</translation>
     </message>
 </context>
 <context>
@@ -3016,7 +3198,7 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
     <name>SiteIcon</name>
     <message>
         <source>Show informations about this page</source>
-        <translation>Zobraziť informácie o tejto stránke</translation>
+        <translation type="obsolete">Zobraziť informácie o tejto stránke</translation>
     </message>
 </context>
 <context>
@@ -3279,6 +3461,10 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <source>Cannot write to file!</source>
         <translation>Nedá sa zapisovať do súboru!</translation>
     </message>
+    <message>
+        <source>Cannot reload source. Page has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SourceViewerSearch</name>
@@ -3392,6 +3578,173 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <translation>Nepomenovaná tránka</translation>
     </message>
 </context>
+<context>
+    <name>TabbedWebView</name>
+    <message>
+        <source>Failed loading page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - QupZilla</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open link in new &amp;tab</source>
+        <translation type="unfinished">Otvoriť odkaz na &amp;novej karte</translation>
+    </message>
+    <message>
+        <source>Open link in new &amp;window</source>
+        <translation type="unfinished">Otvoriť odkaz v novom &amp;okne</translation>
+    </message>
+    <message>
+        <source>B&amp;ookmark link</source>
+        <translation type="unfinished">Pridať &amp;odkaz do záložiek</translation>
+    </message>
+    <message>
+        <source>&amp;Save link as...</source>
+        <translation type="unfinished">&amp;Uložiť odkaz ako...</translation>
+    </message>
+    <message>
+        <source>Send link...</source>
+        <translation type="unfinished">Odoslať odkaz...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy link address</source>
+        <translation type="unfinished">&amp;Kopírovať adresu odkazu</translation>
+    </message>
+    <message>
+        <source>Show i&amp;mage</source>
+        <translation type="unfinished">Zobraziť o&amp;brázok</translation>
+    </message>
+    <message>
+        <source>Copy im&amp;age</source>
+        <translation type="unfinished">Kopírov&amp;ať obrázok</translation>
+    </message>
+    <message>
+        <source>Copy image ad&amp;dress</source>
+        <translation type="unfinished">Kopírovať a&amp;dresu obrázku</translation>
+    </message>
+    <message>
+        <source>&amp;Save image as...</source>
+        <translation type="unfinished">&amp;Uložiť obrázok ako...</translation>
+    </message>
+    <message>
+        <source>Send image...</source>
+        <translation type="unfinished">Odoslať obrázok...</translation>
+    </message>
+    <message>
+        <source>&amp;Back</source>
+        <translation type="unfinished">&amp;Späť</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished">&amp;Dopredu</translation>
+    </message>
+    <message>
+        <source>&amp;Reload</source>
+        <translation type="unfinished">&amp;Obnoviť</translation>
+    </message>
+    <message>
+        <source>S&amp;top</source>
+        <translation type="unfinished">Zas&amp;taviť</translation>
+    </message>
+    <message>
+        <source>This frame</source>
+        <translation type="unfinished">Tento rám</translation>
+    </message>
+    <message>
+        <source>Show &amp;only this frame</source>
+        <translation type="unfinished">Zobraziť &amp;len tento rám</translation>
+    </message>
+    <message>
+        <source>Show this frame in new &amp;tab</source>
+        <translation type="unfinished">Zobraziť tento rám na &amp;novom panely</translation>
+    </message>
+    <message>
+        <source>Print frame</source>
+        <translation type="unfinished">Vytlačiť rám</translation>
+    </message>
+    <message>
+        <source>Zoom &amp;in</source>
+        <translation type="unfinished">Zoo&amp;m +</translation>
+    </message>
+    <message>
+        <source>&amp;Zoom out</source>
+        <translation type="unfinished">Z&amp;oom -</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="unfinished">Resetovať</translation>
+    </message>
+    <message>
+        <source>Show so&amp;urce of frame</source>
+        <translation type="unfinished">Zobraziť &amp;zdrojový kód rámu</translation>
+    </message>
+    <message>
+        <source>Book&amp;mark page</source>
+        <translation type="unfinished">Pridať s&amp;tránku do záložiek</translation>
+    </message>
+    <message>
+        <source>&amp;Save page as...</source>
+        <translation type="unfinished">Uložiť &amp;stránku ako...</translation>
+    </message>
+    <message>
+        <source>&amp;Copy page link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send page link...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select &amp;all</source>
+        <translation type="unfinished">Vybr&amp;ať všetko</translation>
+    </message>
+    <message>
+        <source>Validate page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show so&amp;urce code</source>
+        <translation type="unfinished">Zobraziť zdro&amp;jový kód</translation>
+    </message>
+    <message>
+        <source>Show Web &amp;Inspector</source>
+        <translation type="unfinished">Zobraziť Web &amp;inšpektora</translation>
+    </message>
+    <message>
+        <source>Show info ab&amp;out site</source>
+        <translation type="unfinished">Z&amp;obraziť informácie o stránke</translation>
+    </message>
+    <message>
+        <source>Send text...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Google Translate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Go to &amp;web address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search &quot;%1 ..&quot; with %2</source>
+        <translation type="unfinished">Hľadať &quot;%1 ..&quot; s %2</translation>
+    </message>
+</context>
 <context>
     <name>ThemeManager</name>
     <message>
@@ -3415,6 +3768,17 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <translation>&lt;b&gt;Popis:&lt;/b&gt;</translation>
     </message>
 </context>
+<context>
+    <name>ToolButton</name>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished">Zastaviť</translation>
+    </message>
+    <message>
+        <source>Reload</source>
+        <translation type="unfinished">Obnoviť</translation>
+    </message>
+</context>
 <context>
     <name>Updater</name>
     <message>
@@ -3537,6 +3901,22 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <source>Content not found</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Select files to upload...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resend request confirmation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prevent this page from creating additional dialogs</source>
+        <translation type="unfinished">Zabrániť tejto stránke vo vytváraní ďalších dialógov</translation>
+    </message>
+    <message>
+        <source>JavaScript alert - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebSearchBar</name>
@@ -3553,23 +3933,23 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
     <name>WebView</name>
     <message>
         <source>&amp;Back</source>
-        <translation>&amp;Späť</translation>
+        <translation type="obsolete">&amp;Späť</translation>
     </message>
     <message>
         <source>&amp;Save image as...</source>
-        <translation>&amp;Uložiť obrázok ako...</translation>
+        <translation type="obsolete">&amp;Uložiť obrázok ako...</translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation>Zas&amp;taviť</translation>
+        <translation type="obsolete">Zas&amp;taviť</translation>
     </message>
     <message>
         <source>&amp;Save link as...</source>
-        <translation>&amp;Uložiť odkaz ako...</translation>
+        <translation type="obsolete">&amp;Uložiť odkaz ako...</translation>
     </message>
     <message>
         <source>&amp;Copy link address</source>
-        <translation>&amp;Kopírovať adresu odkazu</translation>
+        <translation type="obsolete">&amp;Kopírovať adresu odkazu</translation>
     </message>
     <message>
         <source>Send page...</source>
@@ -3581,63 +3961,63 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
     </message>
     <message>
         <source>B&amp;ookmark link</source>
-        <translation>Pridať &amp;odkaz do záložiek</translation>
+        <translation type="obsolete">Pridať &amp;odkaz do záložiek</translation>
     </message>
     <message>
         <source>Copy im&amp;age</source>
-        <translation>Kopírov&amp;ať obrázok</translation>
+        <translation type="obsolete">Kopírov&amp;ať obrázok</translation>
     </message>
     <message>
         <source>Show i&amp;mage</source>
-        <translation>Zobraziť o&amp;brázok</translation>
+        <translation type="obsolete">Zobraziť o&amp;brázok</translation>
     </message>
     <message>
         <source>Send link...</source>
-        <translation>Odoslať odkaz...</translation>
+        <translation type="obsolete">Odoslať odkaz...</translation>
     </message>
     <message>
         <source>Search &quot;%1 ..&quot; with %2</source>
-        <translation>Hľadať &quot;%1 ..&quot; s %2</translation>
+        <translation type="obsolete">Hľadať &quot;%1 ..&quot; s %2</translation>
     </message>
     <message>
         <source>Show Web &amp;Inspector</source>
-        <translation>Zobraziť Web &amp;inšpektora</translation>
+        <translation type="obsolete">Zobraziť Web &amp;inšpektora</translation>
     </message>
     <message>
         <source>Open link in new &amp;window</source>
-        <translation>Otvoriť odkaz v novom &amp;okne</translation>
+        <translation type="obsolete">Otvoriť odkaz v novom &amp;okne</translation>
     </message>
     <message>
         <source>Select &amp;all</source>
-        <translation>Vybr&amp;ať všetko</translation>
+        <translation type="obsolete">Vybr&amp;ať všetko</translation>
     </message>
     <message>
         <source>Send image...</source>
-        <translation>Odoslať obrázok...</translation>
+        <translation type="obsolete">Odoslať obrázok...</translation>
     </message>
     <message>
         <source>Loading...</source>
-        <translation>Načítava sa...</translation>
+        <translation type="obsolete">Načítava sa...</translation>
     </message>
     <message>
         <source>&amp;Save page as...</source>
-        <translation>Uložiť &amp;stránku ako...</translation>
+        <translation type="obsolete">Uložiť &amp;stránku ako...</translation>
     </message>
     <message>
         <source>&amp;Reload</source>
-        <translation>&amp;Obnoviť</translation>
+        <translation type="obsolete">&amp;Obnoviť</translation>
     </message>
     <message>
         <source>Show info ab&amp;out site</source>
-        <translation>Z&amp;obraziť informácie o stránke</translation>
+        <translation type="obsolete">Z&amp;obraziť informácie o stránke</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
-        <translation>&amp;Dopredu</translation>
+        <translation type="obsolete">&amp;Dopredu</translation>
     </message>
     <message>
         <source>Open link in new &amp;tab</source>
-        <translation>Otvoriť odkaz na &amp;novej karte</translation>
+        <translation type="obsolete">Otvoriť odkaz na &amp;novej karte</translation>
     </message>
     <message>
         <source>No Named Page</source>
@@ -3645,87 +4025,51 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
     </message>
     <message>
         <source>Book&amp;mark page</source>
-        <translation>Pridať s&amp;tránku do záložiek</translation>
+        <translation type="obsolete">Pridať s&amp;tránku do záložiek</translation>
     </message>
     <message>
         <source>Show so&amp;urce code</source>
-        <translation>Zobraziť zdro&amp;jový kód</translation>
+        <translation type="obsolete">Zobraziť zdro&amp;jový kód</translation>
     </message>
     <message>
         <source>Failed loading page</source>
-        <translation>Zlyhalo načítanie stránky</translation>
+        <translation type="obsolete">Zlyhalo načítanie stránky</translation>
     </message>
     <message>
         <source>Copy image ad&amp;dress</source>
-        <translation>Kopírovať a&amp;dresu obrázku</translation>
+        <translation type="obsolete">Kopírovať a&amp;dresu obrázku</translation>
     </message>
     <message>
         <source>This frame</source>
-        <translation>Tento rám</translation>
+        <translation type="obsolete">Tento rám</translation>
     </message>
     <message>
         <source>Show &amp;only this frame</source>
-        <translation>Zobraziť &amp;len tento rám</translation>
+        <translation type="obsolete">Zobraziť &amp;len tento rám</translation>
     </message>
     <message>
         <source>Show this frame in new &amp;tab</source>
-        <translation>Zobraziť tento rám na &amp;novom panely</translation>
+        <translation type="obsolete">Zobraziť tento rám na &amp;novom panely</translation>
     </message>
     <message>
         <source>Print frame</source>
-        <translation>Vytlačiť rám</translation>
+        <translation type="obsolete">Vytlačiť rám</translation>
     </message>
     <message>
         <source>Zoom &amp;in</source>
-        <translation>Zoo&amp;m +</translation>
+        <translation type="obsolete">Zoo&amp;m +</translation>
     </message>
     <message>
         <source>&amp;Zoom out</source>
-        <translation>Z&amp;oom -</translation>
+        <translation type="obsolete">Z&amp;oom -</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Resetovať</translation>
+        <translation type="obsolete">Resetovať</translation>
     </message>
     <message>
         <source>Show so&amp;urce of frame</source>
-        <translation>Zobraziť &amp;zdrojový kód rámu</translation>
+        <translation type="obsolete">Zobraziť &amp;zdrojový kód rámu</translation>
-    </message>
-    <message>
-        <source>&amp;Copy page link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send page link...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Print page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Validate page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send text...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go to &amp;web address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Google Translate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - QupZilla</source>
-        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>