Merge remote-tracking branch 'upstream/master'

Removing qt_id.qm as sugessted by nowrep. Conflicts: bin/locale/qt_id.qm translations/id_ID.ts
2024-12-20 02:36:34 +01:00 · 2012-03-18 17:26:31 +07:00 · 2012-03-18 17:26:31 +07:00 · 784f700ff6
commit 784f700ff6
parent 2ecb8a4681 2da66c222f
79 changed files with 4657 additions and 3919 deletions
--- a/13
+++ b/13
@ -74,6 +74,16 @@ Available Defines
                          
                          example:
                          $ export USE_WEBGL="true"
+                          
+   USE_QTWEBKIT_2_2       Enable support for Geolocation and Notifications API.
+                          You need to have QtWebKit version at least 2.2 to pass compilation
+                          with this define.
+                          Note: In order to get support for Geolocation and Notifications,
+                          your QtWebKit has to be compiled with its support.
+                          (disabled by default)
+                          
+                          example:
+                          $ export USE_QTWEBKIT_2_2="true"

   NONBLOCK_JS_DIALOGS    Enable non-blocking JavaScript dialogs from alert() prompt()
                          and confirm() functions. They are shown inside page and are not 
@ -128,5 +138,4 @@ Available Defines
                          
                          example:
                          $ export QUPZILLA_PREFIX="/usr/"
-                          
-                          
+                                   
--- a/bin/locale/qt_id.qm
+++ b/bin/locale/qt_id.qm
--- a/linux/applications/qupzilla.desktop
+++ b/linux/applications/qupzilla.desktop
@ -28,6 +28,7 @@ Comment[sr@latin]=Brz i siguran veb pregledač
 Comment[sv]=En snabb och säker webbläsare
 Comment[zh_TW]=安全又快速的瀏覽器
 Comment[zh_CN]=安全又快速的浏览器
+Comment[ja_JP]=高速で安全なブラウザ
 GenericName=Web Browser
 GenericName[cs]=Webový prohlížeč
 GenericName[de]=Web Browser
@ -49,6 +50,7 @@ GenericName[sr@latin]=Veb pregledač
 GenericName[sv]=Webbläsare
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zh_CN]=网页浏览器
+GenericName[ja_JP]=Webブラウザ
 Exec=qupzilla %u
 MimeType=text/html;application/xhtml+xml;
 Terminal=false
@ -76,6 +78,7 @@ Name[sr@latin]=Otvori u novom jezičku
 Name[sv]=Öppna ny flik
 Name[zh_TW]=新增分頁
 Name[zh_CN]=新建标签页
+Name[ja_JP]=新しいタブを開く

 Exec=qupzilla --new-tab
 TargetEnvironment=Unity
@ -102,6 +105,7 @@ Name[sr@latin]=Otvori u novom prozoru
 Name[sv]=Öppna nytt fönster
 Name[zh_TW]=新增視窗
 Name[zh_CN]=新建窗口
+Name[ja_JP]=新しいウィンドウを開く
 Exec=qupzilla --new-window
 TargetEnvironment=Unity

@ -127,5 +131,6 @@ Name[sr@latin]=Pokreni privatno pregledanje
 Name[sv]=Starta privat surfning
 Name[zh_TW]=開始私密瀏覽
 Name[zh_CN]=开始隐私浏览
+Name[ja_JP]=プライベートブラウジングを開始
 Exec=qupzilla --private-browsing
 TargetEnvironment=Unity
--- a/src/defines.pri
+++ b/src/defines.pri
@ -28,6 +28,7 @@ d_w7api = $$(W7API)
 d_kde = $$(KDE)
 d_portable = $$(PORTABLE_BUILD)
 d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
+d_use_qtwebkit_2_2 = $$(USE_QTWEBKIT_2_2)

 equals(d_no_system_datapath, "true") { DEFINES += NO_SYSTEM_DATAPATH }
 equals(d_use_webgl, "true") { DEFINES += USE_WEBGL }
@ -35,6 +36,7 @@ equals(d_w7api, "true") { DEFINES += W7API }
 equals(d_kde, "true") { DEFINES += KDE }
 equals(d_portable, "true") { DEFINES += PORTABLE_BUILD }
 equals(d_nonblock_dialogs, "true") { DEFINES += NONBLOCK_JS_DIALOGS }
+equals(d_use_qtwebkit_2_2, "true") { DEFINES += USE_QTWEBKIT_2_2 }

 !mac:unix {
    d_prefix = $$(QUPZILLA_PREFIX)
--- a/src/lib/3rdparty/lineedit.cpp
+++ b/src/lib/3rdparty/lineedit.cpp
@ -162,7 +162,7 @@ void LineEdit::updateTextMargins()
    else {
        left = m_leftMargin;
    }
-    int right = textMargin(LineEdit::RightSide);
+    int right = textMargin(LineEdit::RightSide) + 3;
    int top = 0;
    int bottom = 0;
    setTextMargins(left, top, right, bottom);
--- a/src/lib/3rdparty/lineedit.h
+++ b/src/lib/3rdparty/lineedit.h
@ -71,13 +71,13 @@ public:

    void setLeftMargin(int margin);

+public slots:
+    void updateTextMargins();
+
 protected:
    void resizeEvent(QResizeEvent* event);
    bool event(QEvent* event);

-protected slots:
-    void updateTextMargins();
-
 private:
    void init();
    void updateSideWidgetLocations();
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@ -155,8 +155,8 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
                m_postLaunchActions.append(PrivateBrowsing);
                break;
            case Qz::CL_OpenUrl:
-                startUrl = QUrl::fromEncoded(pair.text.toUtf8());
-                messages.append("URL:" + startUrl.toString());
+                startUrl = QUrl(pair.text.toUtf8());
+                messages.append("URL:" + pair.text);
                break;
            default:
                break;
@ -440,8 +440,8 @@ void MainApplication::receiveAppMessage(QString message)
 {
    QWidget* actWin = getWindow();
    if (message.startsWith("URL:")) {
-        QString url(message.remove("URL:"));
-        addNewTab(QUrl::fromUserInput(url));
+        QUrl url = QUrl::fromEncoded(message.mid(4).toUtf8());
+        addNewTab(url);
        actWin = getWindow();
    }
    else if (message.startsWith("ACTION:")) {
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@ -1316,7 +1316,7 @@ void QupZilla::showWebInspector(bool toggle)
 {
    if (m_webInspectorDock) {
        if (toggle) {
-            m_webInspectorDock.data()->setVisible(!m_webInspectorDock.data()->isVisible());
+            m_webInspectorDock.data()->toggleVisibility();
        }
        else  {
            m_webInspectorDock.data()->show();
--- a/src/lib/data/html/speeddial.html
+++ b/src/lib/data/html/speeddial.html
@ -24,19 +24,18 @@ span.edit:hover {border-color: grey; border-radius: 3px;}
 span.reload {width: 16px;height: 16px;position: absolute;left: 92%;top: 0px;background: url(%IMG_RELOAD%) no-repeat;background-position: center;border: 1px solid transparent;display: none;}
 span.reload:hover {border-color: grey; border-radius: 4px;}

-#overlay-edit {width: 380px;max-height: 265px;border-width: 20px;margin-left: auto;margin-right: auto;margin-top: 100px;
-webkit-border-image: url(%BOX-BORDER%) 25;}
+#overlay-edit {width: 380px;max-height: 265px;border-width: 20px;margin-left:auto;margin-right: auto;margin-top: 100px;-webkit-border-image: url(%BOX-BORDER%) 25;-webkit-box-shadow: 0px 5px 80px #505050;border-radius:10px;}
 #overlay-edit img {display: block;margin-left: auto;margin-right: auto;}
-#overlay-edit input[type="submit"] {margin-left: auto;margin-right: auto;margin-top: 10px;display: block;width: 200px;}
+#overlay-edit .buttonbox input {margin-right:0px;margin-left:3px;}

 .formTable {width: 350px;margin-left: auto;margin-right: auto;margin-top: 15px;}
 .formTable input[type="text"] {width: 100%;-webkit-user-select: auto;}

 .sett {position: absolute;right:36px;top:10px;width: 24px;height: 24px;background: url(%IMG_SETTINGS%); cursor: pointer;}
-#settingsBox {position: absolute;right: 58px;top: 25px;width: auto;height: auto;background: #eeeeee;margin: 5px;border-radius: 15px;padding: 8px 15px;border: 1px solid transparent;opacity: 1;z-index: 200;}
-#settingsBox .content {float: right;margin-left: 115px;}
-#settingsBox .thumbhold {margin: 2px;padding: 1px;border-radius: 10px;text-align: center;width: 100px; height: 100px;background: #AAA;}
-#settingsBox .thumbhold p {margin: 0;padding: 0;background: #eeeeee url(%IMG_BACKGROUND%) no-repeat center center;background-size: %B_SIZE%;width: 98px;height:98px;border-radius: 10px;position: relative;left: 1px;top: 1px;}
+#settingsBox {margin-left:auto;margin-right: auto;margin-top: 100px;width: 350px;height: auto;padding:0 8px;-webkit-border-image: url(%BOX-BORDER%) 25;-webkit-box-shadow: 0px 5px 80px #505050;border-radius:10px;border-width: 20px;}
+#settingsBox .content {margin-left:auto;margin-right:auto;padding-bottom:2px;border-bottom: 1px solid #888;}
+#settingsBox .thumbhold {margin-left:auto;margin-right:auto;margin-bottom: 5px;padding: 1px;border-radius: 10px;text-align:center;width:180px;height:100px;background: #AAA;}
+#settingsBox .thumbhold p {padding: 0;background: #eeeeee url(%IMG_BACKGROUND%) no-repeat center center;background-size: %B_SIZE%;width: 178px;height:98px;border-radius: 10px;position: relative;left: 1px;top: 1px;line-height:98px;cursor:default;}
 #settingsBox p label {margin: 2px;padding: 1px;text-align: center;}
 #settingsBox p select {margin: 2px;padding: 1px;text-align: center;width: auto;}
 #settingsBox p select option {text-align: center;}
@ -45,6 +44,10 @@ span.reload:hover {border-color: grey; border-radius: 4px;}
 #settingsBox .rowsel {margin: 2px;padding: 3px 0;border-bottom: 1px solid #888;}
 #settingsBox .rowsel input {text-align: center;width: 80%;height: 12px;margin: 0px;padding-bottom: 0;}
 #settingsBox .rowsel span {font-weight: bold;text-align: center;margin: 2px;margin-right: 7px;display: inline-block;width: 25px;}
+
+.buttonbox {margin-top: 5px;margin-bottom:-5px;text-align:right;}
+/*.buttonbox input {margin-left:3px; margin-right:0;padding:0;}*/
+.overlay { background:-webkit-radial-gradient(rgba(127, 127, 127, 0.5),rgba(127, 127, 127, 0.5) 35%,rgba(0, 0, 0, 0.7));bottom:0;left: 0;padding: 20px;padding-bottom: 130px;position: fixed;right:0;top:0;}
 </style>
 <script type="text/javascript" src="%JQUERY%"></script>
 <script type="text/javascript" src="%JQUERY-UI%"></script>
@ -85,6 +88,10 @@ function onFetchTitleClick(checkbox) {
    $('#titleLine').css({'visibility' : displayStyle });
 }

+function hideEditBox() {
+    $('#fadeOverlay').fadeOut("slow", function() {$("#fadeOverlay").remove();});
+}
+
 function onEditClick(box) {
    editingId = $(box).index();
    var boxUrl = $(box).children('a').first().attr('href');
@ -92,21 +99,21 @@ function onEditClick(box) {
    if (boxUrl === '')
        boxUrl = 'http://';

-    $('body').append('<div id="fadeOverlay" style="opacity:0.95;display:none;position:fixed;left:0;' +
-                     'top:0;width:100%;height:100%;z-index:9999;background:grey;">' +
-                     '<div id="overlay-edit" onkeypress="return onEditKeyPress(event)">' +
-                     '<img src="' + $(box).children('img').first().attr('src') + '"> ' +
-                     '<table class="formTable"><tr><td>' + URL + ': </td><td>' +
-                     '<input type="text" id="formUrl" value="' + boxUrl + '"></td></tr>' +
-                     '<tr id="titleLine"><td>' + TITLE + ': </td><td>' +
-                     '<input type="text" id="formTitle" value="' + boxTitle + '"></td></tr>' +
-                     '<tr><td></td><td><input type="checkbox" id="fetchTitle" onclick="onFetchTitleClick(this)">' +
-                     '<label for="fetchTitle">  ' + TITLE_FETCHTITLE + ' </label></td></tr>' +
-                     '</table><input type="submit" value="' + EDIT + '" onClick="boxEdited()">' +
-                     '</div></div>');
+    $('body').append('<div id="fadeOverlay" class="overlay" style="display:none;">' +
+        '<div id="overlay-edit" onkeypress="return onEditKeyPress(event)">' +
+        '<img src="' + $(box).children('img').first().attr('src') + '"> ' +
+        '<table class="formTable"><tr><td>' + URL + ': </td><td>' +
+        '<input type="text" id="formUrl" value="' + boxUrl + '"></td></tr>' +
+        '<tr id="titleLine"><td>' + TITLE + ': </td><td>' +
+        '<input type="text" id="formTitle" value="' + boxTitle + '"></td></tr>' +
+        '<tr><td></td><td><input type="checkbox" id="fetchTitle" onclick="onFetchTitleClick(this)">' +
+        '<label for="fetchTitle">  ' + TITLE_FETCHTITLE + ' </label></td></tr>' +
+        '</table><p class="buttonbox"><input type="button" value=" %CLOSE% " onClick="hideEditBox();">' + 
+        '<input type="button" value="   ' + EDIT + '   " onClick="boxEdited()"></p>' +
+        '</div></div>');

-    $('#fadeOverlay').css({'filter' : 'alpha(opacity=95)'}).fadeIn();
-    $('#fadeOverlay').click(function() { $(this).fadeOut("slow", function() {$("#fadeOverlay").remove();}); });
+    $('#fadeOverlay').css({'filter' : 'alpha(opacity=100)'}).fadeIn();
+    $('#fadeOverlay').click(function() {hideEditBox()});
    $('#overlay-edit').click(function(event) { event.stopPropagation(); });
    $('#formUrl').focus();
 }
@ -144,7 +151,7 @@ function boxEdited() {
            speeddial.removeImageForUrl(a.getAttribute('href'));
        });
    } else {
-        $('#fadeOverlay').fadeOut("slow", function() {$("#fadeOverlay").remove();});
+        hideEditBox();
    }
    speeddial.changed(allPages());
 }
@ -364,7 +371,7 @@ $(document).ready(function () {

 <body>
 <div id="quickdial"></div>
-<a onClick="$('#fadeOverlay2').css({'filter' : 'alpha(opacity=95)'}).fadeIn();$('#fadeOverlay2').click(function() { $(this).fadeOut('slow'); });$('#settingsBox').click(function(event) { event.stopPropagation(); });" title="%SETTINGS-TITLE%" class="sett"></a>
+<a onClick="$('#fadeOverlay2').css({'filter' : 'alpha(opacity=100)'}).fadeIn();$('#fadeOverlay2').click(function() { $(this).fadeOut('slow'); });$('#settingsBox').click(function(event) { event.stopPropagation(); });" title="%SETTINGS-TITLE%" class="sett"></a>
 <a onClick="onEditClick(addBox('', NEW_PAGE, '')); alignPage();" title="%ADD-TITLE%" class="add"></a>

 <script type="text/javascript">
@ -384,7 +391,7 @@ $("#quickdial").sortable({
    }
 });
 </script>
-<div id="fadeOverlay2" style="opacity:0.95;display:none;position:fixed;left:0;top:0;width:100%;height:100%;z-index:100;background:grey;">
+<div id="fadeOverlay2" class="overlay" style="display:none;">
  <div id="settingsBox">
    <div class="togop">
      <label for="PgInRow">%TXT_NRROWS%</label>
@ -403,13 +410,13 @@ $("#quickdial").sortable({
    <div class="togop">
      <input type="checkbox" name="sdbackimg" id="BgImgToggle" onchange="bgImgToggle();bgImgUpdate()" />&nbsp;<label for="BgImgToggle">%TXT_NOTE%</label>
    </div>
+    <div id="BgImgSel" class="thumbhold" onclick="if($('#BgImgSelSiz').attr('disabled')!='disabled') {bgImageSel();bgImgUpdate();}" disabled="disabled"><p id="thumb">%TXT_SELECTIMAGE%</p></div>
    <div class="content">
      <p>
-        <input id="BgImgSel" type="button" class="button" value="%TXT_SELECTIMAGE%" onclick="bgImageSel();bgImgUpdate()" />
        <input id="BgImgHold" type="hidden" value="%IMG_BACKGROUND%" />
      </p>
-      <p>
-        <label for="BgImgSelSiz">%TXT_PLACEMENT%</label><br />
+      <center><p>
+        <label for="BgImgSelSiz">%TXT_PLACEMENT%</label>
        <select id="BgImgSelSiz" name="imgselsize" onchange="bgImgUpdate()">
          <option value="auto">%TXT_AUTO%</option>
          <option value="cover">%TXT_COVER%</option>
@ -417,12 +424,12 @@ $("#quickdial").sortable({
          <option value="100% auto">%TXT_FWIDTH%</option>
          <option value="auto 100%">%TXT_FHEIGHT%</option>
        </select>
-      </p>
-      <p>
-        <input class="button" type="button" value="%APPLY%" onClick="saveSettings();$('#fadeOverlay2').fadeOut('slow');" />
-      </p>
+      </p></center>
    </div>
-    <div class="thumbhold"><p id="thumb"></p></div>
+    <p class="buttonbox">
+    <input type="button" value=" %CLOSE% " onClick="$('#fadeOverlay2').fadeOut('slow');" />
+    <input type="button" value="   %APPLY%   " onClick="saveSettings();$('#fadeOverlay2').fadeOut('slow');"/>
+      </p>
  </div>
 </div>
 </body>
--- a/src/lib/downloads/downloadfilehelper.cpp
+++ b/src/lib/downloads/downloadfilehelper.cpp
@ -269,11 +269,15 @@ QString DownloadFileHelper::getFileName(QNetworkReply* reply)
        baseName = tr("NoNameDownload");
    }

-    if (!endName.isEmpty()) {
-        endName = "." + endName;
+    if (endName.isEmpty()) {
+        endName = "html";
    }

+    endName.prepend(".");
+
+
    QString name = baseName + endName;
+
    if (name.contains("\"")) {
        name.remove("\";");
    }
--- a/src/lib/downloads/downloaditem.cpp
+++ b/src/lib/downloads/downloaditem.cpp
@ -145,6 +145,8 @@ void DownloadItem::finished()
    ui->frame->hide();
    m_outputFile.close();

+    m_reply->deleteLater();
+
    m_item->setSizeHint(sizeHint());
 #if QT_VERSION == 0x040700 // Workaround
    ui->button->show();
--- a/src/lib/navigation/locationbar.cpp
+++ b/src/lib/navigation/locationbar.cpp
@ -150,6 +150,8 @@ void LocationBar::showGoButton()
    m_bookmarkIcon->hide();
    m_rssIcon->hide();
    m_goIcon->show();
+
+    updateTextMargins();
 }

 void LocationBar::hideGoButton()
@ -161,6 +163,8 @@ void LocationBar::hideGoButton()
    m_rssIcon->setVisible(m_rssIconVisible);
    m_bookmarkIcon->show();
    m_goIcon->hide();
+
+    updateTextMargins();
 }

 void LocationBar::showMostVisited()
@ -172,6 +176,7 @@ void LocationBar::showMostVisited()
        QKeyEvent event(QEvent::KeyPress, Qt::Key_unknown, Qt::NoModifier, QString(" "));
        keyPressEvent(&event);
    }
+
    m_locationCompleter->showMostVisited();
 }

@ -196,6 +201,8 @@ void LocationBar::rssIconClicked()
 void LocationBar::showRSSIcon(bool state)
 {
    m_rssIcon->setVisible(state);
+
+    updateTextMargins();
 }

 void LocationBar::showUrl(const QUrl &url)
--- a/src/lib/network/qupzillaschemehandler.cpp
+++ b/src/lib/network/qupzillaschemehandler.cpp
@ -58,10 +58,12 @@ QupZillaSchemeReply::QupZillaSchemeReply(const QNetworkRequest &req, QObject* pa
    setOperation(QNetworkAccessManager::GetOperation);
    setRequest(req);
    setUrl(req.url());
-
    m_pageName = req.url().path();
-    if (m_pageName == "about" || m_pageName == "reportbug" || m_pageName == "start" ||
-            m_pageName == "speeddial" || m_pageName == "config") {
+
+    QStringList knownPages;
+    knownPages << "about" << "reportbug" << "start" << "speeddial" << "config";
+
+    if (knownPages.contains(m_pageName)) {
        m_buffer.open(QIODevice::ReadWrite);
        setError(QNetworkReply::NoError, tr("No Error"));

@ -140,7 +142,7 @@ QString QupZillaSchemeReply::reportbugPage()
    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 to disable"
-                                       " all extenions first. <br/>If this does not fix it, then please fill out this form: "));
+                                       " all extensions first. <br/>If this does not fix it, then please fill out this form: "));
    bPage.replace("%EMAIL%", tr("Your E-mail"));
    bPage.replace("%TYPE%", tr("Issue type"));
    bPage.replace("%DESCRIPTION%", tr("Issue description"));
@ -261,6 +263,7 @@ QString QupZillaSchemeReply::speeddialPage()
        dPage.replace("%URL%", tr("Url"));
        dPage.replace("%TITLE%", tr("Title"));
        dPage.replace("%APPLY%", tr("Apply"));
+        dPage.replace("%CLOSE%", tr("Close"));
        dPage.replace("%NEW-PAGE%", tr("New Page"));
        dPage.replace("%IMG_SETTINGS%", "qrc:html/setting.png");
        dPage.replace("%SETTINGS-TITLE%", tr("Speed Dial settings"));
@ -302,7 +305,7 @@ QString QupZillaSchemeReply::configPage()
        cPage.replace("%TITLE%", tr("Configuration Information"));
        cPage.replace("%CONFIG%", tr("Configuration Information"));
        cPage.replace("%INFORMATIONS-ABOUT-VERSION%", tr("Information about version"));
-        cPage.replace("%CONFIG-ABOUT%", tr("This page contains information about QupZilla's current configuration, all relevant information for troubleshooting. Please include these information when sending bug reports."));
+        cPage.replace("%CONFIG-ABOUT%", tr("This page contains information about QupZilla's current configuration - relevant for troubleshooting. Please include this information when submitting bug reports."));
        cPage.replace("%BROWSER-IDENTIFICATION%", tr("Browser Identification"));
        cPage.replace("%PATHS%", tr("Paths"));
        cPage.replace("%BUILD-CONFIG%", tr("Build Configuration"));
--- a/src/lib/other/aboutdialog.cpp
+++ b/src/lib/other/aboutdialog.cpp
@ -62,7 +62,7 @@ void AboutDialog::showAbout()
 #endif
                                                                          ));
        m_aboutHtml.append(tr("<b>WebKit version %1</b></p>").arg(QupZilla::WEBKITVERSION));
-        m_aboutHtml.append(tr("<p>&copy; %1 %2<br/>").arg(QupZilla::COPYRIGHT, QupZilla::AUTHOR));
+        m_aboutHtml.append(QString("<p>&copy; %1 %2<br/>").arg(QupZilla::COPYRIGHT, QupZilla::AUTHOR));
        m_aboutHtml.append(tr("<small>Build time: %1 </small></p>").arg(QupZilla::BUILDTIME));
        m_aboutHtml.append(QString("<p><a href=%1>%1</a></p>").arg(QupZilla::WWWADDRESS));
        m_aboutHtml.append("<p>" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "</p>");
--- a/src/lib/other/pagescreen.cpp
+++ b/src/lib/other/pagescreen.cpp
@ -52,12 +52,16 @@ PageScreen::PageScreen(WebView* view, QWidget* parent)

 void PageScreen::dialogAccepted()
 {
-    const QString &path = QFileDialog::getSaveFileName(this, tr("Save Page Screen..."),
-                          QDir::homePath() + "/" + QString("%1.png").arg(qz_filterCharsFromFilename(m_pageTitle)));
+    const QString &suggestedPath = QDir::homePath() + "/" + QString("%1.png").arg(qz_filterCharsFromFilename(m_pageTitle));
+    QString path = QFileDialog::getSaveFileName(this, tr("Save Page Screen..."),
+                          suggestedPath);

    if (!path.isEmpty()) {
-        m_pageImage.save(path);
+        if (!path.endsWith(".png", Qt::CaseInsensitive)) {
+            path.append(".png");
+        }

+        m_pageImage.save(path, "PNG");
        QTimer::singleShot(0, this, SLOT(close()));
    }
 }
--- a/src/lib/other/pagescreen.ui
+++ b/src/lib/other/pagescreen.ui
@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>562</width>
-    <height>421</height>
+    <height>332</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -37,7 +37,7 @@
        <x>0</x>
        <y>0</y>
        <width>562</width>
-        <height>366</height>
+        <height>277</height>
       </rect>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
--- a/src/lib/other/sourceviewer.cpp
+++ b/src/lib/other/sourceviewer.cpp
@ -31,19 +31,24 @@
 #include <QMessageBox>
 #include <QInputDialog>
 #include <QWebFrame>
+#include <QTimer>

 SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
    : QWidget(0)
    , m_frame(frame)
+    , m_selectedHtml(selectedHtml)
 {
    setAttribute(Qt::WA_DeleteOnClose);
    setWindowTitle(tr("Source of ") + frame->url().toString());
    m_layout = new QBoxLayout(QBoxLayout::TopToBottom, this);
    m_sourceEdit = new PlainEditWithLines(this);
    m_sourceEdit->setObjectName("sourceviewer-textedit");
+    m_sourceEdit->setReadOnly(true);
+    m_sourceEdit->setUndoRedoEnabled(false);

    m_statusBar = new QStatusBar(this);
    m_statusBar->showMessage(frame->url().toString());
+
    QMenuBar* menuBar = new QMenuBar(this);
    m_layout->addWidget(m_sourceEdit);
    m_layout->addWidget(m_statusBar);
@ -51,10 +56,6 @@ SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
    m_layout->setSpacing(0);
    m_layout->setMenuBar(menuBar);

-    this->resize(650, 600);
-    m_sourceEdit->setReadOnly(true);
-    m_sourceEdit->moveCursor(QTextCursor::Start);
-
    QFont font;
    font.setFamily("Tahoma");
    font.setFixedPitch(true);
@ -63,6 +64,9 @@ SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
    m_sourceEdit->setFont(font);
    new HtmlHighlighter(m_sourceEdit->document());

+    resize(650, 600);
+    qz_centerWidgetToParent(this, frame->page()->view());
+
    QMenu* menuFile = new QMenu(tr("File"));
    menuFile->addAction(QIcon::fromTheme("document-save"), tr("Save as..."), this, SLOT(save()))->setShortcut(QKeySequence("Ctrl+S"));
    menuFile->addSeparator();
@ -70,13 +74,12 @@ SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
    menuBar->addMenu(menuFile);

    QMenu* menuEdit = new QMenu(tr("Edit"));
-    menuEdit->addAction(QIcon::fromTheme("edit-undo"), tr("Undo"), m_sourceEdit, SLOT(undo()))->setShortcut(QKeySequence("Ctrl+Z"));
-    menuEdit->addAction(QIcon::fromTheme("edit-redo"), tr("Redo"), m_sourceEdit, SLOT(redo()))->setShortcut(QKeySequence("Ctrl+Shift+Z"));
+    m_actionUndo = menuEdit->addAction(QIcon::fromTheme("edit-undo"), tr("Undo"), m_sourceEdit, SLOT(undo()));
+    m_actionRedo = menuEdit->addAction(QIcon::fromTheme("edit-redo"), tr("Redo"), m_sourceEdit, SLOT(redo()));
    menuEdit->addSeparator();
-    menuEdit->addAction(QIcon::fromTheme("edit-cut"), tr("Cut"), m_sourceEdit, SLOT(cut()))->setShortcut(QKeySequence("Ctrl+X"));
-    menuEdit->addAction(QIcon::fromTheme("edit-copy"), tr("Copy"), m_sourceEdit, SLOT(copy()))->setShortcut(QKeySequence("Ctrl+C"));
-    menuEdit->addAction(QIcon::fromTheme("edit-paste"), tr("Paste"), m_sourceEdit, SLOT(paste()))->setShortcut(QKeySequence("Ctrl+V"));
-    menuEdit->addAction(QIcon::fromTheme("edit-delete"), tr("Delete"))->setShortcut(QKeySequence("Del"));
+    m_actionCut = menuEdit->addAction(QIcon::fromTheme("edit-cut"), tr("Cut"), m_sourceEdit, SLOT(cut()));
+    m_actionCopy = menuEdit->addAction(QIcon::fromTheme("edit-copy"), tr("Copy"), m_sourceEdit, SLOT(copy()));
+    m_actionPaste = menuEdit->addAction(QIcon::fromTheme("edit-paste"), tr("Paste"), m_sourceEdit, SLOT(paste()));
    menuEdit->addSeparator();
    menuEdit->addAction(QIcon::fromTheme("edit-select-all"), tr("Select All"), m_sourceEdit, SLOT(selectAll()))->setShortcut(QKeySequence("Ctrl+A"));
    menuEdit->addAction(QIcon::fromTheme("edit-find"), tr("Find"), this, SLOT(findText()))->setShortcut(QKeySequence("Ctrl+F"));
@ -84,6 +87,12 @@ SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
    menuEdit->addAction(QIcon::fromTheme("go-jump"), tr("Go to Line..."), this, SLOT(goToLine()))->setShortcut(QKeySequence("Ctrl+L"));
    menuBar->addMenu(menuEdit);

+    m_actionUndo->setShortcut(QKeySequence("Ctrl+Z"));
+    m_actionRedo->setShortcut(QKeySequence("Ctrl+Shift+Z"));
+    m_actionCut->setShortcut(QKeySequence("Ctrl+X"));
+    m_actionCopy->setShortcut(QKeySequence("Ctrl+C"));
+    m_actionPaste->setShortcut(QKeySequence("Ctrl+V"));
+
    QMenu* menuView = new QMenu(tr("View"));
    menuView->addAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("Reload"), this, SLOT(reload()))->setShortcut(QKeySequence("F5"));
    menuView->addSeparator();
@ -92,21 +101,51 @@ SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
    menuView->actions().at(3)->setChecked(true);
    menuBar->addMenu(menuView);

-    qz_centerWidgetToParent(this, frame->page()->view());
+    connect(m_sourceEdit, SIGNAL(copyAvailable(bool)), this, SLOT(copyAvailable(bool)));
+    connect(m_sourceEdit, SIGNAL(redoAvailable(bool)), this, SLOT(redoAvailable(bool)));
+    connect(m_sourceEdit, SIGNAL(undoAvailable(bool)), this, SLOT(undoAvailable(bool)));
+    connect(menuEdit, SIGNAL(aboutToShow()), this, SLOT(pasteAvailable()));

-    m_sourceEdit->setUndoRedoEnabled(false);
-    m_sourceEdit->insertPlainText(frame->toHtml());
-    m_sourceEdit->setUndoRedoEnabled(true);
+    QTimer::singleShot(0, this, SLOT(loadSource()));
+}
+
+void SourceViewer::copyAvailable(bool yes)
+{
+    m_actionCopy->setEnabled(yes);
+    m_actionCut->setEnabled(yes);
+}
+
+void SourceViewer::redoAvailable(bool available)
+{
+    m_actionRedo->setEnabled(available);
+}
+
+void SourceViewer::undoAvailable(bool available)
+{
+    m_actionUndo->setEnabled(available);
+}
+
+void SourceViewer::pasteAvailable()
+{
+    m_actionPaste->setEnabled(m_sourceEdit->canPaste());
+}
+
+void SourceViewer::loadSource()
+{
+    m_actionUndo->setEnabled(false);
+    m_actionRedo->setEnabled(false);
+    m_actionCut->setEnabled(false);
+    m_actionCopy->setEnabled(false);
+    m_actionPaste->setEnabled(false);
+
+    m_sourceEdit->setPlainText(m_frame.data()->toHtml());

    //Highlight selectedHtml
-    if (!selectedHtml.isEmpty()) {
-        m_sourceEdit->find(selectedHtml, QTextDocument::FindWholeWords);
-    }
-    else {
-        QTextCursor cursor = m_sourceEdit->textCursor();
-        cursor.setPosition(0);
-        m_sourceEdit->setTextCursor(cursor);
+    if (!m_selectedHtml.isEmpty()) {
+        m_sourceEdit->find(m_selectedHtml, QTextDocument::FindWholeWords);
    }
+
+    m_sourceEdit->setShowingCursor(true);
 }

 void SourceViewer::save()
@ -145,7 +184,7 @@ void SourceViewer::reload()
 {
    if (m_frame) {
        m_sourceEdit->clear();
-        m_sourceEdit->insertPlainText(m_frame.data()->toHtml());
+        m_sourceEdit->setPlainText(m_frame.data()->toHtml());

        m_statusBar->showMessage(tr("Source reloaded"));
    }
@ -157,6 +196,7 @@ void SourceViewer::reload()
 void SourceViewer::setTextEditable()
 {
    m_sourceEdit->setReadOnly(!m_sourceEdit->isReadOnly());
+    m_sourceEdit->setUndoRedoEnabled(true);

    m_statusBar->showMessage(tr("Editable changed"));
 }
--- a/src/lib/other/sourceviewer.h
+++ b/src/lib/other/sourceviewer.h
@ -36,11 +36,13 @@ public:
    explicit SourceViewer(QWebFrame* frame, const QString &selectedHtml);
    PlainEditWithLines* sourceEdit() { return m_sourceEdit; }

-signals:
-
-public slots:
-
 private slots:
+    void copyAvailable(bool yes);
+    void redoAvailable(bool available);
+    void undoAvailable(bool available);
+    void pasteAvailable();
+
+    void loadSource();
    void save();
    void findText();
    void reload();
@ -53,6 +55,14 @@ private:
    PlainEditWithLines* m_sourceEdit;
    QWeakPointer<QWebFrame> m_frame;
    QStatusBar* m_statusBar;
+
+    QString m_selectedHtml;
+
+    QAction* m_actionUndo;
+    QAction* m_actionRedo;
+    QAction* m_actionCut;
+    QAction* m_actionCopy;
+    QAction* m_actionPaste;
 };

 #endif // SOURCEVIEWER_H
--- a/src/lib/other/statusbarmessage.cpp
+++ b/src/lib/other/statusbarmessage.cpp
@ -30,8 +30,6 @@

 TipLabel::TipLabel(QWidget* parent)
    : SqueezeLabelV1(parent)
-    , p_QupZilla(0)
-    , m_connected(false)
 {
    setWindowFlags(Qt::ToolTip);
    setForegroundRole(QPalette::ToolTipText);
@ -44,21 +42,6 @@ TipLabel::TipLabel(QWidget* parent)
    qApp->installEventFilter(this);
 }

-void TipLabel::setMainWindow(QupZilla* main)
-{
-    p_QupZilla = main;
-}
-
-void TipLabel::show()
-{
-    if (p_QupZilla && !m_connected) {
-        connect(p_QupZilla->tabWidget(), SIGNAL(currentChanged(int)), this, SLOT(hide()));
-        m_connected = true;
-    }
-
-    SqueezeLabelV1::show();
-}
-
 void TipLabel::paintEvent(QPaintEvent* ev)
 {
    QStylePainter p(this);
@ -97,7 +80,6 @@ StatusBarMessage::StatusBarMessage(QupZilla* mainClass)
    : p_QupZilla(mainClass)
    , m_statusBarText(new TipLabel(mainClass))
 {
-    m_statusBarText->setMainWindow(p_QupZilla);
 }

 void StatusBarMessage::showMessage(const QString &message)
@ -128,10 +110,8 @@ void StatusBarMessage::showMessage(const QString &message)
        m_statusBarText->setMaximumWidth(view->width() - verticalScrollSize);
        m_statusBarText->resize(m_statusBarText->sizeHint());

-        QPoint position;
-        position.setY(view->height() - horizontalScrollSize - m_statusBarText->height());
-
-        QRect statusRect = QRect(view->mapToGlobal(QPoint(0, position.y())), m_statusBarText->size());
+        QPoint position(0, view->height() - horizontalScrollSize - m_statusBarText->height());
+        const QRect &statusRect = QRect(view->mapToGlobal(QPoint(0, position.y())), m_statusBarText->size());

        if (statusRect.contains(QCursor::pos())) {
            position.setY(position.y() - m_statusBarText->height());
--- a/src/lib/other/statusbarmessage.h
+++ b/src/lib/other/statusbarmessage.h
@ -31,16 +31,10 @@ class QT_QUPZILLA_EXPORT TipLabel : public SqueezeLabelV1
 public:
    TipLabel(QWidget* parent);

-    void setMainWindow(QupZilla* main);
-
    bool eventFilter(QObject* o, QEvent* e);
-    void show();

 private:
    void paintEvent(QPaintEvent* ev);
-
-    QupZilla* p_QupZilla;
-    bool m_connected;
 };

 class QT_QUPZILLA_EXPORT StatusBarMessage
--- a/src/lib/plugins/pluginproxy.h
+++ b/src/lib/plugins/pluginproxy.h
@ -18,11 +18,11 @@
 #ifndef PLUGINPROXY_H
 #define PLUGINPROXY_H

-#include "mainapplication.h"
-#include "networkmanager.h"
 #include "plugins.h"
 #include "qz_namespace.h"

+class QupZilla;
+
 class QT_QUPZILLA_EXPORT PluginProxy : public Plugins
 {
    Q_OBJECT
--- a/src/lib/tools/animatedwidget.cpp
+++ b/src/lib/tools/animatedwidget.cpp
@ -43,6 +43,10 @@ AnimatedWidget::AnimatedWidget(const Direction &direction, int duration, QWidget

 void AnimatedWidget::startAnimation()
 {
+    if (m_aniGroup->state() == QAnimationGroup::Running) {
+        return;
+    }
+
    if (m_direction == Down) {
        Y_SHOWN = 0;
        Y_HIDDEN = -m_widget->height();
@ -62,6 +66,10 @@ void AnimatedWidget::startAnimation()

 void AnimatedWidget::hide()
 {
+    if (m_aniGroup->state() == QAnimationGroup::Running) {
+        return;
+    }
+
    m_positionAni->setEndValue(QPoint(m_widget->pos().x(), Y_HIDDEN));
    m_heightAni->setEndValue(0);

--- a/src/lib/tools/htmlhighlighter.h
+++ b/src/lib/tools/htmlhighlighter.h
@ -78,6 +78,7 @@ private:
        QRegExp pattern;
        QTextCharFormat format;
    };
+
    QVector<HighlightingRule> highlightingRules;

    QRegExp commentStartExpression;
--- a/src/lib/tools/plaineditwithlines.cpp
+++ b/src/lib/tools/plaineditwithlines.cpp
@ -62,6 +62,7 @@
 PlainEditWithLines::PlainEditWithLines(QWidget* parent)
    : QPlainTextEdit(parent)
    , m_lineNumberArea(new LineNumberArea(this))
+    , m_isShowingCursor(false)
    , m_countCache(-1, -1)
 {
    connect(this, SIGNAL(blockCountChanged(int)), this, SLOT(updateLineNumberAreaWidth(int)));
@ -86,6 +87,16 @@ int PlainEditWithLines::lineNumberAreaWidth()
    return space;
 }

+void PlainEditWithLines::setShowingCursor(bool show)
+{
+    m_isShowingCursor = show;
+}
+
+bool PlainEditWithLines::isShowingCursor() const
+{
+    return m_isShowingCursor;
+}
+
 void PlainEditWithLines::setReadOnly(bool ro)
 {
    QPlainTextEdit::setReadOnly(ro);
@ -138,17 +149,21 @@ void PlainEditWithLines::resizeEvent(QResizeEvent* e)

 void PlainEditWithLines::highlightCurrentLine()
 {
-    QList<QTextEdit::ExtraSelection> extraSelections;
+    if (!m_isShowingCursor) {
+        return;
+    }
+
+    const QColor &lineColor = palette().color(QPalette::Highlight).lighter();
+    QList<QTextEdit::ExtraSelection> selectionsList;
    QTextEdit::ExtraSelection selection;
-    QColor lineColor = palette().color(QPalette::Highlight).lighter();

    selection.format.setBackground(lineColor);
    selection.format.setProperty(QTextFormat::FullWidthSelection, true);
    selection.cursor = textCursor();
    selection.cursor.clearSelection();
-    extraSelections.append(selection);
+    selectionsList.append(selection);

-    setExtraSelections(extraSelections);
+    setExtraSelections(selectionsList);
 }

 void PlainEditWithLines::lineNumberAreaPaintEvent(QPaintEvent* event)
--- a/src/lib/tools/plaineditwithlines.h
+++ b/src/lib/tools/plaineditwithlines.h
@ -79,6 +79,9 @@ public:
    void lineNumberAreaPaintEvent(QPaintEvent* event);
    int lineNumberAreaWidth();

+    void setShowingCursor(bool show);
+    bool isShowingCursor() const;
+
    void setReadOnly(bool ro);

 public slots:
@ -95,6 +98,7 @@ private slots:
 private:
    QWidget* m_lineNumberArea;

+    bool m_isShowingCursor;
    QPair<int, int> m_countCache;
 };

--- a/src/lib/webview/tabwidget.cpp
+++ b/src/lib/webview/tabwidget.cpp
@ -82,6 +82,7 @@ TabWidget::TabWidget(QupZilla* mainClass, QWidget* parent)
    , m_lastTabIndex(0)
    , m_lastBackgroundTabIndex(-1)
    , m_isClosingToLastTabIndex(false)
+    , m_isRestoringState(false)
    , m_closedTabsManager(new ClosedTabsManager)
    , m_locationBars(new QStackedWidget)
 {
@ -376,7 +377,7 @@ void TabWidget::closeTab(int index)

 void TabWidget::currentTabChanged(int index)
 {
-    if (index < 0) {
+    if (index < 0 || m_isRestoringState) {
        return;
    }

@ -516,12 +517,13 @@ int TabWidget::duplicateTab(int index)
    WebTab* webTab = weTab(index);

    const QUrl &url = webTab->url();
+    const QString &title = webTab->title();
    const QByteArray &history = webTab->historyData();

    QNetworkRequest req(url);
    req.setRawHeader("Referer", url.toEncoded());

-    int id = addView(req, tabText(index), Qz::NT_CleanNotSelectedTab);
+    int id = addView(req, title, Qz::NT_CleanNotSelectedTab);
    weTab(id)->setHistoryData(history);

    return id;
@ -661,6 +663,8 @@ void TabWidget::restorePinnedTabs()
    QList<QByteArray> tabHistory;
    stream >> tabHistory;

+    m_isRestoringState = true;
+
    for (int i = 0; i < pinnedTabs.count(); ++i) {
        QUrl url = QUrl::fromEncoded(pinnedTabs.at(i).toUtf8());

@ -686,6 +690,8 @@ void TabWidget::restorePinnedTabs()
        m_tabBar->updateCloseButton(addedIndex);
        m_tabBar->moveTab(addedIndex, i);
    }
+
+    m_isRestoringState = false;
 }

 QByteArray TabWidget::saveState()
@ -728,6 +734,8 @@ bool TabWidget::restoreState(const QByteArray &state)

    stream >> tabListCount;

+    m_isRestoringState = true;
+
    for (int i = 0; i < tabListCount; ++i) {
        WebTab::SavedTab tab;
        stream >> tab;
@ -738,6 +746,8 @@ bool TabWidget::restoreState(const QByteArray &state)

    stream >> currentTab;

+    m_isRestoringState = false;
+
    setCurrentIndex(currentTab);
    currentTabChanged(currentTab);

--- a/src/lib/webview/tabwidget.h
+++ b/src/lib/webview/tabwidget.h
@ -131,9 +131,9 @@ private:
    int m_lastTabIndex;
    int m_lastBackgroundTabIndex;
    bool m_isClosingToLastTabIndex;
+    bool m_isRestoringState;

    TabBar* m_tabBar;
-
    QMenu* m_menuTabs;
    ToolButton* m_buttonListTabs;
    AddTabButton* m_buttonAddTab;
--- a/src/lib/webview/webinspectordockwidget.cpp
+++ b/src/lib/webview/webinspectordockwidget.cpp
@ -34,6 +34,16 @@ WebInspectorDockWidget::WebInspectorDockWidget(QupZilla* mainClass)
    show();
 }

+void WebInspectorDockWidget::toggleVisibility()
+{
+    if (isVisible()) {
+        close();
+    }
+    else {
+        show();
+    }
+}
+
 void WebInspectorDockWidget::close()
 {
    p_QupZilla->weView()->webTab()->setInspectorVisible(false);
--- a/src/lib/webview/webinspectordockwidget.h
+++ b/src/lib/webview/webinspectordockwidget.h
@ -44,6 +44,8 @@ public:
    explicit WebInspectorDockWidget(QupZilla* mainClass);
    ~WebInspectorDockWidget();

+    void toggleVisibility();
+
 signals:

 public slots:
--- a/src/lib/webview/webpage.cpp
+++ b/src/lib/webview/webpage.cpp
@ -22,11 +22,6 @@
 #include "downloadmanager.h"
 #include "webpluginfactory.h"
 #include "mainapplication.h"
-#ifdef NONBLOCK_JS_DIALOGS
-#include "ui_jsconfirm.h"
-#include "ui_jsalert.h"
-#include "ui_jsprompt.h"
-#endif
 #include "checkboxdialog.h"
 #include "widget.h"
 #include "globalfunctions.h"
@ -37,6 +32,14 @@
 #include "networkmanagerproxy.h"
 #include "adblockicon.h"

+#ifdef NONBLOCK_JS_DIALOGS
+#include "ui_jsconfirm.h"
+#include "ui_jsalert.h"
+#include "ui_jsprompt.h"
+
+#include <QPushButton>
+#endif
+
 #include <QDir>
 #include <QWebHistory>
 #include <QFileSystemWatcher>
@ -82,7 +85,7 @@ WebPage::WebPage(QupZilla* mainClass)

    connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJavaScriptObject()));

-#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
+#ifdef USE_QTWEBKIT_2_2
    connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(featurePermissionRequested(QWebFrame*, QWebPage::Feature)));
 #endif
 }
@ -286,7 +289,7 @@ void WebPage::windowCloseRequested()
    webView->closeView();
 }

-#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
+#ifdef USE_QTWEBKIT_2_2
 void WebPage::featurePermissionRequested(QWebFrame* frame, const QWebPage::Feature &feature)
 {
    // We should probably ask user here ... -,-
@ -294,6 +297,30 @@ void WebPage::featurePermissionRequested(QWebFrame* frame, const QWebPage::Featu
 }
 #endif

+bool WebPage::event(QEvent* event)
+{
+    if (event->type() == QEvent::Leave) {
+        // QWebPagePrivate::leaveEvent():
+        // Fake a mouse move event just outside of the widget, since all
+        // the interesting mouse-out behavior like invalidating scrollbars
+        // is handled by the WebKit event handler's mouseMoved function.
+
+        // However, its implementation fake mouse move event on QCursor::pos()
+        // position that is in global screen coordinates. So instead of
+        // really faking it, it just creates mouse move event somewhere in
+        // page. It can for example focus a link, and then link url gets
+        // stuck in status bar message.
+
+        // So we are faking mouse move event with proper coordinates for
+        // so called "just outside of the widget" position
+
+        QMouseEvent fakeEvent(QEvent::MouseMove, QPoint(0, -1), Qt::NoButton, Qt::NoButton, Qt::NoModifier);
+        return QWebPage::event(&fakeEvent);
+    }
+
+    return QWebPage::event(event);
+}
+
 void WebPage::setSSLCertificate(const QSslCertificate &cert)
 {
    //    if (cert != m_SslCert)
--- a/src/lib/webview/webpage.h
+++ b/src/lib/webview/webpage.h
@ -75,7 +75,6 @@ signals:
    void privacyChanged(bool status);

 protected slots:
-    QWebPage* createWindow(QWebPage::WebWindowType type);
    void handleUnsupportedContent(QNetworkReply* url);

    void progress(int prog);
@ -91,10 +90,14 @@ private slots:
    void downloadRequested(const QNetworkRequest &request);
    void windowCloseRequested();

-#if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 2, 0))
+#ifdef USE_QTWEBKIT_2_2
    void featurePermissionRequested(QWebFrame* frame, const QWebPage::Feature &feature);
 #endif

+protected:
+    bool event(QEvent* event);
+    QWebPage* createWindow(QWebPage::WebWindowType type);
+
 private:
    virtual bool supportsExtension(Extension extension) const;
    virtual bool extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output = 0);
--- a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
+++ b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
@ -20,6 +20,8 @@ RESOURCES = akn_res.qrc
 TRANSLATIONS = \
    translations/cs_CZ.ts \
    translations/de_DE.ts \
+    translations/id_ID.ts \
+    translations/ja_JP.ts \
    translations/nl_NL.ts \
    translations/sr_BA.ts \
    translations/sr_RS.ts \
--- a/src/plugins/AccessKeysNavigation/akn_plugin.cpp
+++ b/src/plugins/AccessKeysNavigation/akn_plugin.cpp
@ -18,6 +18,7 @@
 #include "akn_plugin.h"
 #include "akn_handler.h"
 #include "akn_settings.h"
+#include "mainapplication.h"
 #include "pluginproxy.h"
 #include "qupzilla.h"

--- a/src/plugins/AccessKeysNavigation/akn_res.qrc
+++ b/src/plugins/AccessKeysNavigation/akn_res.qrc
@ -4,6 +4,8 @@
        <file>data/copyright</file>
        <file>locale/cs_CZ.qm</file>
        <file>locale/de_DE.qm</file>
+        <file>locale/id_ID.qm</file>
+        <file>locale/ja_JP.qm</file>
        <file>locale/nl_NL.qm</file>
        <file>locale/sr_BA.qm</file>
        <file>locale/sr_RS.qm</file>
--- a/src/plugins/AccessKeysNavigation/translations/ja_JP.ts
+++ b/src/plugins/AccessKeysNavigation/translations/ja_JP.ts
@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja_JP">
+<context>
+    <name>AKN_Settings</name>
+    <message>
+        <location filename="../akn_settings.ui" line="14"/>
+        <source>Access Keys Navigation</source>
+        <translation>Access Keys Navigation</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="20"/>
+        <source>&lt;h1&gt;Access Keys Navigation&lt;/h1&gt;</source>
+        <translation>&lt;h1&gt;Access Keys Navigation&lt;/h1&gt;</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="33"/>
+        <source>Ctrl</source>
+        <translation>Ctrl</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="38"/>
+        <source>Alt</source>
+        <translation>Alt</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="43"/>
+        <source>Shift</source>
+        <translation>Shift</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="51"/>
+        <source>Double press</source>
+        <translation>キーのダブルプレス</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="58"/>
+        <source>Key for showing access keys:</source>
+        <translation>現在のアクセスキーに対応するキー:</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="103"/>
+        <source>License</source>
+        <translation>ライセンス</translation>
+    </message>
+</context>
+</TS>
--- a/src/plugins/MouseGestures/MouseGestures.pro
+++ b/src/plugins/MouseGestures/MouseGestures.pro
@ -1,4 +1,4 @@
-QT += network webkit
+QT += webkit
 TARGET = MouseGestures
 os2: TARGET = MouseGes

@ -28,6 +28,8 @@ RESOURCES = mousegestures.qrc
 TRANSLATIONS = \
    translations/cs_CZ.ts \
    translations/de_DE.ts \
+    translations/id_ID.ts \
+    translations/ja_JP.ts \
    translations/nl_NL.ts \
    translations/sk_SK.ts \
    translations/sr_BA.ts \
--- a/src/plugins/MouseGestures/mousegestures.qrc
+++ b/src/plugins/MouseGestures/mousegestures.qrc
@ -14,6 +14,8 @@
        <file>data/copyright</file>
        <file>locale/cs_CZ.qm</file>
        <file>locale/de_DE.qm</file>
+        <file>locale/id_ID.qm</file>
+        <file>locale/ja_JP.qm</file>
        <file>locale/nl_NL.qm</file>
        <file>locale/sk_SK.qm</file>
        <file>locale/sr_BA.qm</file>
--- a/src/plugins/MouseGestures/mousegesturesplugin.cpp
+++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp
@ -18,6 +18,7 @@
 #include "mousegesturesplugin.h"
 #include "pluginproxy.h"
 #include "mousegestures.h"
+#include "mainapplication.h"
 #include "qupzilla.h"

 #include <QTranslator>
--- a/src/plugins/MouseGestures/translations/ja_JP.ts
+++ b/src/plugins/MouseGestures/translations/ja_JP.ts
@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja_JP">
+<context>
+    <name>MouseGesturesSettingsDialog</name>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="14"/>
+        <source>Mouse Gestures</source>
+        <translation>Mouse Gestures</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="42"/>
+        <source>&lt;h1&gt;Mouse Gestures&lt;/h1&gt;</source>
+        <translation>&lt;h1&gt;Mouse Gestures&lt;/h1&gt;</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="64"/>
+        <source>Press and hold the middle mouse button and move your mouse in the indicated directions.</source>
+        <translation>マウスのホイールボタンをクリックしながら指示された方向にマウスを動かしてください。</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="111"/>
+        <source>&lt;b&gt;Stop&lt;/b&gt;&lt;br/&gt;Stop loading page</source>
+        <translation>&lt;b&gt;中止&lt;/b&gt;&lt;br/&gt;ページの読み込みを中止します</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="125"/>
+        <source>&lt;b&gt;New tab&lt;/b&gt;&lt;br/&gt;Open new tab</source>
+        <translation>&lt;b&gt;新しいタブ&lt;/b&gt;&lt;br/&gt;新しいタブを開きます</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="139"/>
+        <source>&lt;b&gt;Back&lt;/b&gt;&lt;br/&gt;Go back in history</source>
+        <translation>&lt;b&gt;戻る&lt;/b&gt;&lt;br/&gt;履歴をもとに戻ります</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="153"/>
+        <source>&lt;b&gt;Forward&lt;/b&gt;&lt;br/&gt;Go forward in history</source>
+        <translation>&lt;b&gt;進む&lt;/b&gt;&lt;br/&gt;履歴をもとに進みます</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="173"/>
+        <source>&lt;b&gt;Reload&lt;/b&gt;&lt;br/&gt;Reload page</source>
+        <translation>&lt;b&gt;更新&lt;/b&gt;&lt;br/&gt;ページを更新します</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="187"/>
+        <source>&lt;b&gt;Close tab&lt;/b&gt;&lt;br/&gt;Close current tab</source>
+        <translation>&lt;b&gt;タブを閉じる&lt;/b&gt;&lt;br/&gt;現在のタブを閉じます</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="201"/>
+        <source>&lt;b&gt;Home&lt;/b&gt;&lt;br/&gt;Go to homepage</source>
+        <translation>&lt;b&gt;ホーム&lt;/b&gt;&lt;br/&gt;ホームページへ移動します</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="225"/>
+        <source>License</source>
+        <translation>ライセンス</translation>
+    </message>
+</context>
+</TS>
--- a/src/plugins/TestPlugin/TestPlugin.pro
+++ b/src/plugins/TestPlugin/TestPlugin.pro
@ -3,7 +3,7 @@
 # Project created by QtCreator 2011-02-13T10:23:13
 #
 #-------------------------------------------------
-QT += network webkit
+QT += webkit
 TARGET = TestPlugin
 # OS/2 allows only 8 chars in TARGET
 os2: TARGET = TestPlug
--- a/src/plugins/TestPlugin/testplugin.cpp
+++ b/src/plugins/TestPlugin/testplugin.cpp
@ -19,6 +19,7 @@
 #include "qupzilla.h"
 #include "webview.h"
 #include "pluginproxy.h"
+#include "mainapplication.h"

 #include <QTranslator>
 #include <QPushButton>
--- a/translations/cs_CZ.ts
+++ b/translations/cs_CZ.ts
--- a/translations/de_DE.ts
+++ b/translations/de_DE.ts
--- a/translations/el_GR.ts
+++ b/translations/el_GR.ts
--- a/translations/empty.ts
+++ b/translations/empty.ts
@ -27,10 +27,6 @@
        <source>&lt;b&gt;WebKit version %1&lt;/b&gt;&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
@ -846,17 +842,6 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>CloseDialog</name>
-    <message>
-        <source>There are still open tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Don&apos;t ask again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
    <name>CookieManager</name>
    <message>
@ -2607,10 +2592,6 @@
        <source>Start Private Browsing</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit QupZilla?</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>You have successfully added RSS feed &quot;%1&quot;.</source>
        <translation type="unfinished"></translation>
@ -2639,6 +2620,19 @@
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>There are still %1 open tabs and your session won&apos;t be stored. 
+Are you sure to quit QupZilla?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t ask again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There are still open tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QupZillaSchemeReply</name>
@ -2918,14 +2912,6 @@
        <source>Portable build</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>If you are experiencing problems with QupZilla, please try to disable all extenions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page contains information about QupZilla&apos;s current configuration, all relevant information for troubleshooting. Please include these information when sending bug reports.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Extensions</source>
        <translation type="unfinished"></translation>
@ -2934,6 +2920,18 @@
        <source>No available extensions.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>If you are experiencing problems with QupZilla, please try to disable all extensions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page contains information about QupZilla&apos;s current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>RSSManager</name>
@ -3412,10 +3410,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
        <source>Paste</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Select All</source>
        <translation type="unfinished"></translation>
@ -3784,11 +3778,11 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>JavaScript alert - %1</source>
+        <source>Choose file...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Choose file...</source>
+        <source>JavaScript alert</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
--- a/translations/es_ES.ts
+++ b/translations/es_ES.ts
--- a/translations/fr_FR.ts
+++ b/translations/fr_FR.ts
--- a/translations/homepage/cs_CZ.php
+++ b/translations/homepage/cs_CZ.php
@ -33,7 +33,7 @@ $library_text = "QupZilla sjednocuje záložky, historii a rss čtečku do jedno
 S integrovanou čtečkou rss kanálů můžete být informován aktualitami z Vašich oblíbených stránek. QupZilla také zvládne importovat záložky z jiných prohlížečů.";
 $adblock_header = "Integrovaný AdBlock";
 $adblock_text = "Také nenávidíte stránky plné reklam? Zbytečně Vás zdržují při načítání stránek? Jediná věc kterou musíte s QupZillou udělat, je aktualizovat EasyList nebo přidat Vašee vlastní pravidla a můžete surfovat bez reklam.";
-$speeddial_header = "Rychlý přístup";
+$speeddial_header = "Rychlá volba (Speed dial)";
 $speeddial_text = "Tento populární doplněk je konečně dostupný i pro uživatele QupZilly! Nyní máte rychlý přístup k oblíbeným záložkám na jediné stránce. Samozřejmostí je plná podpora řazení přetažením a načítání náhledů stránek.";
 $devnews_header = "Vývojové novinky";
 $feed_loading = "Načítám...";
@ -44,11 +44,12 @@ $other_linux = "Ostatní Linux";
 $source_code = "Zdrojový kód";
 $choose_os = "Zvolte prosím operační systém";
 $windows_text = "32bit a 64bit Windows instalátor lze stáhnout kliknutím na odkazy níže";
-$ubuntu_text = "Oneiric, Natty a Maverick uživatelé mohou nainstalovat QupZillu zadáním těchto příkazů";
+$ubuntu_text = "Ubuntu Precise, Oneiric, Natty a Maverick uživatelé mohou nainstalovat QupZillu zadáním těchto příkazů";
 $for_development_version = "pro vývojovou verzi:";
 $packages_text = "32bit a 64bit balíčky";
 $tarballs_text = "32bit a 64bit předkompilované tarbally";
-$can_be_downloaded = "lze stáhnout kliknutím na odkazy dole";
+$qupzilla_for_text = "QupZillu pro";
+$can_be_downloaded = "lze stáhnout kliknutím na odkazy níže";
 $source_text = "Zdrojový kód můžete získat klonováním repositáře (pokud máte nainstalovaný git)";
 $source_text2 = "Můžete se také podívat na zdrojový kód online nebo ho stáhnout v zip archivu";
 $view_source = "zobrazit kód na github.com";
--- a/translations/homepage/de_DE.php
+++ b/translations/homepage/de_DE.php
@ -45,10 +45,11 @@ $other_linux = "Weitere";
 $source_code = "Quellcode";
 $choose_os = "Bitte wählen Sie Ihr Betriebssystem aus";
 $windows_text = "Das 32bit und 64bit Windows Installationsprogramm kann durch Klick auf die untenstehenden Links heruntergeladen werden";
-$ubuntu_text = "Ubuntu Oneiric, Natty und Maverick Nutzer können QupZilla durch Ausführen der folgenden Befehle installieren:";
+$ubuntu_text = "Ubuntu Precise, Oneiric, Natty und Maverick Nutzer können QupZilla durch Ausführen der folgenden Befehle installieren:";
 $for_development_version = "Zum Installieren der aktuellen Entwicklungsversion führen Sie diesen Befehl aus:";
 $packages_text = "32bit und 64bit Pakete";
 $tarballs_text = "32bit und 64bit vorkompilierte TAR-Archive";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "können durch Klick auf die untenstehenden Links heruntergeladen werden";
 $source_text = "Sie können den Quellcode durch Klonen des Repositoriums erhalten (wenn Sie git installiert haben)";
 $source_text2 = "Sie können sich den Quellcode auch online anschauen und als ZIP-Archiv herunterladen";
--- a/translations/homepage/el_GR.php
+++ b/translations/homepage/el_GR.php
@ -45,10 +45,11 @@ $other_linux = "Άλλα Linux";
 $source_code = "Πηγαίος κώδικας";
 $choose_os = "Παρακαλώ επιλέξτε το λειτουργικό σας σύστημα";
 $windows_text = "Προγράμματα εγκατάστασης για 32bit και 64bit Windows μπορούν να ληφθούν κάνοντας κλικ στους παρακάτω συνδέσμους";
-$ubuntu_text = "Οι χρήστες Oneiric, Natty and Maverick μπορούν να εγκαταστήσουν το QupZilla τρέχοντας αυτές τις εντολές";
+$ubuntu_text = "Οι χρήστες Precise, Oneiric, Natty and Maverick μπορούν να εγκαταστήσουν το QupZilla τρέχοντας αυτές τις εντολές";
 $for_development_version = "για την έκδοση σε ανάπτυξη:";
 $packages_text = "πακέτα 32bit και 64bit";
 $tarballs_text = "32bit και 64bit precompiled tarballs";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "μπορούν να ληφθούν κάνοντας κλικ στους παρακάτω συνδέσμους";
 $source_text = "Μπορείτε να πάρετε τον πηγαίο κώδικα κλωνοποιώντας το repository (αν έχετε το git εγκατεστημένο)";
 $source_text2 = "Μπορείτε επίσης να τον δείτε online και να τον κατεβάσετε σε zip αρχείο";
--- a/translations/homepage/en_US.php
+++ b/translations/homepage/en_US.php
@ -45,10 +45,11 @@ $other_linux = "Other Linux";
 $source_code = "Source Code";
 $choose_os = "Please choose your operating system";
 $windows_text = "32bit and 64bit Windows installers can be downloaded by clicking on links below";
-$ubuntu_text = "Oneiric, Natty and Maverick users can install QupZilla by running these commands";
+$ubuntu_text = "Ubuntu Precise, Oneiric, Natty and Maverick users can install QupZilla by running these commands";
 $for_development_version = "for development version:";
 $packages_text = "32bit and 64bit packages";
 $tarballs_text = "32bit and 64bit precompiled tarballs";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "can be downloaded by clicking on links below";
 $source_text = "You can get source code by cloning repository (if you have git installed)";
 $source_text2 = "You can also view it online and download it in zip archive";
--- a/translations/homepage/es_ES.php
+++ b/translations/homepage/es_ES.php
@ -45,10 +45,11 @@ $other_linux = "Otro Linux";
 $source_code = "Código fuente";
 $choose_os = "Por favor, eliga su sistema operativo";
 $windows_text = "Los instaladores de Windows 32bit y 64bit pueden descargarse haciendo click en los enlaces de abajo";
-$ubuntu_text = "Los usuarios de Oneiric, Natty y Maverick pueden instalar QupZilla ejecutando estos comandos:";
+$ubuntu_text = "Los usuarios de Precise, Oneiric, Natty y Maverick pueden instalar QupZilla ejecutando estos comandos:";
 $for_development_version = "Para la versión en desarrollo:";
 $packages_text = "Paquetes de 32bit y 64bit";
 $tarballs_text = "Archivos tar precompilados en 32bit y 64bit";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "pueden descargarse haciendo click en los enlaces de abajo";
 $source_text = "Puede obtener el código fuente clonando el repositorio (si tiene git instalado)";
 $source_text2 = "También puede verlo en línea y descargarlo en un archivo zip";
--- a/translations/homepage/fr_FR.php
+++ b/translations/homepage/fr_FR.php
@ -45,10 +45,11 @@ $other_linux = "Autres distributions linux";
 $source_code = "Code Source";
 $choose_os = "Choisissez votre système d'exploitation";
 $windows_text = "Les versions 32 et 64 bits peuvent être téléchargés en cliquant sur les liens suivants";
-$ubuntu_text = "Les utilisateurs d'Oneiric, Natty et Maverick peuvent installer QupZilla en exécutant ces commandes";
+$ubuntu_text = "Les utilisateurs d'Ubuntu Precise, Oneiric, Natty et Maverick peuvent installer QupZilla en exécutant ces commandes";
 $for_development_version = "Pour les versions de développement:";
 $packages_text = "Paquets 32 et 64 bits";
 $tarballs_text = "Tarballs 32 et 64 bits précompilés";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "Peuvent être téléchargées en cliquant sur les liens suivants";
 $source_text = "Vous pouvez récupérer le code source en clonant le dépôt (si vous avez installé git)";
 $source_text2 = "Vous pouvez aussi le consulter en ligne et le télécharger au format zip";
--- a/translations/homepage/id_ID.php
+++ b/translations/homepage/id_ID.php
@ -45,10 +45,11 @@ $other_linux = "Linux Lainnya";
 $source_code = "Kode Sumber";
 $choose_os = "Silakan pilih sistem operasi anda";
 $windows_text = "Instalatur Windows 32bit dan 64bit dapat diunduh dengan mengklik tautan di bawah ini";
-$ubuntu_text = "Pengguna Oneiric, Natty dan Maverick dapat menginstal QupZilla dengan menjalankan perintah berikut ini";
+$ubuntu_text = "Pengguna Precise, Oneiric, Natty dan Maverick dapat menginstal QupZilla dengan menjalankan perintah berikut ini";
 $for_development_version = "untuk versi pengembangan:";
 $packages_text = "Paket 32bit dan 64bit";
 $tarballs_text = "Prakompilasi Tarball 32bit dan 64bit";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "dapat diunduh dengan mengklik tautan di bawah ini";
 $source_text = "Anda dapat mengunduh kode sumber dengan mengkloning repositori (jika anda sudah menginstal git)";
 $source_text2 = "Anda juga dapat melihatnya secara online dan mengunduhnya dalam arsip zip";
--- a/translations/homepage/it_IT.php
+++ b/translations/homepage/it_IT.php
@ -45,10 +45,11 @@ $other_linux = "Altre distribuzioni Linux";
 $source_code = "Codice sorgente";
 $choose_os = "Per favore, scegli il tuo sistema operativo";
 $windows_text = "I pacchetti a 32bit e 64bit per Windows possono essere scaricati cliccando sui link qui sotto";
-$ubuntu_text = "Gli utenti di Ubuntu Oneiric, Natty e Maverick possono installare QupZilla eseguendo questi comandi";
+$ubuntu_text = "Gli utenti di Ubuntu Precise, Oneiric, Natty e Maverick possono installare QupZilla eseguendo questi comandi";
 $for_development_version = "per la versione in sviluppo:";
 $packages_text = "pacchetti a 32bit e 64bit";
 $tarballs_text = "Archivi precompilati a 32bit e 64bit";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "possono essere scaricati cliccando sui link qui sotto";
 $source_text = "Puoi ottenere i codice sorgente clonando il repository (se hai git installato)";
 $source_text2 = "Puoi anche visionarlo online e scaricarlo come archivio zip";
--- a/translations/homepage/ja_JP.php
+++ b/translations/homepage/ja_JP.php
@ -45,10 +45,11 @@ $other_linux = "Other Linux";
 $source_code = "Source Code";
 $choose_os = "あなたのお使いのOSを選択してください";
 $windows_text = "32bitおよび64bitのWindows向けインストーラーは以下のリンクからダウンロードできます";
-$ubuntu_text = "Oneiric、NattyそしてMaverickのユーザーは以下のコマンドをお使い下さい";
+$ubuntu_text = "Precise, Oneiric、NattyそしてMaverickのユーザーは以下のコマンドをお使い下さい";
 $for_development_version = "for development version:";
 $packages_text = "32bit and 64bit packages";
 $tarballs_text = "32bit and 64bit precompiled tarballs";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "以下のリンクからダウンロードできます";
 $source_text = "gitをインストールした環境ならリポジトリからソースをcloneできます";
 $source_text2 = "You can also view it online and download it in zip archive";
@ -69,4 +70,4 @@ $creators_text = "プロジェクトオーナー、メンテナー、メイン
 コーディングや翻訳、サポートで貢献のあった方のリストも<a href='https://github.com/nowrep/QupZilla/blob/master/AUTHORS'>ここ</a>から参照できます [at github].<br/><br/>IRCチャンネルにも参加できます <b>#qupzilla</b> irc.freenode.netでQupZillaにかかわる人々とチャットしましょう。";
 $share_with_friends = "Share with Friends!";
 $share_with_friends_text = "QupZillaを気に入っていただけましたか？ ぜひお友達とシェアしてください！";
-?>
+?>
--- a/translations/homepage/ka_GE.php
+++ b/translations/homepage/ka_GE.php
@ -45,10 +45,11 @@ $other_linux = "Linux-ის სხვა დისტრიბუცია";
 $source_code = "წყაროს კოდი";
 $choose_os = "გთხოვთ აირჩიეთ თქვენი ოპერაციული სისტემა";
 $windows_text = "Windows-ისთვის 32 და 64 ბიტიანი ინსტალატორების ჩამოტვირთვა შეგიძლიათ ქვემოთ მოცემულ ბმულებზე დაწკაპუნებით";
-$ubuntu_text = "Oneiric-ის, Natty-ის და Maverick-ის მოხმარებლებს QupZilla-ს დაყენება შემდეგი ბრძანებების გაშვებით შეგიძლიათ";
+$ubuntu_text = "Precise-ის, Oneiric-ის, Natty-ის და Maverick-ის მოხმარებლებს QupZilla-ს დაყენება შემდეგი ბრძანებების გაშვებით შეგიძლიათ";
 $for_development_version = "დეველოპერული ვერსიისთვის:";
 $packages_text = "32 და 64 ბიტიანი პაკეტები";
 $tarballs_text = "32 და 64 ბიტიანი წინასწარ კომპილირებული  არქივების";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "ჩამოტვირთვა შესაძლებელია ქვემოთ მოცემულ ბმულებზე დაწკაპუნებით";
 $source_text = "თქვენ შეგიძლიათ მიიღოთ წყაროს კოდის რეპოზიტორის კლონირებით (თუ git გიყენიათ)";
 $source_text2 = "თქვენ ასევე შეგიძლიათ ნახოთ ის ქსელში და ჩამოტვირთოთ zip არქივი";
--- a/translations/homepage/nl_NL.php
+++ b/translations/homepage/nl_NL.php
@ -45,10 +45,11 @@ $other_linux = "Overige Linux";
 $source_code = "Broncode";
 $choose_os = "Kies uw besturingssysteem";
 $windows_text = "32-bit en 64-bit Windows-installaties kunnen worden gedownload door te klikken op onderstaande links";
-$ubuntu_text = "Oneiric, Natty en Maverick-gebruikers kunnen QupZilla installeren door deze commando's te gebruken";
+$ubuntu_text = "Precise, Oneiric, Natty en Maverick-gebruikers kunnen QupZilla installeren door deze commando's te gebruken";
 $for_development_version = "voor ontwikkelings-versie:";
 $packages_text = "32-bit en 64-bit-pakketten";
 $tarballs_text = "32-bit en 64-bit voorgecompileerde tarballs";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "kunnen worden gedownload door op onderstaande links te klikken";
 $source_text = "U kunt de broncode verkrijgen door de pakketbron te klonen (wanneer u Git heeft geinstalleerd)";
 $source_text2 = "U kunt het tevens online bekijken en downloaden in zip-archiefformaat";
--- a/translations/homepage/pl_PL.php
+++ b/translations/homepage/pl_PL.php
@ -44,10 +44,11 @@ $other_linux = "Inne z rodziny Linux";
 $source_code = "Kod Źródłowy";
 $choose_os = "Wybierz system operacyjny";
 $windows_text = "32bit i 64bit instalator dla systemu Windows można pobrać klikając na linki poniżej";
-$ubuntu_text = "Użytkownicy Ubuntu Oneric, Natty i Maverick mogą zainstalować QupZille wykonując komendy"; 
+$ubuntu_text = "Użytkownicy Ubuntu Precise, Oneric, Natty i Maverick mogą zainstalować QupZille wykonując komendy"; 
 $for_development_version = "wersja developerska:";
 $packages_text = "Paczki 32bit i 64bit";
 $tarballs_text = "32bit and 64bit precompiled tarballs";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "można pobrać klikająć w link poniżej";
 $source_text = "Możesz pobrać kod źródłowy, klonując repozytorium (jeżeli ma się zainstalowany git)";
 $view_source = "pokaż źródła na github.com";
--- a/translations/homepage/pt_PT.php
+++ b/translations/homepage/pt_PT.php
@ -42,10 +42,11 @@ $other_linux = "Outros sistemas linux";
 $source_code = "Código fonte";
 $choose_os = "Escolha o seu sistema operativo";
 $windows_text = "Pode transferir as versões 32 bits e 64 bits para o Windows nas ligações abaixo";
-$ubuntu_text = "Os utilizadores do Ubuntu Oneiric, Natty e Maverick podem instalar o QupZilla através destes comandos";
+$ubuntu_text = "Os utilizadores do Ubuntu Precise, Oneiric, Natty e Maverick podem instalar o QupZilla através destes comandos";
 $for_development_version = "Versões de desenvolvimento:";
 $packages_text = "Os pacotes 32 bits e 64 bits";
 $tarballs_text = "Os pacotes pré-compilados 32 bits e 64 bits";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "podem ser transferidos nas ligações abaixo";
 $source_text = "Pode obter o código fonte clonando o repositório (se tiver o git instalado)";
 $source_text2 = "Também pode ver o código fonte no github e/ou transferir o código no formato .zip";
--- a/translations/homepage/ru_RU.php
+++ b/translations/homepage/ru_RU.php
@ -45,10 +45,11 @@ $other_linux = "Другой дистрибутив Linux";
 $source_code = "Исходный код";
 $choose_os = "Пожалуйста, выберите вашу операционную систему";
 $windows_text = "32-х битный и 64-х битный установщик для Windows можно скачать кликнув по ссылке ниже";
-$ubuntu_text = "Пользователи Oneiric, Natty и Maverick могут установить QupZilla выполнив эти команды";
+$ubuntu_text = "Пользователи Precise, Oneiric, Natty и Maverick могут установить QupZilla выполнив эти команды";
 $for_development_version = "Версия для разработки:";
 $packages_text = "32-х и 64-х битные пакеты";
 $tarballs_text = "32-х и 64-х битные предварительно скомпилированные архивы";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "могут быть скачаны по ссылке ниже";
 $source_text = "Вы можете получить исходный код, скопировав репозиторий ( если у вас установлен git)";
 $source_text2 = "Также можно просмотреть его онлайн и скачать в архиве zip";
--- a/translations/homepage/sr_BA.php
+++ b/translations/homepage/sr_BA.php
@ -45,10 +45,11 @@ $other_linux = "Остали Линукси";
 $source_code = "Изворни кôд";
 $choose_os = "Изаберите ваш оперативни систем";
 $windows_text = "Можети преузети 32 битне и 64 битне Виндоуз инсталатере кликом на везе испод";
-$ubuntu_text = "Oneiric, Natty и Maverick корисници могу инсталирати Капзилу покретањем ових наредби";
+$ubuntu_text = "Precise, Oneiric, Natty и Maverick корисници могу инсталирати Капзилу покретањем ових наредби";
 $for_development_version = "за издање у развоју:";
 $packages_text = "32 битни и 64 битни пакети";
 $tarballs_text = "32 битни и 64 битни компилирани архиви пакета";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "могу бити преузети кликом на везе испод";
 $source_text = "Изворни кôд можете да набавите тако што ћете клонирати ризницу (ако имате инсталиран гит)";
 $source_text2 = "Такође га можете прегледати на мрежи и преузети као зип архиву";
--- a/translations/homepage/sr_RS.php
+++ b/translations/homepage/sr_RS.php
@ -45,10 +45,11 @@ $other_linux = "Остали Линукси";
 $source_code = "Изворни кôд";
 $choose_os = "Изаберите ваш оперативни систем";
 $windows_text = "Можети преузети 32 битне и 64 битне Виндоуз инсталатере кликом на везе испод";
-$ubuntu_text = "Oneiric, Natty и Maverick корисници могу инсталирати Капзилу покретањем ових наредби";
+$ubuntu_text = "Precise, Oneiric, Natty и Maverick корисници могу инсталирати Капзилу покретањем ових наредби";
 $for_development_version = "за издање у развоју:";
 $packages_text = "32 битни и 64 битни пакети";
 $tarballs_text = "32 битни и 64 битни компилирани архиви пакета";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "могу бити преузети кликом на везе испод";
 $source_text = "Изворни кôд можете да набавите тако што ћете клонирати ризницу (ако имате инсталиран гит)";
 $source_text2 = "Такође га можете прегледати на мрежи и преузети као зип архиву";
--- a/translations/homepage/zh_TW.php
+++ b/translations/homepage/zh_TW.php
@ -45,10 +45,11 @@ $other_linux = "其他的Linux";
 $source_code = "原始碼";
 $choose_os = "選擇您所使用的作業系統";
 $windows_text = "點擊下面的連結下載32位元及64位元的Windows的安裝包";
-$ubuntu_text = "Ubuntu的Oneiric、Natty以及Maverick使用者可以藉由下列指令安裝QupZilla";
+$ubuntu_text = "Ubuntu的Precise、Oneiric、Natty以及Maverick使用者可以藉由下列指令安裝QupZilla";
 $for_development_version = "開發中版本：";
 $packages_text = "32位元以及64位元的套件包";
 $tarballs_text = "32位元以及64位元的預編譯tarballs";
+$qupzilla_for_text = "QupZilla for";
 $can_be_downloaded = "點擊以下連結來下載它們。";
 $source_text = "您可以從Repo中取得原始碼(如果您已經安裝git的話)";
 $source_text2 = "您也可以在線上觀看並下載ZIP壓縮檔";
--- a/translations/id_ID.ts
+++ b/translations/id_ID.ts
--- a/translations/it_IT.ts
+++ b/translations/it_IT.ts
--- a/translations/ja_JP.ts
+++ b/translations/ja_JP.ts
@ -30,7 +30,7 @@
    <message>
        <source>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</source>
        <translatorcomment>そのまま</translatorcomment>
-        <translation>&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;All rights reserved.&lt;br/&gt;</translation>
    </message>
    <message>
        <source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
@ -864,11 +864,11 @@
    <message>
        <source>There are still open tabs</source>
        <translatorcomment>保留</translatorcomment>
-        <translation>まだ開いているタブがあります</translation>
+        <translation type="obsolete">まだ開いているタブがあります</translation>
    </message>
    <message>
        <source>Don&apos;t ask again</source>
-        <translation>次回からは表示しない</translation>
+        <translation type="obsolete">次回からは表示しない</translation>
    </message>
 </context>
 <context>
@ -2699,7 +2699,7 @@
    <message>
        <source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit QupZilla?</source>
        <translatorcomment>意訳。保留。</translatorcomment>
-        <translation>%1個のタブが開いています。セッションは保存されませんがQupZillaを終了しますか?</translation>
+        <translation type="obsolete">%1個のタブが開いています。セッションは保存されませんがQupZillaを終了しますか?</translation>
    </message>
    <message>
        <source>You have successfully added RSS feed &quot;%1&quot;.</source>
@ -2730,6 +2730,19 @@
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
        <translation>&lt;b&gt;QupZillaがクラッシュしてしまいました(/_;)&lt;/b&gt;&gt;&lt;br/&gt;前回のQupZillaのセッションは予期せず終了されました。申し訳ありません、前回のセッションを復元しますか?</translation>
    </message>
+    <message>
+        <source>There are still %1 open tabs and your session won&apos;t be stored. 
+Are you sure to quit QupZilla?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t ask again</source>
+        <translation type="unfinished">次回からは表示しない</translation>
+    </message>
+    <message>
+        <source>There are still open tabs</source>
+        <translation type="unfinished">まだ開いているタブがあります</translation>
+    </message>
 </context>
 <context>
    <name>QupZillaSchemeReply</name>
@ -3035,11 +3048,11 @@
    </message>
    <message>
        <source>If you are experiencing problems with QupZilla, please try to disable all extenions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
-        <translation>QupZillaを使用中に問題が発生した場合はまずエクステンションを無効にしてみてください。&lt;br/&gt;それでも問題が解決されない場合以下のフォームに書き込んでください:</translation>
+        <translation type="obsolete">QupZillaを使用中に問題が発生した場合はまずエクステンションを無効にしてみてください。&lt;br/&gt;それでも問題が解決されない場合以下のフォームに書き込んでください:</translation>
    </message>
    <message>
        <source>This page contains information about QupZilla&apos;s current configuration, all relevant information for troubleshooting. Please include these information when sending bug reports.</source>
-        <translation>このページはQupZillaの現在の設定について表示しています。これらの情報はトラブルシューティングに非常に有用ですので、バグレポート送信の際にはこれらの情報を一緒に送信してください。</translation>
+        <translation type="obsolete">このページはQupZillaの現在の設定について表示しています。これらの情報はトラブルシューティングに非常に有用ですので、バグレポート送信の際にはこれらの情報を一緒に送信してください。</translation>
    </message>
    <message>
        <source>Extensions</source>
@ -3049,6 +3062,18 @@
        <source>No available extensions.</source>
        <translation>エクステンションが見つかりません。</translation>
    </message>
+    <message>
+        <source>If you are experiencing problems with QupZilla, please try to disable all extensions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">閉じる</translation>
+    </message>
+    <message>
+        <source>This page contains information about QupZilla&apos;s current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>RSSManager</name>
@ -3542,7 +3567,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
    </message>
    <message>
        <source>Delete</source>
-        <translation>削除</translation>
+        <translation type="obsolete">削除</translation>
    </message>
    <message>
        <source>Select All</source>
@ -3929,12 +3954,16 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
    <message>
        <source>JavaScript alert - %1</source>
        <translatorcomment>javascript alertで出てくる奴→警告、要再考。</translatorcomment>
-        <translation> 警告- %1</translation>
+        <translation type="obsolete"> 警告- %1</translation>
    </message>
    <message>
        <source>Choose file...</source>
        <translation>ファイルの選択...</translation>
    </message>
+    <message>
+        <source>JavaScript alert</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WebSearchBar</name>
--- a/translations/ka_GE.ts
+++ b/translations/ka_GE.ts
@ -29,7 +29,7 @@
    </message>
    <message>
        <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;ყველა უფლება დაცულია.&lt;br/&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;ყველა უფლება დაცულია.&lt;br/&gt;</translation>
    </message>
    <message>
        <source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
@ -850,11 +850,11 @@
    <name>CloseDialog</name>
    <message>
        <source>There are still open tabs</source>
-        <translation>რამდენიმე ჩანართი კვლავ გახსნილია</translation>
+        <translation type="obsolete">რამდენიმე ჩანართი კვლავ გახსნილია</translation>
    </message>
    <message>
        <source>Don&apos;t ask again</source>
-        <translation>მეტი აღარ შემეკითხო</translation>
+        <translation type="obsolete">მეტი აღარ შემეკითხო</translation>
    </message>
 </context>
 <context>
@ -2639,7 +2639,7 @@
    </message>
    <message>
        <source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit QupZilla?</source>
-        <translation>თქვენ კვლავ გაქვთ %1 გახსნილი ჩანართი და თქვენი სესია არ შეინახება. დარწმუნებული ხართ რომ QupZilla-დან გამოსვლა გსურთ?</translation>
+        <translation type="obsolete">თქვენ კვლავ გაქვთ %1 გახსნილი ჩანართი და თქვენი სესია არ შეინახება. დარწმუნებული ხართ რომ QupZilla-დან გამოსვლა გსურთ?</translation>
    </message>
    <message>
        <source>You have successfully added RSS feed &quot;%1&quot;.</source>
@ -2669,6 +2669,19 @@
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
        <translation type="unfinished">&lt;b&gt;QupZilla ავარიუალად დაიხურა :-(&lt;/b&gt;&lt;br/&gt;უი, QupZilla-ს ბოლო სესია მოულოდნელად შეწყდა. ბოდიშს გიხდით ამისათვის. გსურთ ბოლო შენახული მდგომარებოის აღდგენა ვცადოთ?</translation>
    </message>
+    <message>
+        <source>There are still %1 open tabs and your session won&apos;t be stored. 
+Are you sure to quit QupZilla?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t ask again</source>
+        <translation type="unfinished">მეტი აღარ შემეკითხო</translation>
+    </message>
+    <message>
+        <source>There are still open tabs</source>
+        <translation type="unfinished">რამდენიმე ჩანართი კვლავ გახსნილია</translation>
+    </message>
 </context>
 <context>
    <name>QupZillaSchemeReply</name>
@ -2964,14 +2977,6 @@
        <source>Portable build</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>If you are experiencing problems with QupZilla, please try to disable all extenions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page contains information about QupZilla&apos;s current configuration, all relevant information for troubleshooting. Please include these information when sending bug reports.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Extensions</source>
        <translation type="unfinished"></translation>
@ -2980,6 +2985,18 @@
        <source>No available extensions.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>If you are experiencing problems with QupZilla, please try to disable all extensions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">დახურვა</translation>
+    </message>
+    <message>
+        <source>This page contains information about QupZilla&apos;s current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>RSSManager</name>
@ -3461,7 +3478,7 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
    </message>
    <message>
        <source>Delete</source>
-        <translation>წაშლა</translation>
+        <translation type="obsolete">წაშლა</translation>
    </message>
    <message>
        <source>Select All</source>
@ -3837,12 +3854,16 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
    </message>
    <message>
        <source>JavaScript alert - %1</source>
-        <translation>JavaScript გაფრთხილება - %1</translation>
+        <translation type="obsolete">JavaScript გაფრთხილება - %1</translation>
    </message>
    <message>
        <source>Choose file...</source>
        <translation>ფაილის არჩევა...</translation>
    </message>
+    <message>
+        <source>JavaScript alert</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WebSearchBar</name>
--- a/translations/nl_NL.ts
+++ b/translations/nl_NL.ts
--- a/translations/pl_PL.ts
+++ b/translations/pl_PL.ts
--- a/translations/pt_BR.ts
+++ b/translations/pt_BR.ts
@ -29,7 +29,7 @@
    </message>
    <message>
        <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 os direitos reservados.&lt;br/&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Todos os direitos reservados.&lt;br/&gt;</translation>
    </message>
    <message>
        <source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
@ -878,11 +878,11 @@
    <name>CloseDialog</name>
    <message>
        <source>There are still open tabs</source>
-        <translation>Ainda existem abas abertas</translation>
+        <translation type="obsolete">Ainda existem abas abertas</translation>
    </message>
    <message>
        <source>Don&apos;t ask again</source>
-        <translation>Não perguntar novamente</translation>
+        <translation type="obsolete">Não perguntar novamente</translation>
    </message>
 </context>
 <context>
@ -2659,7 +2659,7 @@ não foi encontrado!</translation>
    </message>
    <message>
        <source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit QupZilla?</source>
-        <translation>Ainda existem %1 guias abertas e a sessão não será gravada. Tem a certeza que deseja sair?</translation>
+        <translation type="obsolete">Ainda existem %1 guias abertas e a sessão não será gravada. Tem a certeza que deseja sair?</translation>
    </message>
    <message>
        <source>Bookmark &amp;All Tabs</source>
@ -2701,6 +2701,19 @@ não foi encontrado!</translation>
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
        <translation type="unfinished">&lt;b&gt;QupZilla travou :/&lt;/b&gt;&lt;br/&gt;Oops, parece que a última sessão do QupZilla não foi fechada como o planejado. Pedimos mil desculpas por isso. Você deseja que nós tentassemos abrir a última sessão que você estava?</translation>
    </message>
+    <message>
+        <source>There are still %1 open tabs and your session won&apos;t be stored. 
+Are you sure to quit QupZilla?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t ask again</source>
+        <translation type="unfinished">Não perguntar novamente</translation>
+    </message>
+    <message>
+        <source>There are still open tabs</source>
+        <translation type="unfinished">Ainda existem abas abertas</translation>
+    </message>
 </context>
 <context>
    <name>QupZillaSchemeReply</name>
@ -2992,14 +3005,6 @@ não foi encontrado!</translation>
        <source>Portable build</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>If you are experiencing problems with QupZilla, please try to disable all extenions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page contains information about QupZilla&apos;s current configuration, all relevant information for troubleshooting. Please include these information when sending bug reports.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Extensions</source>
        <translation type="unfinished"></translation>
@ -3008,6 +3013,18 @@ não foi encontrado!</translation>
        <source>No available extensions.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>If you are experiencing problems with QupZilla, please try to disable all extensions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Fechar</translation>
+    </message>
+    <message>
+        <source>This page contains information about QupZilla&apos;s current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>RSSManager</name>
@ -3498,7 +3515,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
    </message>
    <message>
        <source>Delete</source>
-        <translation>Apagar</translation>
+        <translation type="obsolete">Apagar</translation>
    </message>
    <message>
        <source>Error!</source>
@ -3780,7 +3797,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
    </message>
    <message>
        <source>JavaScript alert - %1</source>
-        <translation>Alerta JavaScript - %1</translation>
+        <translation type="obsolete">Alerta JavaScript - %1</translation>
    </message>
    <message>
        <source>Confirm form resubmission</source>
@ -3872,6 +3889,10 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
        <translation>Para mostrar esta página, o QupZilla precisa reenviar o pedido solicitado.
 (é como fazer alguma coisa, que você já havia feito anteriormente)</translation>
    </message>
+    <message>
+        <source>JavaScript alert</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WebSearchBar</name>
--- a/translations/pt_PT.ts
+++ b/translations/pt_PT.ts
--- a/translations/ru_RU.ts
+++ b/translations/ru_RU.ts
--- a/translations/sk_SK.ts
+++ b/translations/sk_SK.ts
@ -29,7 +29,7 @@
    </message>
    <message>
        <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>
+        <translation type="obsolete">&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Všetky práva vyhradené.&lt;br/&gt;</translation>
    </message>
    <message>
        <source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
@ -878,11 +878,11 @@
    <name>CloseDialog</name>
    <message>
        <source>There are still open tabs</source>
-        <translation>Stále sú otvorené karty</translation>
+        <translation type="obsolete">Stále sú otvorené karty</translation>
    </message>
    <message>
        <source>Don&apos;t ask again</source>
-        <translation>Viac sa uz nepýtať</translation>
+        <translation type="obsolete">Viac sa uz nepýtať</translation>
    </message>
 </context>
 <context>
@ -2639,7 +2639,7 @@
    </message>
    <message>
        <source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit QupZilla?</source>
-        <translation>Stále sú otvorené %1 karty a vaša relácia nebude uložená. Ste si istý, že chcete skončiť?</translation>
+        <translation type="obsolete">Stále sú otvorené %1 karty a vaša relácia nebude uložená. Ste si istý, že chcete skončiť?</translation>
    </message>
    <message>
        <source>QupZilla</source>
@ -2701,6 +2701,19 @@
        <source>&lt;b&gt;QupZilla crashed :-(&lt;/b&gt;&lt;br/&gt;Oops, the last session of QupZilla was interrupted unexpectedly. We apologize for this. Would you like to try restoring the last saved state?</source>
        <translation type="unfinished">&lt;b&gt;QupZilla spadla :-(&lt;/b&gt;&lt;br/&gt;Oops, minulá relácia QupZilly skončila pádom. Veľmi sa ospravedlňujeme. Chcete sa pokúsiť obnoviť uložený stav?</translation>
    </message>
+    <message>
+        <source>There are still %1 open tabs and your session won&apos;t be stored. 
+Are you sure to quit QupZilla?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t ask again</source>
+        <translation type="unfinished">Viac sa uz nepýtať</translation>
+    </message>
+    <message>
+        <source>There are still open tabs</source>
+        <translation type="unfinished">Stále sú otvorené karty</translation>
+    </message>
 </context>
 <context>
    <name>QupZillaSchemeReply</name>
@ -3000,14 +3013,6 @@
        <source>Portable build</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>If you are experiencing problems with QupZilla, please try to disable all extenions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page contains information about QupZilla&apos;s current configuration, all relevant information for troubleshooting. Please include these information when sending bug reports.</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Extensions</source>
        <translation type="unfinished"></translation>
@ -3016,6 +3021,18 @@
        <source>No available extensions.</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>If you are experiencing problems with QupZilla, please try to disable all extensions first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">Zatvoriť</translation>
+    </message>
+    <message>
+        <source>This page contains information about QupZilla&apos;s current configuration - relevant for troubleshooting. Please include this information when submitting bug reports.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>RSSManager</name>
@ -3506,7 +3523,7 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
    </message>
    <message>
        <source>Delete</source>
-        <translation>Vymazať</translation>
+        <translation type="obsolete">Vymazať</translation>
    </message>
    <message>
        <source>Error!</source>
@ -3870,7 +3887,7 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
    </message>
    <message>
        <source>JavaScript alert - %1</source>
-        <translation>Výstraha JavaScript - %1</translation>
+        <translation type="obsolete">Výstraha JavaScript - %1</translation>
    </message>
    <message>
        <source>Confirm form resubmission</source>
@ -3880,6 +3897,10 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
        <source>Proxy server not found</source>
        <translation>Proxy server nenájdený</translation>
    </message>
+    <message>
+        <source>JavaScript alert</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>WebSearchBar</name>
--- a/translations/sr_BA.ts
+++ b/translations/sr_BA.ts
--- a/translations/sr_RS.ts
+++ b/translations/sr_RS.ts
--- a/translations/sv_SE.ts
+++ b/translations/sv_SE.ts
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
--- a/translations/zh_TW.ts
+++ b/translations/zh_TW.ts