Merge https://github.com/nowrep/QupZilla

AUTHORS

@@ -35,6 +35,7 @@ Widya Walesa          <walecha99@gmail.com>             (Indonesian)
 Beqa Arabuli          <arabulibeqa@gmail.com>           (Georgian)
 Daiki Noda            <sys.pdr.pdm9@gmail.com>          (Japanese)
 Ștefan Comănescu      <sdfanq@gmail.com>                (Romanian)
+Gábor Oberle          <oberleg@myopera.com>             (Hungarian)
 
 Special thanks:
 

linux/applications/qupzilla.desktop

@@ -28,7 +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]=高速で安全なブラウザ
+Comment[ja]=高速で安全なブラウザ
 GenericName=Web Browser
 GenericName[cs]=Webový prohlížeč
 GenericName[de]=Web Browser
@@ -41,6 +41,7 @@ GenericName[ka]=ვებ ბრაუზერი
 GenericName[nl]=Webbrowser
 GenericName[pl]=Przeglądarka Internetowa
 GenericName[pt]=Navegador web
+GenericName[pt_BR]=Navegador web
 GenericName[ru]=Веб-Браузер
 GenericName[sk]=Webový prehliadač
 GenericName[sr]=Веб прегледач
@@ -50,7 +51,7 @@ GenericName[sr@latin]=Veb pregledač
 GenericName[sv]=Webbläsare
 GenericName[zh_TW]=網頁瀏覽器
 GenericName[zh_CN]=网页浏览器
-GenericName[ja_JP]=Webブラウザ
+GenericName[ja]=Webブラウザ
 Exec=qupzilla %u
 MimeType=text/html;application/xhtml+xml;
 Terminal=false
@@ -69,6 +70,7 @@ Name[ka]=ახალი ჩანართის გახსნა
 Name[nl]=Open nieuw tabblad
 Name[pl]=Otwórz nowe okno
 Name[pt]=Abrir novo separador
+Name[pt_BR]=Abrir nova guia 
 Name[ru]=Открыть новую вкладку
 Name[sk]=Otvoriť novú kartu
 Name[sr]=Отвори у новом језичку
@@ -78,7 +80,7 @@ Name[sr@latin]=Otvori u novom jezičku
 Name[sv]=Öppna ny flik
 Name[zh_TW]=新增分頁
 Name[zh_CN]=新建标签页
-Name[ja_JP]=新しいタブを開く
+Name[ja]=新しいタブを開く
 
 Exec=qupzilla --new-tab
 TargetEnvironment=Unity
@@ -95,7 +97,8 @@ Name[id]=Buka jendela baru
 Name[ka]=ახალი ფანჯრის გახსნა
 Name[nl]=Nieuw venster openen
 Name[pl]=Otwórz nowe okno
-Name[pt]=Abrir nova janela
+Name[pt]=Abrir nova janel
+Name[pt_BR]=Abrir nova janela
 Name[ru]=Открыть в новом окне
 Name[sk]=Otvoriť nové okno
 Name[sr]=Отвори у новом прозору
@@ -105,7 +108,7 @@ Name[sr@latin]=Otvori u novom prozoru
 Name[sv]=Öppna nytt fönster
 Name[zh_TW]=新增視窗
 Name[zh_CN]=新建窗口
-Name[ja_JP]=新しいウィンドウを開く
+Name[ja]=新しいウィンドウを開く
 Exec=qupzilla --new-window
 TargetEnvironment=Unity
 
@@ -122,6 +125,7 @@ Name[ka]=პირადი ბრაუზინგის დაწყება
 Name[nl]=Start incognito browsen
 Name[pl]=Początek prywatną oglądania
 Name[pt]=Iniciar navegação privada
+Name[pt_BR]=Iniciar navegação privada
 Name[ru]=Запустить в режиме приватного просмотра
 Name[sk]=Spustiť súkromné prehliadanie
 Name[sr]=Покрени приватно прегледање
@@ -131,6 +135,6 @@ Name[sr@latin]=Pokreni privatno pregledanje
 Name[sv]=Starta privat surfning
 Name[zh_TW]=開始私密瀏覽
 Name[zh_CN]=开始隐私浏览
-Name[ja_JP]=プライベートブラウジングを開始
+Name[ja]=プライベートブラウジングを開始
 Exec=qupzilla --private-browsing
 TargetEnvironment=Unity

src/defines.pri

@@ -6,21 +6,21 @@ UI_DIR = $$PWD/../build
 unix: VERSION = 1.1.8
 
 # Please read BUILD information #
-#DEFINES += NO_SYSTEM_DATAPATH
-#DEFINES += USE_WEBGL
-#DEFINES += KDE
-#DEFINES += PORTABLE_BUILD
+#DEFINES *= NO_SYSTEM_DATAPATH
+#DEFINES *= USE_WEBGL
+#DEFINES *= KDE
+#DEFINES *= PORTABLE_BUILD
 win32 {
-    DEFINES += W7API
+    DEFINES *= W7API
     LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
 }
 
-DEFINES += QT_NO_URL_CAST_FROM_STRING
+DEFINES *= QT_NO_URL_CAST_FROM_STRING
 
 ##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template
-!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT
+!win32: !CONFIG(debug, debug|release): DEFINES *= QT_NO_DEBUG_OUTPUT
 
-CONFIG(debug, debug|release): DEFINES += QUPZILLA_DEBUG_BUILD
+CONFIG(debug, debug|release): DEFINES *= QUPZILLA_DEBUG_BUILD
 
 d_no_system_datapath = $$(NO_SYSTEM_DATAPATH)
 d_use_webgl = $$(USE_WEBGL)
@@ -30,13 +30,13 @@ 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 }
-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 }
+equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
+equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
+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)
@@ -56,11 +56,11 @@ equals(d_use_qtwebkit_2_2, "true") { DEFINES += USE_QTWEBKIT_2_2 }
         hicolor_folder = "$$d_prefix"share/icons/hicolor
     }
 
-    DEFINES += USE_DATADIR=\\\"""$$data_folder/"\\\""
+    DEFINES *= USE_DATADIR=\\\"""$$data_folder/"\\\""
 
     #Git revision
     rev = $$system(cd ../ && sh $$PWD/../scripts/getrevision.sh)
-    !equals(rev, ""): DEFINES += GIT_REVISION=\\\"""$$rev"\\\""
+    !equals(rev, ""): DEFINES *= GIT_REVISION=\\\"""$$rev"\\\""
 }
 
 isEmpty(QMAKE_LRELEASE) {

src/lib/3rdparty/qtsingleapplication.pri

@@ -10,6 +10,6 @@ qtsingleapplication-uselib:!qtsingleapplication-buildlib {
 }
 
 os2|win32 {
-    contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLEAPPLICATION_EXPORT
-    else:qtsingleapplication-uselib:DEFINES += QT_QTSINGLEAPPLICATION_IMPORT
+    contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES *= QT_QTSINGLEAPPLICATION_EXPORT
+    else:qtsingleapplication-uselib:DEFINES *= QT_QTSINGLEAPPLICATION_IMPORT
 }

src/lib/3rdparty/squeezelabelv1.cpp

@@ -15,5 +15,6 @@ void SqueezeLabelV1::paintEvent(QPaintEvent* event)
             setText(elided);
         }
     }
+
     QLabel::paintEvent(event);
 }

src/lib/3rdparty/squeezelabelv2.cpp

@@ -1,5 +1,27 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "squeezelabelv2.h"
 
+#include <QApplication>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QMenu>
+
 SqueezeLabelV2::SqueezeLabelV2(QWidget* parent)
     : QLabel(parent)
 {
@@ -19,6 +41,33 @@ void SqueezeLabelV2::setText(const QString &txt)
     QLabel::setText(elided);
 }
 
+void SqueezeLabelV2::copy()
+{
+    if (selectedText().length() == text().length()) {
+        QApplication::clipboard()->setText(m_originalText);
+    }
+    else {
+        QApplication::clipboard()->setText(selectedText());
+    }
+}
+
+void SqueezeLabelV2::contextMenuEvent(QContextMenuEvent* event)
+{
+    QMenu menu;
+    QAction* act = menu.addAction(tr("Copy"), this, SLOT(copy()));
+    act->setShortcut(QKeySequence("Ctrl+C"));
+    act->setEnabled(hasSelectedText());
+
+    menu.exec(event->globalPos());
+}
+
+void SqueezeLabelV2::keyPressEvent(QKeyEvent* event)
+{
+    if (event->key() == Qt::Key_C && event->modifiers() == Qt::ControlModifier) {
+        copy();
+    }
+}
+
 QString SqueezeLabelV2::originalText()
 {
     return m_originalText;

src/lib/3rdparty/squeezelabelv2.h

@@ -1,42 +1,27 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef SQUEEZELABELV2_H
 #define SQUEEZELABELV2_H
 
 #include "qz_namespace.h"
 
-/**
-* Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* 3. Neither the name of the Benjamin Meyer nor the names of its contributors
-* may be used to endorse or promote products derived from this software
-* without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-* SUCH DAMAGE.
-*/
-
 #include <QLabel>
 
-/*
-A label that will squeeze the set text to fit within the size of the
-widget. The text will be elided in the middle.
-*/
 class QT_QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel
 {
     Q_OBJECT
@@ -48,11 +33,15 @@ public:
     QString originalText();
     void setText(const QString &txt);
 
+private slots:
+    void copy();
+
 protected:
+    void contextMenuEvent(QContextMenuEvent* event);
+    void keyPressEvent(QKeyEvent* event);
     void resizeEvent(QResizeEvent* event);
 
 private:
-    QString m_SqueezedTextCache;
     QString m_originalText;
 };
 

src/lib/app/commandlineoptions.cpp

@@ -18,9 +18,10 @@
 #include "commandlineoptions.h"
 #include "qupzilla.h"
 
-CommandLineOptions::CommandLineOptions(int &argc, char** argv)
+#include <QCoreApplication>
+
+CommandLineOptions::CommandLineOptions(int &argc)
     : m_argc(argc)
-    , m_argv(argv)
 {
     parseActions();
 }
@@ -63,9 +64,15 @@ void CommandLineOptions::parseActions()
 {
     using namespace std;
 
+    const QStringList &arguments = QCoreApplication::arguments();
+    if (arguments.isEmpty()) {
+        return;
+    }
+
     // Skip first argument (it should be program itself)
-    for (int i = 1; i < m_argc; i++) {
-        QString arg(m_argv[i]);
+    for (int i = 1; i < arguments.count(); ++i) {
+        QString arg = arguments.at(i);
+
         if (arg == "-h" || arg == "--help") {
             showHelp();
             ActionPair pair;
@@ -142,9 +149,10 @@ void CommandLineOptions::parseActions()
         }
     }
 
-    QString url(m_argv[m_argc - 1]);
-    if (m_argc > 1 && !url.isEmpty() && !url.startsWith("-") && url.contains(".")) {
-        cout << "QupZilla: Starting with url " << url.toUtf8().data() << endl;
+    const QString &url = arguments.last();
+
+    if (m_argc > 1 && !url.isEmpty() && !url.startsWith("-") &&
+            (url.contains(".") || url.contains("/") || url.contains("\\"))) {
         ActionPair pair;
         pair.action = Qz::CL_OpenUrl;
         pair.text = url;

src/lib/app/commandlineoptions.h

@@ -33,7 +33,7 @@ public:
 
     typedef QList<ActionPair> ActionPairList;
 
-    explicit CommandLineOptions(int &argc, char** argv);
+    explicit CommandLineOptions(int &argc);
     ActionPairList getActions();
 
 private:
@@ -41,7 +41,6 @@ private:
     void parseActions();
 
     int m_argc;
-    char** m_argv;
     ActionPairList m_actions;
 };
 

src/lib/app/mainapplication.cpp

@@ -46,6 +46,9 @@
 #include "settings.h"
 #include "locationbarsettings.h"
 #include "webviewsettings.h"
+#include "clearprivatedata.h"
+#include "proxystyle.h"
+#include "commandlineoptions.h"
 
 #ifdef Q_WS_MAC
 #include <QFileOpenEvent>
@@ -80,7 +83,7 @@
 #define NO_SYSTEM_DATAPATH
 #endif
 
-MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cmdActions, int &argc, char** argv)
+MainApplication::MainApplication(int &argc, char** argv)
     : QtSingleApplication("QupZillaWebBrowser", argc, argv)
     , m_cookiemanager(0)
     , m_browsingLibrary(0)
@@ -131,7 +134,9 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
     QString startProfile;
 
     if (argc > 1) {
-        foreach(const CommandLineOptions::ActionPair & pair, cmdActions) {
+        CommandLineOptions cmd(argc);
+
+        foreach(const CommandLineOptions::ActionPair & pair, cmd.getActions()) {
             switch (pair.action) {
             case Qz::CL_StartWithoutAddons:
                 noAddons = true;
@@ -155,9 +160,12 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
                 m_postLaunchActions.append(PrivateBrowsing);
                 break;
             case Qz::CL_OpenUrl:
-                startUrl = QUrl(pair.text.toUtf8());
+                startUrl = QUrl::fromUserInput(pair.text);
                 messages.append("URL:" + pair.text);
                 break;
+            case Qz::CL_ExitAction:
+                m_isClosing = true;
+                return;
             default:
                 break;
             }
@@ -182,6 +190,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
     setQuitOnLastWindowClosed(true);
 #endif
 
+    setStyle(new ProxyStyle);
     setApplicationName("QupZilla");
     setApplicationVersion(QupZilla::VERSION);
     setOrganizationDomain("qupzilla");
@@ -440,7 +449,7 @@ void MainApplication::receiveAppMessage(QString message)
 {
     QWidget* actWin = getWindow();
     if (message.startsWith("URL:")) {
-        QUrl url = QUrl::fromEncoded(message.mid(4).toUtf8());
+        QUrl url = QUrl::fromUserInput(message.mid(4));
         addNewTab(url);
         actWin = getWindow();
     }
@@ -612,8 +621,7 @@ void MainApplication::saveSettings()
         m_historymodel->clearHistory();
     }
     if (deleteHtml5Storage) {
-        qz_removeDir(m_activeProfil + "Databases");
-        qz_removeDir(m_activeProfil + "LocalStorage");
+        ClearPrivateData::clearLocalStorage();
     }
 
     m_searchEnginesManager->saveSettings();

src/lib/app/mainapplication.h

@@ -25,7 +25,6 @@
 #include <QWeakPointer>
 
 #include "qtsingleapplication.h"
-#include "commandlineoptions.h"
 #include "qz_namespace.h"
 
 class QWebSettings;
@@ -58,7 +57,7 @@ public:
     QString TRANSLATIONSDIR;
     QString THEMESDIR;
 
-    explicit MainApplication(const CommandLineOptions::ActionPairList &cmdActions, int &argc, char** argv);
+    explicit MainApplication(int &argc, char** argv);
 
     void connectDatabase();
     void loadSettings();

src/lib/autofill/autofillmodel.cpp

@@ -388,6 +388,9 @@ QByteArray AutoFillModel::exportPasswords()
 
 bool AutoFillModel::importPasswords(const QByteArray &data)
 {
+    QSqlDatabase db = QSqlDatabase::database();
+    db.transaction();
+
     QXmlStreamReader xml(data);
 
     while (!xml.atEnd()) {
@@ -465,6 +468,7 @@ bool AutoFillModel::importPasswords(const QByteArray &data)
             }
         }
     }
+    db.commit();
 
-    return xml.hasError();
+    return !xml.hasError();
 }

src/lib/data/icons.qrc

@@ -63,5 +63,6 @@
         <file>icons/menu/translate.png</file>
         <file>icons/menu/duck.png</file>
         <file>icons/exeicons/qupzilla-window.png</file>
+        <file>icons/preferences/text-x-sql.png</file>
     </qresource>
 </RCC>

src/lib/downloads/downloadoptionsdialog.ui

@@ -47,7 +47,7 @@
     </widget>
    </item>
    <item row="1" column="1" colspan="2">
-    <widget class="SqueezeLabelV1" name="fileName">
+    <widget class="SqueezeLabelV2" name="fileName">
      <property name="text">
       <string/>
      </property>
@@ -166,9 +166,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>SqueezeLabelV1</class>
+   <class>SqueezeLabelV2</class>
    <extends>QLabel</extends>
-   <header>squeezelabelv1.h</header>
+   <header>squeezelabelv2.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/lib/history/historymodel.cpp

@@ -140,7 +140,7 @@ void HistoryModel::deleteHistoryEntry(const QString &url, const QString &title)
         deleteHistoryEntry(id);
     }
 }
-#include <QDebug>
+
 void HistoryModel::slotDeleteHistoryEntry(const QList<int> &list)
 {
     QSqlDatabase db = QSqlDatabase::database();
@@ -151,10 +151,6 @@ void HistoryModel::slotDeleteHistoryEntry(const QList<int> &list)
         query.prepare("SELECT id, count, date, url, title FROM history WHERE id=?");
         query.bindValue(0, index);
         query.exec();
-        if (!query.next()) {
-            qDebug() << "invalid id" << index;
-            continue;
-        }
 
         HistoryEntry entry;
         entry.id = query.value(0).toInt();

src/lib/lib.pro

@@ -3,7 +3,7 @@ unix:QT += dbus
 TARGET = qupzilla
 TEMPLATE = lib
 
-DEFINES += QUPZILLA_SHAREDLIBRARY
+DEFINES *= QUPZILLA_SHAREDLIBRARY
 
 include(3rdparty/qtsingleapplication.pri)
 include(../defines.pri)

src/lib/navigation/locationbar.cpp

@@ -320,7 +320,7 @@ void LocationBar::contextMenuEvent(QContextMenuEvent* event)
     m_pasteAndGoAction->setEnabled(!QApplication::clipboard()->text().isEmpty());
 
     //Prevent choosing first option with double rightclick
-    QPoint pos = mapToGlobal(event->pos());
+    QPoint pos = event->globalPos();
     QPoint p(pos.x(), pos.y() + 1);
     m_menu->popup(p);
 }

src/lib/navigation/websearchbar.cpp

@@ -276,7 +276,7 @@ void WebSearchBar::contextMenuEvent(QContextMenuEvent* event)
     m_pasteAndGoAction->setEnabled(!QApplication::clipboard()->text().isEmpty());
 
     //Prevent choosing first option with double rightclick
-    QPoint pos = mapToGlobal(event->pos());
+    QPoint pos = event->globalPos();
     QPoint p(pos.x(), pos.y() + 1);
     m_menu->popup(p);
 }

src/lib/network/qupzillaschemehandler.cpp

@@ -232,7 +232,8 @@ QString QupZillaSchemeReply::aboutPage()
                       authorString("Wu Cheng-Hong", "stu2731652@gmail.com") + " (Traditional Chinese)<br/>" +
                       authorString("Widya Walesa", "walecha99@gmail.com") + " (Indonesian)<br/>" +
                       authorString("Beqa Arabuli", "arabulibeqa@gmail.com") + " (Georgian)<br/>" +
-                      authorString("Daiki Noda", "sys.pdr.pdm9@gmail.com") + " (Japanese)"
+                      authorString("Daiki Noda", "sys.pdr.pdm9@gmail.com") + " (Japanese)<br/>" +
+                      authorString("Gábor Oberle", "oberleg@myopera.com") + " (Hungarian)"
                      );
     }
 

src/lib/other/aboutdialog.cpp

@@ -107,7 +107,8 @@ void AboutDialog::showAuthors()
                                          "Wu Cheng-Hong<br/>"
                                          "Widya Walesa<br/>"
                                          "Beqa Arabuli<br/>"
-                                         "Daiki Noda")
+                                         "Daiki Noda<br/>"
+                                         "Gábor Oberle")
                              ));
         m_authorsHtml.append("</div></center>");
     }

src/lib/other/clearprivatedata.cpp

@@ -24,7 +24,9 @@
 #include "clickablelabel.h"
 #include "ui_clearprivatedata.h"
 #include "iconprovider.h"
+#include "globalfunctions.h"
 
+#include <QWebDatabase>
 #include <QWebSettings>
 #include <QNetworkDiskCache>
 #include <QDateTime>
@@ -50,6 +52,35 @@ void ClearPrivateData::historyClicked(bool state)
     ui->historyLength->setEnabled(state);
 }
 
+void ClearPrivateData::clearLocalStorage()
+{
+    const QString &profile = mApp->getActiveProfilPath();
+
+    qz_removeDir(profile + "LocalStorage");
+}
+
+void ClearPrivateData::clearWebDatabases()
+{
+    const QString &profile = mApp->getActiveProfilPath();
+
+    QWebDatabase::removeAllDatabases();
+    qz_removeDir(profile + "Databases");
+}
+
+void ClearPrivateData::clearCache()
+{
+    mApp->webSettings()->clearMemoryCaches();
+    mApp->networkManager()->cache()->clear();
+
+    QFile::remove(mApp->getActiveProfilPath() + "ApplicationCache.db");
+}
+
+void ClearPrivateData::clearIcons()
+{
+    mApp->webSettings()->clearIconDatabase();
+    mApp->iconProvider()->clearIconDatabase();
+}
+
 void ClearPrivateData::clearFlash()
 {
     p_QupZilla->tabWidget()->addView(QUrl("http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager07.html"));
@@ -58,6 +89,7 @@ void ClearPrivateData::clearFlash()
 void ClearPrivateData::dialogAccepted()
 {
     QApplication::setOverrideCursor(Qt::WaitCursor);
+
     if (ui->history->isChecked()) {
         QDateTime dateTime = QDateTime::currentDateTime();
         qint64 nowMS = QDateTime::currentMSecsSinceEpoch();
@@ -83,18 +115,28 @@ void ClearPrivateData::dialogAccepted()
         query.exec("DELETE FROM history WHERE date > " + QString::number(date));
         query.exec("VACUUM");
     }
+
     if (ui->cookies->isChecked()) {
-        QList<QNetworkCookie> cookies;
-        mApp->cookieJar()->setAllCookies(cookies);
+        mApp->cookieJar()->setAllCookies(QList<QNetworkCookie>());
     }
+
     if (ui->cache->isChecked()) {
-        mApp->webSettings()->clearMemoryCaches();
-        mApp->networkManager()->cache()->clear();
+        clearCache();
     }
+
+    if (ui->databases->isChecked()) {
+        clearWebDatabases();
+    }
+
+    if (ui->localStorage->isChecked()) {
+        clearLocalStorage();
+    }
+
     if (ui->icons->isChecked()) {
-        mApp->webSettings()->clearIconDatabase();
-        mApp->iconProvider()->clearIconDatabase();
+        clearIcons();
     }
+
     QApplication::restoreOverrideCursor();
+
     close();
 }

src/lib/other/clearprivatedata.h

@@ -34,6 +34,11 @@ class QT_QUPZILLA_EXPORT ClearPrivateData : public QDialog
 public:
     explicit ClearPrivateData(QupZilla* mainClass, QWidget* parent = 0);
 
+    static void clearLocalStorage();
+    static void clearWebDatabases();
+    static void clearCache();
+    static void clearIcons();
+
 private slots:
     void historyClicked(bool state);
     void dialogAccepted();

src/lib/other/clearprivatedata.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>308</width>
-    <height>260</height>
+    <height>310</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -27,21 +27,11 @@
       <string>Clear history</string>
      </property>
      <property name="checked">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QCheckBox" name="cookies">
-     <property name="text">
-      <string>Clear cookies</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
+   <item row="7" column="0" colspan="2">
     <widget class="QCheckBox" name="cache">
      <property name="text">
       <string>Clear cache</string>
@@ -51,14 +41,14 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
+   <item row="9" column="0" colspan="2">
     <widget class="QCheckBox" name="icons">
      <property name="text">
       <string>Clear icons</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="11" column="1">
     <widget class="ClickableLabel" name="clearAdobeCookies">
      <property name="cursor">
       <cursorShape>PointingHandCursor</cursorShape>
@@ -71,7 +61,7 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="1" colspan="2">
+   <item row="12" column="1" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -106,6 +96,9 @@
    </item>
    <item row="3" column="1" colspan="2">
     <widget class="QComboBox" name="historyLength">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <item>
       <property name="text">
        <string>Earlier Today</string>
@@ -141,6 +134,36 @@
      </property>
     </spacer>
    </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QCheckBox" name="databases">
+     <property name="text">
+      <string>Clear web databases</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QCheckBox" name="localStorage">
+     <property name="text">
+      <string>Clear local storage</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QCheckBox" name="cookies">
+     <property name="text">
+      <string>Clear cookies</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

src/lib/popupwindow/popupwebview.cpp

@@ -88,7 +88,7 @@ void PopupWebView::contextMenuEvent(QContextMenuEvent* event)
 
     if (!m_menu->isEmpty()) {
         //Prevent choosing first option with double rightclick
-        const QPoint &pos = mapToGlobal(event->pos());
+        const QPoint &pos = event->globalPos();
         QPoint p(pos.x(), pos.y() + 1);
         m_menu->popup(p);
         return;

src/lib/preferences/autofillmanager.cpp

@@ -54,6 +54,7 @@ AutoFillManager::AutoFillManager(QWidget* parent)
 void AutoFillManager::loadPasswords()
 {
     ui->showPasswords->setText(tr("Show Passwords"));
+    m_passwordsShown = false;
 
     QSqlQuery query;
     query.exec("SELECT server, username, password, id FROM autofill");

src/lib/preferences/preferences.cpp

@@ -41,6 +41,7 @@
 #include "autofillmodel.h"
 #include "settings.h"
 #include "tabbedwebview.h"
+#include "clearprivatedata.h"
 
 #include <QSettings>
 #include <QInputDialog>
@@ -503,9 +504,7 @@ void Preferences::chooseUserStyleClicked()
 
 void Preferences::deleteHtml5storage()
 {
-    QString activeProfil = mApp->getActiveProfilPath();
-    qz_removeDir(activeProfil + "Databases");
-    qz_removeDir(activeProfil + "LocalStorage");
+    ClearPrivateData::clearLocalStorage();
 
     ui->deleteHtml5storage->setText(tr("Deleted"));
     ui->deleteHtml5storage->setEnabled(false);

src/lib/webview/siteinfo.cpp

@@ -31,6 +31,8 @@
 #include <QNetworkDiskCache>
 #include <QWebFrame>
 #include <QClipboard>
+#include <QWebSecurityOrigin>
+#include <QWebDatabase>
 
 QString SiteInfo::showCertInfo(const QString &string)
 {
@@ -46,13 +48,15 @@ SiteInfo::SiteInfo(WebView* view, QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::SiteInfo)
     , m_certWidget(0)
+    , m_view(view)
 {
     setAttribute(Qt::WA_DeleteOnClose);
     ui->setupUi(this);
 
     ui->listWidget->item(0)->setIcon(QIcon::fromTheme("document-properties", QIcon(":/icons/preferences/document-properties.png")));
     ui->listWidget->item(1)->setIcon(QIcon::fromTheme("applications-graphics", QIcon(":/icons/preferences/applications-graphics.png")));
-    ui->listWidget->item(2)->setIcon(QIcon::fromTheme("dialog-password", QIcon(":/icons/preferences/dialog-password.png")));
+    ui->listWidget->item(2)->setIcon(QIcon::fromTheme("text-x-sql", QIcon(":/icons/preferences/text-x-sql.png")));
+    ui->listWidget->item(3)->setIcon(QIcon::fromTheme("dialog-password", QIcon(":/icons/preferences/dialog-password.png")));
     ui->listWidget->item(0)->setSelected(true);
 
     WebPage* webPage = qobject_cast<WebPage*>(view->page());
@@ -123,6 +127,24 @@ SiteInfo::SiteInfo(WebView* view, QWidget* parent)
         ui->treeImages->addTopLevelItem(item);
     }
 
+    //DATABASES
+    const QList<QWebDatabase> databases = frame->securityOrigin().databases();
+
+    int counter = 0;
+    foreach(const QWebDatabase & b, databases) {
+        QListWidgetItem* item = new QListWidgetItem(ui->databaseList);
+        item->setText(b.displayName());
+        item->setData(Qt::UserRole + 10, counter);
+
+        ++counter;
+    }
+
+    if (counter == 0) {
+        QListWidgetItem* item = new QListWidgetItem(ui->databaseList);
+        item->setText(tr("No databases are used by this page."));
+        item->setFlags(item->flags() & Qt::ItemIsSelectable);
+    }
+
     //SECURITY
     if (cert.isValid()) {
         ui->securityLabel->setText(tr("<b>Connection is Encrypted.</b>"));
@@ -140,6 +162,7 @@ SiteInfo::SiteInfo(WebView* view, QWidget* parent)
     connect(ui->secDetailsButton, SIGNAL(clicked()), this, SLOT(securityDetailsClicked()));
     connect(ui->saveButton, SIGNAL(clicked(QAbstractButton*)), this, SLOT(downloadImage()));
 
+    connect(ui->databaseList, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(databaseItemChanged(QListWidgetItem*)));
     connect(ui->treeImages, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(showImagePreview(QTreeWidgetItem*)));
     connect(ui->treeImages, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(imagesCustomContextMenuRequested(const QPoint &)));
 
@@ -161,6 +184,27 @@ void SiteInfo::imagesCustomContextMenuRequested(const QPoint &p)
     menu.exec(QCursor::pos());
 }
 
+void SiteInfo::databaseItemChanged(QListWidgetItem* item)
+{
+    if (!item) {
+        return;
+    }
+
+    int id = item->data(Qt::UserRole + 10).toInt();
+    const QList<QWebDatabase> &list = m_view->page()->mainFrame()->securityOrigin().databases();
+
+    if (id > list.count() - 1) {
+        qDebug("database is shit");
+        return;
+    }
+
+    const QWebDatabase &db = list.at(id);
+
+    ui->databaseName->setText(QString("%1 (%2)").arg(db.displayName(), db.name()));
+    ui->databasePath->setText(db.fileName());
+    ui->databaseSize->setText(DownloadItem::fileSizeToString(db.size()));
+}
+
 void SiteInfo::copyActionData()
 {
     if (QAction* action = qobject_cast<QAction*>(sender())) {
@@ -237,7 +281,7 @@ void SiteInfo::showImagePreview(QTreeWidgetItem* item)
 
 void SiteInfo::securityDetailsClicked()
 {
-    ui->listWidget->setCurrentRow(2);
+    ui->listWidget->setCurrentRow(3);
 }
 
 SiteInfo::~SiteInfo()

src/lib/webview/siteinfo.h

@@ -45,6 +45,7 @@ public:
     static QString showCertInfo(const QString &string);
 
 private slots:
+    void databaseItemChanged(QListWidgetItem* item);
     void showImagePreview(QTreeWidgetItem* item);
     void securityDetailsClicked();
 
@@ -55,6 +56,7 @@ private slots:
 private:
     Ui::SiteInfo* ui;
     CertificateInfoWidget* m_certWidget;
+    WebView* m_view;
 
     QPixmap m_activePixmap;
     QUrl m_baseUrl;

src/lib/webview/siteinfo.ui

@@ -49,6 +49,9 @@
      <property name="uniformItemSizes">
       <bool>true</bool>
      </property>
+     <property name="selectionRectVisible">
+      <bool>false</bool>
+     </property>
      <item>
       <property name="text">
        <string>General</string>
@@ -59,6 +62,11 @@
        <string>Media</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Databases</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Security</string>
@@ -82,6 +90,16 @@
      </property>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QStackedWidget" name="stackedWidget">
      <property name="currentIndex">
@@ -327,6 +345,95 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="page_4">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <widget class="QListWidget" name="databaseList">
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>120</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>&lt;b&gt;Database details&lt;/b&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QFormLayout" name="formLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Name:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_4">
+           <property name="text">
+            <string>Path:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>Size:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="SqueezeLabelV2" name="databasePath">
+           <property name="text">
+            <string>&lt;database not selected&gt;</string>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="SqueezeLabelV2" name="databaseName">
+           <property name="text">
+            <string>&lt;database not selected&gt;</string>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="SqueezeLabelV2" name="databaseSize">
+           <property name="text">
+            <string>&lt;database not selected&gt;</string>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>124</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="page_2">
       <layout class="QGridLayout" name="gridLayout_4">
        <property name="topMargin">
@@ -365,16 +472,6 @@
      </widget>
     </widget>
    </item>
-   <item row="3" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>

src/lib/webview/tabbedwebview.cpp

@@ -280,7 +280,7 @@ void TabbedWebView::contextMenuEvent(QContextMenuEvent* event)
 
     if (!m_menu->isEmpty()) {
         //Prevent choosing first option with double rightclick
-        const QPoint &pos = mapToGlobal(event->pos());
+        const QPoint &pos = event->globalPos();
         QPoint p(pos.x(), pos.y() + 1);
 
         m_menu->popup(p);

src/main/main.cpp

@@ -18,9 +18,7 @@
 
 #include <iostream>
 
-#include "commandlineoptions.h"
 #include "mainapplication.h"
-#include "proxystyle.h"
 
 #ifdef Q_WS_X11
 #include <signal.h>
@@ -44,23 +42,7 @@ int main(int argc, char* argv[])
     signal(SIGPIPE, sigpipe_handler);
 #endif
 
-    QList<CommandLineOptions::ActionPair> cmdActions;
-
-    if (argc > 1) {
-        CommandLineOptions cmd(argc, argv);
-        cmdActions = cmd.getActions();
-        foreach(const CommandLineOptions::ActionPair & pair, cmdActions) {
-            switch (pair.action) {
-            case Qz::CL_ExitAction:
-                return 0;
-                break;
-            default:
-                break;
-            }
-        }
-    }
-
-    MainApplication app(cmdActions, argc, argv);
+    MainApplication app(argc, argv);
 
     if (app.isClosing()) {
 //        Not showing any output, otherwise XFCE shows "Failed to execute default browser. I/O error" error
@@ -70,8 +52,5 @@ int main(int argc, char* argv[])
         return 0;
     }
 
-    app.setStyle(new ProxyStyle());
-
-    int result = app.exec();
-    return result;
+    return app.exec();
 }

src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro

@@ -25,6 +25,7 @@ TRANSLATIONS = \
     translations/nl_NL.ts \
     translations/sr_BA.ts \
     translations/sr_RS.ts \
+    translations/sv_SE.ts \
     translations/zh_TW.ts \
 
 include(../../plugins.pri)

src/plugins/AccessKeysNavigation/akn_res.qrc

@@ -9,6 +9,7 @@
         <file>locale/nl_NL.qm</file>
         <file>locale/sr_BA.qm</file>
         <file>locale/sr_RS.qm</file>
+        <file>locale/sv_SE.qm</file>
         <file>locale/zh_TW.qm</file>
     </qresource>
 </RCC>

src/plugins/AccessKeysNavigation/translations/ja_JP.ts

@@ -36,7 +36,7 @@
     <message>
         <location filename="../akn_settings.ui" line="58"/>
         <source>Key for showing access keys:</source>
-        <translation>現在のアクセスキーに対応するキー:</translation>
+        <translation>アクセスキーを表示するキー:</translation>
     </message>
     <message>
         <location filename="../akn_settings.ui" line="103"/>

src/plugins/AccessKeysNavigation/translations/sv_SE.ts

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs_CZ">
+<context>
+    <name>AKN_Settings</name>
+    <message>
+        <location filename="../akn_settings.ui" line="14"/>
+        <source>Access Keys Navigation</source>
+        <translation>Navigation med Snabbknappar</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;Navigation med Snabbknappar&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>Dubbeltryck</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="58"/>
+        <source>Key for showing access keys:</source>
+        <translation>Tangent för att visa snabbknappar:</translation>
+    </message>
+    <message>
+        <location filename="../akn_settings.ui" line="103"/>
+        <source>License</source>
+        <translation>Licens</translation>
+    </message>
+</context>
+</TS>

src/plugins/MouseGestures/MouseGestures.pro

@@ -34,6 +34,7 @@ TRANSLATIONS = \
     translations/sk_SK.ts \
     translations/sr_BA.ts \
     translations/sr_RS.ts \
+    translations/sv_SE.ts \
     translations/zh_TW.ts \
 
 include(../../plugins.pri)

src/plugins/MouseGestures/mousegestures.qrc

@@ -20,6 +20,7 @@
         <file>locale/sk_SK.qm</file>
         <file>locale/sr_BA.qm</file>
         <file>locale/sr_RS.qm</file>
+        <file>locale/sv_SE.qm</file>
         <file>locale/zh_TW.qm</file>
     </qresource>
 </RCC>

src/plugins/MouseGestures/translations/sv_SE.ts

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs_CZ">
+<context>
+    <name>MouseGesturesSettingsDialog</name>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="14"/>
+        <source>Mouse Gestures</source>
+        <translation>Musgester</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="42"/>
+        <source>&lt;h1&gt;Mouse Gestures&lt;/h1&gt;</source>
+        <translation>&lt;h1&gt;Musgester&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>Tryck och håll ner musens mittenknapp och rör musen enligt anvisningarna.</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;Stopp&lt;/b&gt;&lt;br/&gt;Stoppa hämtning av sida</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;Ny flik&lt;/b&gt;&lt;br/&gt;Öppna en ny flik</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;Bakåt&lt;/b&gt;&lt;br/&gt;Gå bakåt i historiken</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;Framåt&lt;/b&gt;&lt;br/&gt;Gå framåt i historiken</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;Hämta om&lt;/b&gt;&lt;br/&gt;Hämta om sida</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;Stäng flik&lt;/b&gt;&lt;br/&gt;Stäng aktuell flik</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;Hem&lt;/b&gt;&lt;br/&gt;Gå till startsidan</translation>
+    </message>
+    <message>
+        <location filename="../mousegesturessettingsdialog.ui" line="225"/>
+        <source>License</source>
+        <translation>Licens</translation>
+    </message>
+</context>
+</TS>

src/plugins/TestPlugin/TestPlugin.pro

@@ -20,6 +20,7 @@ TRANSLATIONS += translations/cs_CZ.ts\
                 translations/sk_SK.ts\
                 translations/sr_BA.ts\
                 translations/sr_RS.ts\
+                translations/sv_SE.ts\
                 translations/zh_CN.ts\
                 translations/zh_TW.ts\
 

src/plugins/TestPlugin/testplugin.qrc

@@ -8,6 +8,7 @@
         <file>locale/sk_SK.qm</file>
         <file>locale/sr_BA.qm</file>
         <file>locale/sr_RS.qm</file>
+        <file>locale/sv_SE.qm</file>
         <file>locale/zh_CN.qm</file>
         <file>locale/zh_TW.qm</file>
     </qresource>

src/plugins/TestPlugin/translations/ja_JP.ts

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja_JP" sourcelanguage="en_US">
+<context>
+    <name>TestPlugin</name>
+    <message>
+        <location filename="../testplugin.cpp" line="92"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="103"/>
+        <source>Example Plugin Settings</source>
+        <translation>Example Pluginの設定</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="127"/>
+        <source>My first plugin action</source>
+        <translation>プラグインの動作確認</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="139"/>
+        <source>Hello</source>
+        <translation>こんにちは</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="139"/>
+        <source>First plugin action works :-)</source>
+        <translation>プラグインは正常に動作しました(^_^)</translation>
+    </message>
+</context>
+</TS>

src/plugins/TestPlugin/translations/sv_SE.ts

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs_CZ" sourcelanguage="en_US">
+<context>
+    <name>TestPlugin</name>
+    <message>
+        <location filename="../testplugin.cpp" line="92"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="103"/>
+        <source>Example Plugin Settings</source>
+        <translation>Inställningar för exempelplugin</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="127"/>
+        <source>My first plugin action</source>
+        <translation>Min första pluginfunktion</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="139"/>
+        <source>Hello</source>
+        <translation>Hallå</translation>
+    </message>
+    <message>
+        <location filename="../testplugin.cpp" line="139"/>
+        <source>First plugin action works :-)</source>
+        <translation>Min första pluginfunktion fungerar :-)</translation>
+    </message>
+</context>
+</TS>

translations/empty.ts

@@ -806,6 +806,14 @@
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clear web databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear local storage</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClickToFlash</name>
@@ -2203,6 +2211,18 @@
         <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Exceptions&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use different proxy for https connection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3332,6 +3352,30 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>Preview not available</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Database details&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;database not selected&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No databases are used by this page.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SiteInfoWidget</name>
@@ -3505,6 +3549,13 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SqueezeLabelV2</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>TabBar</name>
     <message>
@@ -3785,6 +3836,10 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>JavaScript alert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown network error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebSearchBar</name>

translations/homepage/ja_JP.php

@@ -14,11 +14,11 @@ $translated_by = "このページはDaiki Nodaが翻訳しました";
 
 //Home Page
 $actual_version = "最新版";
-$actual_version_text = "最新版はこちらから". $qupzilla_version_date .
+$actual_version_text = "最新版の更新が行われたのは". $qupzilla_version_date . "です。"
 					   "最新版のバージョンは" . $qupzilla_version . "です。変更点については更新履歴(changelog)を見てください。<br/>ダウンロードは<a href=\"download\">こちら</a>から！";
 $actual_version_button = "DOWNLOAD";
 $older_versions = "更新履歴";
-$older_versions_text = "各バージョンごとの機能の変遷や今までのQupZillaの更新について知りたいですか？<br/>それらはすべてgithubの<a>changelog</a>から参照できます。";
+$older_versions_text = "各バージョンごとの機能の変遷や今までのQupZillaの更新について知りたいですか？<br/>それらはすべてgithubの<a>changelog</a>から参照することができます。";
 $older_versions_button = "Changelog";
 $reportbug = "問題を報告する";
 $reportbug_text = "あなたがバグを発見した場合、あるいはQupzillaがよりよく<a>発展</a>するアイデアを持っているなら<br/>ぜひgithubのissue trackerにissueを投稿してください。";
@@ -55,8 +55,8 @@ $view_source = "view source on github.com";
 $download_snapshot = "最新のsnapshotをダウンロードする";
 
 // Contribute Page
-$contribute_to = "QupZillaへの寄与";
-$contribute_text = "QupZillaはオープンソースプロジェクトであり、あなた方の協力を歓迎します。パッチを送ってくださることは非常にうれしいです。でもコードをハッキングしてバグをつぶすことが貢献の唯一の手段ではありません。QupZillaを翻訳する。友達にQupZillaを勧める。どのような貢献もありがたいです。";
+$contribute_to = "QupZillaがよりよいブラウザとなるために";
+$contribute_text = "QupZillaはオープンソースプロジェクトであり、あなた方の協力を歓迎します。もちろんパッチを送ってくださることは非常にうれしいです。でもコードをハッキングしてバグをつぶすことが貢献の唯一の手段ではありません。QupZillaを翻訳する。友達にQupZillaを勧める。どのような貢献も我々にとって非常にありがたいことです。";
 $getting_source = "ソースを入手する";
 $getting_source_text1 = "もっとも簡単にQupZillaのソースを手に入れる方法はgithubでcloneすることです。このコマンドを実行すればできます。";
 $getting_source_text2 = "バグの発見やパッチはe-mailやgithubで受け付けています。";
@@ -64,7 +64,7 @@ $translating = "QupZillaを翻訳する";
 $translating_text = "翻訳もQupZillaの大きな助けとなります。新しい翻訳を開始するときはまず私(作者)にお知らせください。必要な作業をいくつかします。翻訳の追加や改善はe-mailやgithubで受け付けています。";
 $translating_moreinfo = "翻訳に関するより詳しい情報は<a href='https://github.com/nowrep/QupZilla/wiki/Translating'>ここ</a>を見て下さい。 [wiki at github]";
 $creators = "QupZillaはだれが作ったのか?";
-$creators_text = "プロジェクトオーナー、メンテナー、メイン開発の<b>David Rosca</b>はチェコの学生です (nowrep).<br/>
+$creators_text = "プロジェクトオーナー、メンテナー、メイン開発の<b>David Rosca</b>はチェコの学生です (nowrep)。<br/>
 コーディングや翻訳、サポートで貢献のあった方のリストも<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 = "友達にQupZillaをすすめる！";
 $share_with_friends_text = "QupZillaを気に入っていただけましたか？ ぜひお友達とシェアしてください！";

translations/ja_JP.ts

@@ -822,6 +822,15 @@
         <source>All</source>
         <translation>すべて</translation>
     </message>
+    <message>
+        <source>Clear web databases</source>
+        <translation>webデータベースを消去する</translation>
+    </message>
+    <message>
+        <source>Clear local storage</source>
+        <translatorcomment>未定</translatorcomment>
+        <translation>local strageを消去する</translation>
+    </message>
 </context>
 <context>
     <name>ClickToFlash</name>
@@ -2298,6 +2307,18 @@
         <translatorcomment>なにこれこわい</translatorcomment>
         <translation>エクステンション</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Exceptions&lt;/b&gt;</source>
+        <translation>&lt;b&gt;例外&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Server:</source>
+        <translation>サーバー:</translation>
+    </message>
+    <message>
+        <source>Use different proxy for https connection</source>
+        <translation>https接続の際には異なるプロキシを使用する</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3484,6 +3505,30 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>Preview not available</source>
         <translation>この画像のプレビューはできません</translation>
     </message>
+    <message>
+        <source>Databases</source>
+        <translation>データベース</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Database details&lt;/b&gt;</source>
+        <translation>&lt;b&gt;データベースの詳細&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>名前:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation>パス:</translation>
+    </message>
+    <message>
+        <source>&lt;database not selected&gt;</source>
+        <translation>&lt;データベースが選択されていません&gt;</translation>
+    </message>
+    <message>
+        <source>No databases are used by this page.</source>
+        <translation>このページではデータベースは使用されていません。</translation>
+    </message>
 </context>
 <context>
     <name>SiteInfoWidget</name>
@@ -3664,6 +3709,13 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <translation>画像ファイル</translation>
     </message>
 </context>
+<context>
+    <name>SqueezeLabelV2</name>
+    <message>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+</context>
 <context>
     <name>TabBar</name>
     <message>
@@ -3964,6 +4016,10 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>JavaScript alert</source>
         <translation>Javascriptアラート</translation>
     </message>
+    <message>
+        <source>Unknown network error</source>
+        <translation>予期しないエラーが発生しました</translation>
+    </message>
 </context>
 <context>
     <name>WebSearchBar</name>

translations/ka_GE.ts

@@ -810,6 +810,14 @@
         <source>All</source>
         <translation>ყველა</translation>
     </message>
+    <message>
+        <source>Clear web databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear local storage</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClickToFlash</name>
@@ -2248,6 +2256,18 @@
         <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Exceptions&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server:</source>
+        <translation type="unfinished">სერვერი:</translation>
+    </message>
+    <message>
+        <source>Use different proxy for https connection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3398,6 +3418,30 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>Preview not available</source>
         <translation>გადახედვა ხელმიუწვდომელია</translation>
     </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Database details&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">სახელი:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished">მდებარეობა:</translation>
+    </message>
+    <message>
+        <source>&lt;database not selected&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No databases are used by this page.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SiteInfoWidget</name>
@@ -3575,6 +3619,13 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SqueezeLabelV2</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished">კოპირება</translation>
+    </message>
+</context>
 <context>
     <name>TabBar</name>
     <message>
@@ -3864,6 +3915,10 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
         <source>JavaScript alert</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unknown network error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebSearchBar</name>

translations/pt_BR.ts

@@ -436,7 +436,7 @@
     </message>
     <message>
         <source>&lt;b&gt;Note:&lt;/b&gt; Currently, only import from Html File can import also bookmark folders.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Observação:&lt;/b&gt; Atualmente, estamos importanto favoritos e pastas somente de arquivos HTML.</translation>
     </message>
 </context>
 <context>
@@ -573,7 +573,7 @@
     </message>
     <message>
         <source>Open link in current &amp;tab</source>
-        <translation>Abrir link na aba a&amp;tual</translation>
+        <translation>Abrir link na guia a&amp;tual</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
@@ -652,7 +652,7 @@
     </message>
     <message>
         <source>Show Only Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostras Somente Icons</translation>
     </message>
 </context>
 <context>
@@ -711,11 +711,11 @@
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">Remover</translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>Add to Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar aos Favoritos</translation>
     </message>
 </context>
 <context>
@@ -838,6 +838,14 @@
         <source>Earlier Today</source>
         <translation>Hoje</translation>
     </message>
+    <message>
+        <source>Clear web databases</source>
+        <translation>Limpar Banco de Dados da Web</translation>
+    </message>
+    <message>
+        <source>Clear local storage</source>
+        <translation>Limpar arquivos temporários</translation>
+    </message>
 </context>
 <context>
     <name>ClickToFlash</name>
@@ -878,7 +886,7 @@
     <name>CloseDialog</name>
     <message>
         <source>There are still open tabs</source>
-        <translation type="obsolete">Ainda existem abas abertas</translation>
+        <translation type="obsolete">Você ainda possui guias abertas</translation>
     </message>
     <message>
         <source>Don&apos;t ask again</source>
@@ -973,43 +981,43 @@
     </message>
     <message>
         <source>Stored Cookies</source>
-        <translation type="unfinished"></translation>
+        <translation>Cookies Salvos</translation>
     </message>
     <message>
         <source>Cookie Filtering</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrar Cookie</translation>
     </message>
     <message>
         <source>&lt;b&gt;Cookie whitelist&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Cookie Whitelist&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Cookies from these servers will ALWAYS be accepted (even if you have disabled saving cookies)</source>
-        <translation type="unfinished"></translation>
+        <translation>Cookies desses servidores SEMPRE serão aceitos (mesmo que você desabilite a função cookies)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Adicionar</translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished">Remover</translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>&lt;b&gt;Cookie blacklist&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Cookies Blacklist&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Cookies from these servers will NEVER be accepted</source>
-        <translation type="unfinished"></translation>
+        <translation>Cookies desses servidores NUNCA serão aceitos (mesmo que você habilite a função cookies)</translation>
     </message>
     <message>
         <source>Add to whitelist</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar à whitelist</translation>
     </message>
     <message>
         <source>Add to blacklist</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar à Blacklist</translation>
     </message>
 </context>
 <context>
@@ -1248,7 +1256,7 @@ não foi encontrado!</translation>
     </message>
     <message>
         <source>Image files</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagens</translation>
     </message>
 </context>
 <context>
@@ -1408,7 +1416,7 @@ não foi encontrado!</translation>
     <name>LicenseViewer</name>
     <message>
         <source>License Viewer</source>
-        <translation type="unfinished">Visualizador de licença</translation>
+        <translation>Visualizador de licença</translation>
     </message>
 </context>
 <context>
@@ -1440,7 +1448,7 @@ não foi encontrado!</translation>
     <message>
         <source>.co.uk</source>
         <comment>Append domain name on ALT + Enter = Should be different for every country</comment>
-        <translation type="unfinished">.com.br</translation>
+        <translation>.com.br</translation>
     </message>
 </context>
 <context>
@@ -1619,11 +1627,11 @@ não foi encontrado!</translation>
     </message>
     <message>
         <source>Error!</source>
-        <translation type="unfinished">Erro!</translation>
+        <translation>Erro!</translation>
     </message>
     <message>
         <source>Cannot load extension!</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível carregar essa extensão!</translation>
     </message>
 </context>
 <context>
@@ -2270,15 +2278,27 @@ não foi encontrado!</translation>
     </message>
     <message>
         <source>Allow Netscape Plugins (Flash plugin)</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir Plugins NetScape (Flash plugin)</translation>
     </message>
     <message>
         <source>Don&apos;t load tabs until selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Não carregar guias até ser selecionada</translation>
     </message>
     <message>
         <source>Extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Extensões</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Exceptions&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Excessões&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Server:</source>
+        <translation>Servidor:</translation>
+    </message>
+    <message>
+        <source>Use different proxy for https connection</source>
+        <translation>Usar proxy diferente para conexões https</translation>
     </message>
 </context>
 <context>
@@ -2675,44 +2695,45 @@ não foi encontrado!</translation>
     </message>
     <message>
         <source>Configuration Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informações de Configurações</translation>
     </message>
     <message>
         <source>HTML files</source>
-        <translation type="unfinished"></translation>
+        <translation>Arquivos HTML</translation>
     </message>
     <message>
         <source>Image files</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagens</translation>
     </message>
     <message>
         <source>Text files</source>
-        <translation type="unfinished"></translation>
+        <translation>Arquivos de texto</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os Arquivos</translation>
     </message>
     <message>
         <source>Last session crashed</source>
-        <translation type="unfinished">O navegador foi fechado de forma incorreta</translation>
+        <translation>O navegador foi fechado de forma incorreta</translation>
     </message>
     <message>
         <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>
+        <translation>&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>
+        <translation>Ainda há %1 guias abertas. A sua sessão não será salva.
+Você tem certeza que deseja sair do QupZilla?</translation>
     </message>
     <message>
         <source>Don&apos;t ask again</source>
-        <translation type="unfinished">Não perguntar novamente</translation>
+        <translation>Não perguntar novamente</translation>
     </message>
     <message>
         <source>There are still open tabs</source>
-        <translation type="unfinished">Ainda existem abas abertas</translation>
+        <translation>Ainda existem guias abertas</translation>
     </message>
 </context>
 <context>
@@ -2931,99 +2952,99 @@ Are you sure to quit QupZilla?</source>
     </message>
     <message>
         <source>E-mail is optional&lt;br/&gt;&lt;b&gt;Note: &lt;/b&gt;Please read how to make a bug report &lt;a href=%1&gt;here&lt;/a&gt; first.</source>
-        <translation type="unfinished"></translation>
+        <translation>O Email é opicional&lt;br/&gt;&lt;b&gt;Observação:&lt;/b&gt;Por favor, leia como reportar um bug &lt;a href=%1&gt;aqui&lt;/a&gt; antes.</translation>
     </message>
     <message>
         <source>Cover</source>
-        <translation type="unfinished"></translation>
+        <translation>Cover</translation>
     </message>
     <message>
         <source>Configuration Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informações de Configurações</translation>
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished">Preferências</translation>
+        <translation>Preferências</translation>
     </message>
     <message>
         <source>Option</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished">Valor</translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"></translation>
+        <translation>Autor</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição</translation>
     </message>
     <message>
         <source>Application version</source>
-        <translation type="unfinished"></translation>
+        <translation>Versão do Aplicativo</translation>
     </message>
     <message>
         <source>Qt version</source>
-        <translation type="unfinished"></translation>
+        <translation>Versão do Qt</translation>
     </message>
     <message>
         <source>Build Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração da compilação</translation>
     </message>
     <message>
         <source>Disabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Desabilitado</translation>
     </message>
     <message>
         <source>&lt;b&gt;Enabled&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Habilitado&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Debug build</source>
-        <translation type="unfinished"></translation>
+        <translation>Compilar</translation>
     </message>
     <message>
         <source>WebGL support</source>
-        <translation type="unfinished"></translation>
+        <translation>Suporte WebGL</translation>
     </message>
     <message>
         <source>Windows 7 API</source>
-        <translation type="unfinished"></translation>
+        <translation>Windows 7 API</translation>
     </message>
     <message>
         <source>KDE integration</source>
-        <translation type="unfinished"></translation>
+        <translation>Integração com o KDE</translation>
     </message>
     <message>
         <source>Portable build</source>
-        <translation type="unfinished"></translation>
+        <translation>Compilação Portátil</translation>
     </message>
     <message>
         <source>Extensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Extensões</translation>
     </message>
     <message>
         <source>No available extensions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não há extensões disponíveis.</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>
+        <translation>Se você estiver enfrentando problemas com o QupZilla, tente desabilitar as extensões.&lt;br/&gt;Se não funcionar, por favor, preencha o formulário abaixo: </translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Fechar</translation>
+        <translation>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>
+        <translation>Essa página contém informações sobre as configurações atuais do QupZilla - que são importantes para sabermos a causa do problema. Por favor, inclua essas informações quanto for reportar um bug (por favor, escreva em Inglês).</translation>
     </message>
 </context>
 <context>
@@ -3397,7 +3418,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>Save image...</source>
-        <translation>Salvaragem...</translation>
+        <translation>Salvar imagem...</translation>
     </message>
     <message>
         <source>Security</source>
@@ -3421,12 +3442,36 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>&lt;b&gt;Your connection to this page is secured with this certificate: &lt;/b&gt;</source>
-        <translation>&lt;b&gt;A conexão para essa página é seguda com um certificado.&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;A conexão para essa página é sgura por causa desse certificado.&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Cannot write to file!</source>
         <translation>Não foi possível escrever no arquivo!</translation>
     </message>
+    <message>
+        <source>Databases</source>
+        <translation>Banco de Dados</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Database details&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Detalhe do banco de dados&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Nome:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation>Atalho:</translation>
+    </message>
+    <message>
+        <source>&lt;database not selected&gt;</source>
+        <translation>&lt;nenhum banco de dados selecionado&gt;</translation>
+    </message>
+    <message>
+        <source>No databases are used by this page.</source>
+        <translation>Essa página não usa nenhum banco de dados.</translation>
+    </message>
 </context>
 <context>
     <name>SiteInfoWidget</name>
@@ -3601,7 +3646,14 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>Image files</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagens</translation>
+    </message>
+</context>
+<context>
+    <name>SqueezeLabelV2</name>
+    <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
 </context>
 <context>
@@ -3695,7 +3747,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>Loading...</source>
-        <translation>A carregar...</translation>
+        <translation>Carregando...</translation>
     </message>
     <message>
         <source>No Named Page</source>
@@ -3853,7 +3905,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>QupZilla can&apos;t load page from %1.</source>
-        <translation>O Qupzilla não conseguiu carregar a página %1.</translation>
+        <translation>O QupZilla não conseguiu carregar a página %1.</translation>
     </message>
     <message>
         <source>Server not found</source>
@@ -3891,7 +3943,11 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>JavaScript alert</source>
-        <translation type="unfinished"></translation>
+        <translation>Alerta JavaScript</translation>
+    </message>
+    <message>
+        <source>Unknown network error</source>
+        <translation>Erro de rede desconhecido</translation>
     </message>
 </context>
 <context>
@@ -4081,7 +4137,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>&amp;Copy Media Address</source>
-        <translation>&amp;Copiar endereço multimidia</translation>
+        <translation>&amp;Copiar endereço multimídia</translation>
     </message>
     <message>
         <source>Send text...</source>
@@ -4089,7 +4145,7 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>&amp;Send Media Address</source>
-        <translation>&amp;Enviar endereço multimidia</translation>
+        <translation>&amp;Enviar endereço multimídia</translation>
     </message>
     <message>
         <source>Copy image ad&amp;dress</source>
@@ -4097,11 +4153,11 @@ Após adicionar ou remover os caminhos dos certificados, você terá que reinici
     </message>
     <message>
         <source>Search with...</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar com...</translation>
     </message>
     <message>
         <source>Create Search Engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar Motor de Busca</translation>
     </message>
 </context>
 <context>

translations/ro_RO.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;Toate drepturile rezervate.&lt;br/&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;&amp;copy; %1 %2&lt;br/&gt;Toate drepturile rezervate.&lt;br/&gt;</translation>
     </message>
     <message>
         <source>&lt;small&gt;Build time: %1 &lt;/small&gt;&lt;/p&gt;</source>
@@ -434,6 +434,10 @@
         <source>Unable to open database. Is Firefox running?</source>
         <translation>Baza de date nu poate fi deschisă. Firefox rulează?</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Currently, only import from Html File can import also bookmark folders.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -806,6 +810,14 @@
         <source>All</source>
         <translation>Tot</translation>
     </message>
+    <message>
+        <source>Clear web databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear local storage</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClickToFlash</name>
@@ -846,11 +858,11 @@
     <name>CloseDialog</name>
     <message>
         <source>There are still open tabs</source>
-        <translation>Încă sunt taburi deschise</translation>
+        <translation type="obsolete">Încă sunt taburi deschise</translation>
     </message>
     <message>
         <source>Don&apos;t ask again</source>
-        <translation>Nu întreba din nou</translation>
+        <translation type="obsolete">Nu întreba din nou</translation>
     </message>
 </context>
 <context>
@@ -1411,11 +1423,11 @@ nu a putut fi găsit!</translation>
     <name>MainApplication</name>
     <message>
         <source>Last session crashed</source>
-        <translation>Ultima sesiune a eșuat</translation>
+        <translation type="obsolete">Ultima sesiune a eșuat</translation>
     </message>
     <message>
         <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 a eșuat:-(&lt;/b&gt;&lt;br/&gt;Oops, ultima sesiune a QupZilla a fost întreruptă in mod neașteptat. Ne cerem scuze pentru asta. Ați dori să incercați să restaurați ultima sesiune?</translation>
+        <translation type="obsolete">&lt;b&gt;QupZilla a eșuat:-(&lt;/b&gt;&lt;br/&gt;Oops, ultima sesiune a QupZilla a fost întreruptă in mod neașteptat. Ne cerem scuze pentru asta. Ați dori să incercați să restaurați ultima sesiune?</translation>
     </message>
 </context>
 <context>
@@ -1579,7 +1591,11 @@ nu a putut fi găsit!</translation>
     </message>
     <message>
         <source>Cannot load plugin!</source>
-        <translation>Plugin-ul nu poate fi încărcat!</translation>
+        <translation type="obsolete">Plugin-ul nu poate fi încărcat!</translation>
+    </message>
+    <message>
+        <source>Cannot load extension!</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1637,7 +1653,7 @@ nu a putut fi găsit!</translation>
     </message>
     <message>
         <source>Plugins</source>
-        <translation>Plugin-uri</translation>
+        <translation type="obsolete">Plugin-uri</translation>
     </message>
     <message>
         <source>Other</source>
@@ -2230,6 +2246,22 @@ nu a putut fi găsit!</translation>
         <source>Don&apos;t load tabs until selected</source>
         <translation>Nu incărca tab-uri până când nu sunt selectate</translation>
     </message>
+    <message>
+        <source>Extensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Exceptions&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server:</source>
+        <translation type="unfinished">Server:</translation>
+    </message>
+    <message>
+        <source>Use different proxy for https connection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -2621,7 +2653,7 @@ nu a putut fi găsit!</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>Mai sunt %1 tab-uri deschise și sesiunea dvs. nu va fi stocată. Sunteți sigur că doriți să închideți QupZilla?</translation>
+        <translation type="obsolete">Mai sunt %1 tab-uri deschise și sesiunea dvs. nu va fi stocată. Sunteți sigur că doriți să închideți QupZilla?</translation>
     </message>
     <message>
         <source>You have successfully added RSS feed &quot;%1&quot;.</source>
@@ -2643,6 +2675,27 @@ nu a putut fi găsit!</translation>
         <source>All files</source>
         <translation>Toate fișierele</translation>
     </message>
+    <message>
+        <source>Last session crashed</source>
+        <translation type="unfinished">Ultima sesiune a eșuat</translation>
+    </message>
+    <message>
+        <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 a eșuat:-(&lt;/b&gt;&lt;br/&gt;Oops, ultima sesiune a QupZilla a fost întreruptă in mod neașteptat. Ne cerem scuze pentru asta. Ați dori să incercați să restaurați ultima sesiune?</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">Nu întreba din nou</translation>
+    </message>
+    <message>
+        <source>There are still open tabs</source>
+        <translation type="unfinished">Încă sunt taburi deschise</translation>
+    </message>
 </context>
 <context>
     <name>QupZillaSchemeReply</name>
@@ -2660,7 +2713,7 @@ nu a putut fi găsit!</translation>
     </message>
     <message>
         <source>If you are experiencing problems with QupZilla, please try to disable all plugins first. &lt;br/&gt;If this does not fix it, then please fill out this form: </source>
-        <translation>Dacă întâmpinați probleme cu QupZilla, vă rugăm încercați să dezactivați toate plugin-urile. &lt;br/&gt;Dacă asta nu remediază problema, vă rugăm cumpletați următorul formular:</translation>
+        <translation type="obsolete">Dacă întâmpinați probleme cu QupZilla, vă rugăm încercați să dezactivați toate plugin-urile. &lt;br/&gt;Dacă asta nu remediază problema, vă rugăm cumpletați următorul formular:</translation>
     </message>
     <message>
         <source>Your E-mail</source>
@@ -2820,7 +2873,7 @@ nu a putut fi găsit!</translation>
     </message>
     <message>
         <source>This page contains information about QupZilla&apos;s current configuration, plugins, etc, all relevant information for troubleshooting. Please include these information when sending bug reports.</source>
-        <translation>Această pagină contine informații despre configurarea curentă a QupZilla, plugin-uri, etc. toate informațiile relevante pentru remedierea problemelor. Vă rugăm să includeți aceste informații la trimiterea raport-urilor despre bug-uri.</translation>
+        <translation type="obsolete">Această pagină contine informații despre configurarea curentă a QupZilla, plugin-uri, etc. toate informațiile relevante pentru remedierea problemelor. Vă rugăm să includeți aceste informații la trimiterea raport-urilor despre bug-uri.</translation>
     </message>
     <message>
         <source>Browser Identification</source>
@@ -2844,7 +2897,7 @@ nu a putut fi găsit!</translation>
     </message>
     <message>
         <source>Plugins</source>
-        <translation>Plugin-uri</translation>
+        <translation type="obsolete">Plugin-uri</translation>
     </message>
     <message>
         <source>Name</source>
@@ -2904,7 +2957,7 @@ nu a putut fi găsit!</translation>
     </message>
     <message>
         <source>No available plugins.</source>
-        <translation>Nu sunt plugin-uri disponibile.</translation>
+        <translation type="obsolete">Nu sunt plugin-uri disponibile.</translation>
     </message>
     <message>
         <source>Build Configuration</source>
@@ -2938,6 +2991,26 @@ nu a putut fi găsit!</translation>
         <source>Portable build</source>
         <translation>Configurare portabilă</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">Închide</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>
+    <message>
+        <source>Extensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No available extensions.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RSSManager</name>
@@ -3339,6 +3412,30 @@ După adăugarea sau ștergerea de căi pentru certificate, este necesar să res
         <source>Preview not available</source>
         <translation>Previzualizare indisponibilă</translation>
     </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Database details&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Nume:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished">Cale:</translation>
+    </message>
+    <message>
+        <source>&lt;database not selected&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No databases are used by this page.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SiteInfoWidget</name>
@@ -3419,7 +3516,7 @@ După adăugarea sau ștergerea de căi pentru certificate, este necesar să res
     </message>
     <message>
         <source>Delete</source>
-        <translation>Șterge</translation>
+        <translation type="obsolete">Șterge</translation>
     </message>
     <message>
         <source>Select All</source>
@@ -3516,6 +3613,13 @@ După adăugarea sau ștergerea de căi pentru certificate, este necesar să res
         <translation>Fișiere imagine</translation>
     </message>
 </context>
+<context>
+    <name>SqueezeLabelV2</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished">Copiază</translation>
+    </message>
+</context>
 <context>
     <name>TabBar</name>
     <message>
@@ -3790,12 +3894,20 @@ După adăugarea sau ștergerea de căi pentru certificate, este necesar să res
     </message>
     <message>
         <source>JavaScript alert - %1</source>
-        <translation>Alertă JavaScript - %1</translation>
+        <translation type="obsolete">Alertă JavaScript - %1</translation>
     </message>
     <message>
         <source>Choose file...</source>
         <translation>Alege fișier...</translation>
     </message>
+    <message>
+        <source>Unknown network error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>JavaScript alert</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebSearchBar</name>

translations/sk_SK.ts

@@ -838,6 +838,14 @@
         <source>Earlier Today</source>
         <translation>Dnes</translation>
     </message>
+    <message>
+        <source>Clear web databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear local storage</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClickToFlash</name>
@@ -2280,6 +2288,18 @@
         <source>Extensions</source>
         <translation>Rozšírenia</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Exceptions&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server:</source>
+        <translation type="unfinished">Server:</translation>
+    </message>
+    <message>
+        <source>Use different proxy for https connection</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
@@ -3436,6 +3456,30 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <source>Cannot write to file!</source>
         <translation>Nedá sa zapisovať do súboru!</translation>
     </message>
+    <message>
+        <source>Databases</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Database details&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished">Názov:</translation>
+    </message>
+    <message>
+        <source>Path:</source>
+        <translation type="unfinished">Cesta:</translation>
+    </message>
+    <message>
+        <source>&lt;database not selected&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No databases are used by this page.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SiteInfoWidget</name>
@@ -3613,6 +3657,13 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <translation>Obrázky</translation>
     </message>
 </context>
+<context>
+    <name>SqueezeLabelV2</name>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished">Kopírovať</translation>
+    </message>
+</context>
 <context>
     <name>TabBar</name>
     <message>
@@ -3902,6 +3953,10 @@ Po pridaní či odobratí ciest k certifikátom je nutné reštartovať prehliad
         <source>JavaScript alert</source>
         <translation>JavaScript upozornenie</translation>
     </message>
+    <message>
+        <source>Unknown network error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WebSearchBar</name>

translations/translations.pri

@@ -20,8 +20,6 @@ TRANSLATIONS += $$PWD/cs_CZ.ts\
                 $$PWD/ja_JP.ts\
                 $$PWD/ro_RO.ts\
 
-include(../src/defines.pri)
-
 updateqm.input = TRANSLATIONS
 updateqm.output = $$PWD/../bin/locale/${QMAKE_FILE_BASE}.qm
 updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm $$PWD/../bin/locale/${QMAKE_FILE_BASE}.qm

windows/languages.nsh

@@ -278,6 +278,23 @@ LangString DESC_SecDesktop ${LANG_JAPANESE} "デスクトップにアイコン
 LangString DESC_SecExtensions ${LANG_JAPANESE} "QupZillaにhtm、htmlファイルを関連付けます。"
 LangString DESC_SecThemes ${LANG_JAPANESE} "QupZillaのデフォルトテーマ以外のテーマをダウンロードします。"
 
+;;;;SWEDISH
+LangString TITLE_SecMain ${LANG_SWEDISH} "Huvudkomponenter"
+LangString DESC_SecMain ${LANG_SWEDISH} "Programmets viktigaste komponenter."
+LangString TITLE_SecTranslations ${LANG_SWEDISH} "Översättningar"
+LangString DESC_SecTranslations ${LANG_SWEDISH} "Andra översättningar tillgängliga för installation. Förval är Engelska."
+LangString TITLE_SecPlugins ${LANG_SWEDISH} "Insticksmoduler"
+LangString DESC_SecPlugins ${LANG_SWEDISH} "Andra insticksmoduler tillgängliga för installation."
+LangString TITLE_SecExamplePlugin ${LANG_SWEDISH} "Exempel-plugin"
+LangString DESC_SecExamplePlugin ${LANG_SWEDISH} "Funktionslöst exempel på en insticksmodul."
+LangString TITLE_SecDesktop ${LANG_SWEDISH} "Skrivbordsikon"
+LangString DESC_SecDesktop ${LANG_SWEDISH} "Lägg till en ikon på skrivbordet."
+LangString TITLE_SecExtensions ${LANG_SWEDISH} "Filbindningar"
+LangString DESC_SecExtensions ${LANG_SWEDISH} "Associera QupZilla med .htm- och .html-filer"
+LangString FILE_Htm ${LANG_SWEDISH} "HTM-fil"
+LangString FILE_Html ${LANG_SWEDISH} "HTML-fil"
+LangString TITLE_SecThemes ${LANG_SWEDISH} "Teman"
+LangString DESC_SecThemes ${LANG_SWEDISH} "Ytterligare teman för QupZilla"
 
 ;;;;;;;;;
 ;;;;;;;;;
@@ -287,71 +304,55 @@ LangString DESC_SecThemes ${LANG_JAPANESE} "QupZillaのデフォルトテーマ
 LangString TITLE_SecMain ${LANG_KOREAN} "Main Components"
 LangString TITLE_SecMain ${LANG_RUSSIAN} "Main Components"
 LangString TITLE_SecMain ${LANG_SPANISH} "Main Components"
-LangString TITLE_SecMain ${LANG_SWEDISH} "Main Components"
 LangString DESC_SecMain ${LANG_KOREAN} "Main components of application."
 LangString DESC_SecMain ${LANG_RUSSIAN} "Main components of application."
 LangString DESC_SecMain ${LANG_SPANISH} "Main components of application."
-LangString DESC_SecMain ${LANG_SWEDISH} "Main components of application."
 
 LangString TITLE_SecTranslations ${LANG_KOREAN} "Translations"
 LangString TITLE_SecTranslations ${LANG_RUSSIAN} "Translations"
 LangString TITLE_SecTranslations ${LANG_SPANISH} "Translations"
-LangString TITLE_SecTranslations ${LANG_SWEDISH} "Translations"
 LangString DESC_SecTranslations ${LANG_KOREAN} "Other translations available to install. Default is English."
 LangString DESC_SecTranslations ${LANG_RUSSIAN} "Other translations available to install. Default is English."
 LangString DESC_SecTranslations ${LANG_SPANISH} "Other translations available to install. Default is English."
-LangString DESC_SecTranslations ${LANG_SWEDISH} "Other translations available to install. Default is English."
 
 LangString TITLE_SecPlugins ${LANG_KOREAN} "Plugins"
 LangString TITLE_SecPlugins ${LANG_RUSSIAN} "Plugins"
 LangString TITLE_SecPlugins ${LANG_SPANISH} "Plugins"
-LangString TITLE_SecPlugins ${LANG_SWEDISH} "Plugins"
 LangString DESC_SecPlugins ${LANG_KOREAN} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_RUSSIAN} "Other plugins available to install."
 LangString DESC_SecPlugins ${LANG_SPANISH} "Other plugins available to install."
-LangString DESC_SecPlugins ${LANG_SWEDISH} "Other plugins available to install."
 
 LangString TITLE_SecExamplePlugin ${LANG_KOREAN} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_RUSSIAN} "Example Plugin"
 LangString TITLE_SecExamplePlugin ${LANG_SPANISH} "Example Plugin"
-LangString TITLE_SecExamplePlugin ${LANG_SWEDISH} "Example Plugin"
 LangString DESC_SecExamplePlugin ${LANG_KOREAN} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_RUSSIAN} "Useless example plugin."
 LangString DESC_SecExamplePlugin ${LANG_SPANISH} "Useless example plugin."
-LangString DESC_SecExamplePlugin ${LANG_SWEDISH} "Useless example plugin."
 
 LangString TITLE_SecDesktop ${LANG_KOREAN} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_RUSSIAN} "Desktop Icon"
 LangString TITLE_SecDesktop ${LANG_SPANISH} "Desktop Icon"
-LangString TITLE_SecDesktop ${LANG_SWEDISH} "Desktop Icon"
 LangString DESC_SecDesktop ${LANG_KOREAN} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_RUSSIAN} "Add launcher to desktop."
 LangString DESC_SecDesktop ${LANG_SPANISH} "Add launcher to desktop."
-LangString DESC_SecDesktop ${LANG_SWEDISH} "Add launcher to desktop."
 
 LangString TITLE_SecExtensions ${LANG_KOREAN} "File Associations"
 LangString TITLE_SecExtensions ${LANG_RUSSIAN} "File Associations"
 LangString TITLE_SecExtensions ${LANG_SPANISH} "File Associations"
-LangString TITLE_SecExtensions ${LANG_SWEDISH} "File Associations"
 LangString DESC_SecExtensions ${LANG_KOREAN} "Associate QupZilla with .htm and .html files"
 LangString DESC_SecExtensions ${LANG_RUSSIAN} "Associate QupZilla with .htm and .html files"
 LangString DESC_SecExtensions ${LANG_SPANISH} "Associate QupZilla with .htm and .html files"
-LangString DESC_SecExtensions ${LANG_SWEDISH} "Associate QupZilla with .htm and .html files"
 
 LangString FILE_Htm ${LANG_KOREAN} "HTM File"
 LangString FILE_Htm ${LANG_RUSSIAN} "HTM File"
 LangString FILE_Htm ${LANG_SPANISH} "HTM File"
-LangString FILE_Htm ${LANG_SWEDISH} "HTM File"
 LangString FILE_Html ${LANG_KOREAN} "HTML File"
 LangString FILE_Html ${LANG_RUSSIAN} "HTML File"
 LangString FILE_Html ${LANG_SPANISH} "HTML File"
-LangString FILE_Html ${LANG_SWEDISH} "HTML File"
 
 LangString TITLE_SecThemes ${LANG_KOREAN} "Themes"
 LangString TITLE_SecThemes ${LANG_RUSSIAN} "Themes"
 LangString TITLE_SecThemes ${LANG_SPANISH} "Themes"
-LangString TITLE_SecThemes ${LANG_SWEDISH} "Themes"
 LangString DESC_SecThemes ${LANG_KOREAN} "Additional themes for QupZilla"
 LangString DESC_SecThemes ${LANG_RUSSIAN} "Additional themes for QupZilla"
 LangString DESC_SecThemes ${LANG_SPANISH} "Additional themes for QupZilla"
-LangString DESC_SecThemes ${LANG_SWEDISH} "Additional themes for QupZilla"