From 016003905ca0e8e459e3dc33e786beda8ec92f45 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Fri, 30 Jan 2015 17:00:07 -0500
Subject: Imported Upstream version 3.0.2

---
 .../guiSQLiteStudio/dialogs/aboutdialog.cpp        |  56 ++++++-
 .../guiSQLiteStudio/dialogs/aboutdialog.h          |   5 +-
 .../guiSQLiteStudio/dialogs/aboutdialog.ui         |  93 ++++++++++-
 .../guiSQLiteStudio/dialogs/bugdialog.cpp          |   1 -
 SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.ui |   4 +-
 .../dialogs/bugreportlogindialog.ui                |   2 +-
 .../guiSQLiteStudio/dialogs/columndialog.ui        |   2 +-
 .../guiSQLiteStudio/dialogs/configdialog.cpp       |  22 ++-
 .../guiSQLiteStudio/dialogs/configdialog.h         |   1 +
 .../guiSQLiteStudio/dialogs/configdialog.ui        | 180 ++++++++++++---------
 .../guiSQLiteStudio/dialogs/constraintdialog.ui    |   2 +-
 .../guiSQLiteStudio/dialogs/dbconverterdialog.cpp  |   1 -
 .../guiSQLiteStudio/dialogs/dbconverterdialog.ui   |   2 +-
 .../guiSQLiteStudio/dialogs/errorsconfirmdialog.ui |   2 +-
 .../guiSQLiteStudio/dialogs/exportdialog.ui        |  20 +--
 .../guiSQLiteStudio/dialogs/importdialog.ui        |   8 +-
 .../guiSQLiteStudio/dialogs/indexdialog.ui         |   2 +-
 .../guiSQLiteStudio/dialogs/languagedialog.cpp     |  34 ++++
 .../guiSQLiteStudio/dialogs/languagedialog.h       |  27 ++++
 .../guiSQLiteStudio/dialogs/languagedialog.ui      |  77 +++++++++
 .../guiSQLiteStudio/dialogs/messagelistdialog.ui   |   2 +-
 .../guiSQLiteStudio/dialogs/searchtextdialog.ui    |   4 +-
 .../dialogs/triggercolumnsdialog.ui                |  28 +++-
 .../guiSQLiteStudio/dialogs/triggerdialog.ui       |   4 +-
 24 files changed, 457 insertions(+), 122 deletions(-)
 create mode 100644 SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
 create mode 100644 SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.h
 create mode 100644 SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.ui

(limited to 'SQLiteStudio3/guiSQLiteStudio/dialogs')

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp
index df790de..0d291e5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp
@@ -4,6 +4,9 @@
 #include "sqlitestudio.h"
 #include "iconmanager.h"
 #include "services/extralicensemanager.h"
+#include "services/pluginmanager.h"
+#include "formmanager.h"
+#include "iconmanager.h"
 #include <QDebug>
 #include <QFile>
 
@@ -26,6 +29,7 @@ void AboutDialog::init(InitialMode initialMode)
 
     ui->tabWidget->setCurrentWidget(initialMode == ABOUT ? ui->about : ui->license);
 
+    // About
     QString distName;
     switch (getDistributionType())
     {
@@ -43,15 +47,23 @@ void AboutDialog::init(InitialMode initialMode)
     QString newLabelValue = ui->aboutLabel->text().arg(SQLITESTUDIO->getVersionString(), distName);
     ui->aboutLabel->setText(newLabelValue);
 
+    // Licenses
     licenseContents = "";
     int row = 1;
 
-    QHash<QString,QString> licenses = SQLITESTUDIO->getExtraLicenseManager()->getLicenses();
+    QHash<QString,QString> licenses = SQLITESTUDIO->getExtraLicenseManager()->getLicensesContents();
+    QString violation;
+    QString title;
     QHashIterator<QString,QString> it(licenses);
     while (it.hasNext())
     {
         it.next();
-        readLicense(row++, it.key(), it.value());
+        violation = QString();
+        title = it.key();
+        if (SQLITESTUDIO->getExtraLicenseManager()->isViolatedLicense(title))
+            violation = SQLITESTUDIO->getExtraLicenseManager()->getViolationMessage(title);
+
+        addLicense(row++, title, it.value(), violation);
     }
 
     buildIndex();
@@ -59,6 +71,18 @@ void AboutDialog::init(InitialMode initialMode)
     ui->licenseEdit->setHtml(licenseContents);
     indexContents.clear();
     licenseContents.clear();
+
+    // Environment
+    copyAct = new QAction(tr("Copy"), this);
+    ui->appDirEdit->setText(qApp->applicationDirPath());
+    ui->cfgDirEdit->setText(CFG->getConfigDir());
+    ui->pluginDirList->addItems(filterResourcePaths(PLUGINS->getPluginDirs()));
+    ui->iconDirList->addItems(filterResourcePaths(ICONMANAGER->getIconDirs()));
+    ui->formDirList->addItems(filterResourcePaths(FORMS->getFormDirs()));
+    ui->qtVerEdit->setText(QT_VERSION_STR);
+    ui->pluginDirList->addAction(copyAct);
+    ui->iconDirList->addAction(copyAct);
+    ui->formDirList->addAction(copyAct);
 }
 
 void AboutDialog::buildIndex()
@@ -68,16 +92,19 @@ void AboutDialog::buildIndex()
     for (const QString& idx : indexContents)
         entries += entryTpl.arg(idx);
 
-    licenseContents.prepend("<h3>Table of contents:</h3><ol>" + entries.join("") + "</ol>");
+    licenseContents.prepend(tr("<h3>Table of contents:</h3><ol>%2</ol>").arg(entries.join("")));
 }
 
-void AboutDialog::readLicense(int row, const QString& title, const QString& path)
+void AboutDialog::addLicense(int row, const QString& title, const QString& contents, const QString& violation)
 {
+    static_qstring(violatedTpl, "<span style=\"color: #FF0000;\">%1 (%2)</span>");
+
+    QString escapedTitle = title.toHtmlEscaped();
+    QString finalTitle = violation.isNull() ? escapedTitle : violatedTpl.arg(escapedTitle, violation);
     QString rowNum = QString::number(row);
-    QString contents = readFile(path);
-    licenseContents += "<h3>" + rowNum + ". " + title + "</h3>";
-    licenseContents += "<pre>" + contents + "</pre>";
-    indexContents += title;
+    licenseContents += "<h3>" + rowNum + ". " + finalTitle + "</h3>";
+    licenseContents += "<pre>" + contents.toHtmlEscaped() + "</pre>";
+    indexContents += finalTitle;
 }
 
 QString AboutDialog::readFile(const QString& path)
@@ -92,3 +119,16 @@ QString AboutDialog::readFile(const QString& path)
     file.close();
     return contents;
 }
+
+QStringList AboutDialog::filterResourcePaths(const QStringList& paths)
+{
+    QStringList output;
+    for (const QString& path : paths)
+    {
+        if (path.startsWith(":"))
+            continue;
+
+        output << path;
+    }
+    return output;
+}
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h
index 3c828c0..4d49145 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.h
@@ -26,12 +26,15 @@ class GUI_API_EXPORT AboutDialog : public QDialog
     private:
         void init(InitialMode initialMode);
         void buildIndex();
-        void readLicense(int row, const QString& title, const QString& path);
+        void addLicense(int row, const QString& title, const QString& contents, const QString& violation);
         QString readFile(const QString& path);
 
+        static QStringList filterResourcePaths(const QStringList& paths);
+
         Ui::AboutDialog *ui = nullptr;
         QStringList indexContents;
         QString licenseContents;
+        QAction* copyAct = nullptr;
 };
 
 #endif // ABOUTDIALOG_H
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.ui
index 67fa632..1239cf5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.ui
@@ -17,7 +17,7 @@
    <item row="0" column="1">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="about">
       <attribute name="title">
@@ -50,6 +50,97 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="env">
+      <attribute name="title">
+       <string>Environment</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="3" column="0">
+        <widget class="QLabel" name="iconDirLabel">
+         <property name="text">
+          <string>Icon directories</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2">
+        <widget class="QListWidget" name="pluginDirList">
+         <property name="contextMenuPolicy">
+          <enum>Qt::ActionsContextMenu</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="formDirLabel">
+         <property name="text">
+          <string>Form directories</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2">
+        <widget class="QListWidget" name="iconDirList">
+         <property name="contextMenuPolicy">
+          <enum>Qt::ActionsContextMenu</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="pluginDirLabel">
+         <property name="text">
+          <string>Plugin directories</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="appDirLabel">
+         <property name="text">
+          <string>Application directory</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="2">
+        <widget class="QLineEdit" name="appDirEdit">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="cfgDirLabel">
+         <property name="text">
+          <string>Configuration directory</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="2">
+        <widget class="QListWidget" name="formDirList">
+         <property name="contextMenuPolicy">
+          <enum>Qt::ActionsContextMenu</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QLineEdit" name="cfgDirEdit">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="qtVerLabel">
+         <property name="text">
+          <string>Qt version:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="2">
+        <widget class="QLabel" name="qtVerEdit">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item row="0" column="0">
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.cpp
index 7ab9c67..59a2ec6 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.cpp
@@ -65,7 +65,6 @@ QString BugDialog::getMessageAboutReportHistory()
 {
     return tr("You can see all your reported bugs and ideas by selecting menu '%1' and then '%2'.").arg(MAINWINDOW->getSQLiteStudioMenu()->title())
             .arg(MAINWINDOW->getAction(MainWindow::BUG_REPORT_HISTORY)->text());
-    return "";
 }
 
 void BugDialog::finishedBugReport(bool success, const QString& errorMsg)
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.ui
index f2dbcf3..3871436 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/bugdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Bugs and ideas</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -51,7 +51,7 @@
       <item>
        <widget class="QToolButton" name="helpButton">
         <property name="text">
-         <string>...</string>
+         <string notr="true">...</string>
         </property>
         <property name="icon">
          <iconset resource="../icons.qrc">
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/bugreportlogindialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/bugreportlogindialog.ui
index f6597bc..d1d26e6 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/bugreportlogindialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/bugreportlogindialog.ui
@@ -33,7 +33,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="passwordLabel">
         <property name="text">
-         <string>Password</string>
+         <string>Password:</string>
         </property>
        </widget>
       </item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.ui
index ac7e5ae..2133aca 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/columndialog.ui
@@ -36,7 +36,7 @@
       <item row="1" column="3">
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>,</string>
+         <string notr="true">,</string>
         </property>
        </widget>
       </item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
index 932036e..b22ee6e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
@@ -21,6 +21,7 @@
 #include "configmapper.h"
 #include "datatype.h"
 #include "uiutils.h"
+#include "translations.h"
 #include <QSignalMapper>
 #include <QLineEdit>
 #include <QSpinBox>
@@ -186,6 +187,7 @@ void ConfigDialog::init()
     initFormatterPlugins();
     initDataEditors();
     initShortcuts();
+    initLangs();
 
     connect(ui->categoriesTree, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(switchPage(QTreeWidgetItem*)));
     connect(ui->previewTabs, SIGNAL(currentChanged(int)), this, SLOT(updateStylePreview()));
@@ -959,6 +961,7 @@ void ConfigDialog::initInternalCustomConfigWidgets()
     QList<CustomConfigWidgetPlugin*> customWidgets;
     customWidgets << new StyleConfigWidget();
     customWidgets << new ListToStringListHash(&CFG_UI.General.DataEditorsOrder);
+    customWidgets << new ComboDataWidget(&CFG_CORE.General.Language);
     configMapper->setInternalCustomConfigWidgets(customWidgets);
 }
 
@@ -1235,7 +1238,7 @@ void ConfigDialog::initPluginsPage()
             builtIn = PLUGINS->isBuiltIn(pluginName);
             title = PLUGINS->getTitle(pluginName);
             if (builtIn)
-                title += tr(" (built-in)", "plugins manager in configuration dialog");
+                title += tr("%1 (built-in)", "plugins manager in configuration dialog").arg(title);
 
             item = new QTreeWidgetItem({title});
             item->setCheckState(0, PLUGINS->isLoaded(pluginName) ? Qt::Checked : Qt::Unchecked);
@@ -1489,6 +1492,23 @@ void ConfigDialog::initShortcuts(CfgCategory *cfgCategory)
     category->setExpanded(true);
 }
 
+void ConfigDialog::initLangs()
+{
+    QMap<QString, QString> langs = getAvailableLanguages();
+    int idx = 0;
+    int selected = -1;
+    for (const QString& lang : langs.keys())
+    {
+        ui->langCombo->addItem(lang, langs[lang]);
+        if (langs[lang] == SQLITESTUDIO->getCurrentLang())
+            selected = idx;
+
+        idx++;
+    }
+
+    ui->langCombo->setCurrentIndex(selected);
+}
+
 bool ConfigDialog::isPluginCategoryItem(QTreeWidgetItem *item) const
 {
     return item->parent() && item->parent()->parent() && item->parent()->parent() == getPluginsCategoryItem();
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h
index 95e9f1a..5661c1a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.h
@@ -56,6 +56,7 @@ class GUI_API_EXPORT ConfigDialog : public QDialog
         void initDataEditors();
         void initShortcuts();
         void initShortcuts(CfgCategory* cfgCategory);
+        void initLangs();
         void applyStyle(QWidget* widget, QStyle* style);
         QTreeWidgetItem* getPluginsCategoryItem() const;
         QTreeWidgetItem* getPluginsCategoryItem(PluginType* type) const;
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
index 040600e..966ebca 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
@@ -104,7 +104,7 @@
               <string>General</string>
              </property>
              <property name="statusTip">
-              <string>generalPage</string>
+              <string notr="true">generalPage</string>
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
@@ -116,7 +116,7 @@
               <string>Keyboard shortcuts</string>
              </property>
              <property name="statusTip">
-              <string>shortcutsPage</string>
+              <string notr="true">shortcutsPage</string>
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
@@ -128,7 +128,7 @@
               <string>Look &amp; feel</string>
              </property>
              <property name="statusTip">
-              <string>lookAndFeelPage</string>
+              <string notr="true">lookAndFeelPage</string>
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
@@ -139,7 +139,7 @@
                <string>Style</string>
               </property>
               <property name="statusTip">
-               <string>stylePage</string>
+               <string notr="true">stylePage</string>
               </property>
               <property name="icon">
                <iconset resource="../icons.qrc">
@@ -151,7 +151,7 @@
                <string>Fonts</string>
               </property>
               <property name="statusTip">
-               <string>fontsPage</string>
+               <string notr="true">fontsPage</string>
               </property>
               <property name="icon">
                <iconset resource="../icons.qrc">
@@ -163,7 +163,7 @@
                <string>Colors</string>
               </property>
               <property name="statusTip">
-               <string>colorsPage</string>
+               <string notr="true">colorsPage</string>
               </property>
               <property name="icon">
                <iconset resource="../icons.qrc">
@@ -176,7 +176,7 @@
               <string>Plugins</string>
              </property>
              <property name="statusTip">
-              <string>pluginsPage</string>
+              <string notr="true">pluginsPage</string>
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
@@ -187,7 +187,7 @@
                <string>Code formatters</string>
               </property>
               <property name="statusTip">
-               <string>formatterPluginsPage</string>
+               <string notr="true">formatterPluginsPage</string>
               </property>
              </item>
             </item>
@@ -196,7 +196,7 @@
               <string>Data browsing</string>
              </property>
              <property name="statusTip">
-              <string>dataBrowsingPage</string>
+              <string notr="true">dataBrowsingPage</string>
              </property>
              <property name="icon">
               <iconset resource="../icons.qrc">
@@ -207,7 +207,7 @@
                <string>Data editors</string>
               </property>
               <property name="statusTip">
-               <string>dataEditorsPage</string>
+               <string notr="true">dataEditorsPage</string>
               </property>
               <property name="icon">
                <iconset resource="../icons.qrc">
@@ -227,7 +227,7 @@
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>2</number>
+          <number>6</number>
          </property>
          <widget class="QWidget" name="dataBrowsingPage">
           <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -259,7 +259,7 @@
                  <number>99999</number>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.NumberOfRowsPerPage</string>
+                 <string notr="true">General.NumberOfRowsPerPage</string>
                 </property>
                </widget>
               </item>
@@ -288,7 +288,7 @@
                  <number>600</number>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.MaxInitialColumnWith</string>
+                 <string notr="true">General.MaxInitialColumnWith</string>
                 </property>
                </widget>
               </item>
@@ -334,7 +334,7 @@
                <item>
                 <widget class="QListWidget" name="dataEditorsTypesList">
                  <property name="cfg" stdset="0">
-                  <string>General.DataEditorsOrder</string>
+                  <string notr="true">General.DataEditorsOrder</string>
                  </property>
                 </widget>
                </item>
@@ -433,7 +433,7 @@
                  <number>9999999</number>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.DdlHistorySize</string>
+                 <string notr="true">General.DdlHistorySize</string>
                 </property>
                </widget>
               </item>
@@ -450,7 +450,7 @@
                  <string>Don't show DDL preview dialog when commiting schema changes</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.DontShowDdlPreview</string>
+                 <string notr="true">General.DontShowDdlPreview</string>
                 </property>
                </widget>
               </item>
@@ -478,7 +478,7 @@
                  <number>999999</number>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.SqlHistorySize</string>
+                 <string notr="true">General.SqlHistorySize</string>
                 </property>
                </widget>
               </item>
@@ -501,7 +501,7 @@
                  <string>Execute only the query under the cursor</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.ExecuteCurrentQueryOnly</string>
+                 <string notr="true">General.ExecuteCurrentQueryOnly</string>
                 </property>
                </widget>
               </item>
@@ -520,7 +520,7 @@
                  <string>Automatically check for updates at startup</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.CheckUpdatesOnStartup</string>
+                 <string notr="true">General.CheckUpdatesOnStartup</string>
                 </property>
                </widget>
               </item>
@@ -539,7 +539,7 @@
                  <string>Restore last session (active MDI windows) after startup</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.RestoreSession</string>
+                 <string notr="true">General.RestoreSession</string>
                 </property>
                </widget>
               </item>
@@ -650,13 +650,36 @@
            <property name="bottomMargin">
             <number>0</number>
            </property>
+           <item>
+            <widget class="QGroupBox" name="langGroup">
+             <property name="title">
+              <string>Language</string>
+             </property>
+             <layout class="QVBoxLayout" name="verticalLayout_30">
+              <item>
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>Changing language requires application restart to take effect.</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="langCombo">
+                <property name="cfg" stdset="0">
+                 <string notr="true">General.Language</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <widget class="QGroupBox" name="dbListGroup">
              <property name="title">
               <string>Database list</string>
              </property>
              <layout class="QGridLayout" name="gridLayout">
-              <item row="3" column="0">
+              <item row="4" column="0">
                <widget class="QCheckBox" name="sortColumns">
                 <property name="toolTip">
                  <string>If switched off, then columns will be sorted in the order they are typed in CREATE TABLE statement.</string>
@@ -665,21 +688,21 @@
                  <string>Sort table columns alphabetically</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.SortColumns</string>
+                 <string notr="true">General.SortColumns</string>
                 </property>
                </widget>
               </item>
-              <item row="0" column="0">
+              <item row="1" column="0">
                <widget class="QCheckBox" name="expandTablesCheck">
                 <property name="text">
                  <string>Expand tables node when connected to a database</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.ExpandTables</string>
+                 <string notr="true">General.ExpandTables</string>
                 </property>
                </widget>
               </item>
-              <item row="5" column="0">
+              <item row="6" column="0">
                <widget class="QGroupBox" name="addLabelsGroup">
                 <property name="toolTip">
                  <string>&lt;p&gt;Additional labels are those displayed next to the names on the databases list (they are blue, unless configured otherwise). Enabling this option will result in labels for databases, invalid databases and aggregated nodes (column group, index group, trigger group). For more labels see options below.&lt;p&gt;</string>
@@ -694,7 +717,7 @@
                  <bool>false</bool>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.ShowDbTreeLabels</string>
+                 <string notr="true">General.ShowDbTreeLabels</string>
                 </property>
                 <layout class="QVBoxLayout" name="verticalLayout_20">
                  <item>
@@ -706,7 +729,7 @@
                     <string>Display labels for regular tables</string>
                    </property>
                    <property name="cfg" stdset="0">
-                    <string>General.ShowRegularTableLabels</string>
+                    <string notr="true">General.ShowRegularTableLabels</string>
                    </property>
                   </widget>
                  </item>
@@ -719,24 +742,24 @@
                     <string>Display labels for virtual tables</string>
                    </property>
                    <property name="cfg" stdset="0">
-                    <string>General.ShowVirtualTableLabels</string>
+                    <string notr="true">General.ShowVirtualTableLabels</string>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </widget>
               </item>
-              <item row="1" column="0">
+              <item row="2" column="0">
                <widget class="QCheckBox" name="expandViewsCheck">
                 <property name="text">
                  <string>Expand views node when connected to a database</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.ExpandViews</string>
+                 <string notr="true">General.ExpandViews</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0">
+              <item row="3" column="0">
                <widget class="QCheckBox" name="sortObjects">
                 <property name="toolTip">
                  <string>If this option is switched off, then objects will be sorted in order they appear in sqlite_master table (which is in order they were created)</string>
@@ -745,17 +768,17 @@
                  <string>Sort objects (tables, indexes, triggers and views) alphabetically</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.SortObjects</string>
+                 <string notr="true">General.SortObjects</string>
                 </property>
                </widget>
               </item>
-              <item row="4" column="0">
+              <item row="5" column="0">
                <widget class="QCheckBox" name="dispSysTableCheck">
                 <property name="text">
                  <string>Display system tables and indexes on the list</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.ShowSystemObjects</string>
+                 <string notr="true">General.ShowSystemObjects</string>
                 </property>
                </widget>
               </item>
@@ -777,7 +800,7 @@
                  <string>Open Table Windows with the data tab for start</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.OpenTablesOnData</string>
+                 <string notr="true">General.OpenTablesOnData</string>
                 </property>
                </widget>
               </item>
@@ -799,7 +822,7 @@
                  <string>Open View Windows with the data tab for start</string>
                 </property>
                 <property name="cfg" stdset="0">
-                 <string>General.OpenViewsOnData</string>
+                 <string notr="true">General.OpenViewsOnData</string>
                 </property>
                </widget>
               </item>
@@ -943,7 +966,7 @@
               <item>
                <widget class="QComboBox" name="activeStyleCombo">
                 <property name="cfg" stdset="0">
-                 <string>General.Style</string>
+                 <string notr="true">General.Style</string>
                 </property>
                </widget>
               </item>
@@ -991,7 +1014,7 @@
                      <item row="1" column="6">
                       <widget class="QCheckBox" name="previewCheckBox">
                        <property name="text">
-                        <string>CheckBox</string>
+                        <string notr="true">CheckBox</string>
                        </property>
                       </widget>
                      </item>
@@ -1015,7 +1038,7 @@
                      <item row="0" column="3" colspan="2">
                       <widget class="QPushButton" name="previewPushButton">
                        <property name="text">
-                        <string>PushButton</string>
+                        <string notr="true">PushButton</string>
                        </property>
                       </widget>
                      </item>
@@ -1039,46 +1062,46 @@
                       <widget class="QTreeWidget" name="previewTreeWidget">
                        <column>
                         <property name="text">
-                         <string>Column</string>
+                         <string notr="true">Column</string>
                         </property>
                        </column>
                        <item>
                         <property name="text">
-                         <string>123</string>
+                         <string notr="true">123</string>
                         </property>
                         <item>
                          <property name="text">
-                          <string>11111</string>
+                          <string notr="true">11111</string>
                          </property>
                         </item>
                         <item>
                          <property name="text">
-                          <string>22222</string>
+                          <string notr="true">22222</string>
                          </property>
                         </item>
                         <item>
                          <property name="text">
-                          <string>33333</string>
+                          <string notr="true">33333</string>
                          </property>
                         </item>
                        </item>
                        <item>
                         <property name="text">
-                         <string>456</string>
+                         <string notr="true">456</string>
                         </property>
                         <item>
                          <property name="text">
-                          <string>44444</string>
+                          <string notr="true">44444</string>
                          </property>
                         </item>
                         <item>
                          <property name="text">
-                          <string>55555</string>
+                          <string notr="true">55555</string>
                          </property>
                         </item>
                         <item>
                          <property name="text">
-                          <string>66666</string>
+                          <string notr="true">66666</string>
                          </property>
                         </item>
                        </item>
@@ -1087,7 +1110,7 @@
                      <item row="0" column="5">
                       <widget class="QToolButton" name="previewToolButton">
                        <property name="text">
-                        <string>...</string>
+                        <string notr="true">...</string>
                        </property>
                       </widget>
                      </item>
@@ -1097,20 +1120,23 @@
                      <item row="0" column="6">
                       <widget class="QRadioButton" name="previewRadioButton">
                        <property name="text">
-                        <string>RadioButton</string>
+                        <string notr="true">RadioButton</string>
                        </property>
                       </widget>
                      </item>
                      <item row="1" column="0">
                       <widget class="QComboBox" name="previewComboBox">
+                       <property name="currentText">
+                        <string notr="true">ABC</string>
+                       </property>
                        <item>
                         <property name="text">
-                         <string>ABC</string>
+                         <string notr="true">ABC</string>
                         </property>
                        </item>
                        <item>
                         <property name="text">
-                         <string>XYZ</string>
+                         <string notr="true">XYZ</string>
                         </property>
                        </item>
                       </widget>
@@ -1118,7 +1144,7 @@
                      <item row="3" column="3" colspan="5">
                       <widget class="QTextEdit" name="previewTextEdit">
                        <property name="html">
-                        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+                        <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
@@ -1226,7 +1252,7 @@ p, li { white-space: pre-wrap; }
                   <item>
                    <widget class="FontEdit" name="sqlEditorFont" native="true">
                     <property name="cfg" stdset="0">
-                     <string>Fonts.SqlEditor</string>
+                     <string notr="true">Fonts.SqlEditor</string>
                     </property>
                    </widget>
                   </item>
@@ -1242,7 +1268,7 @@ p, li { white-space: pre-wrap; }
                   <item>
                    <widget class="FontEdit" name="dbTreeFont" native="true">
                     <property name="cfg" stdset="0">
-                     <string>Fonts.DbTree</string>
+                     <string notr="true">Fonts.DbTree</string>
                     </property>
                    </widget>
                   </item>
@@ -1258,7 +1284,7 @@ p, li { white-space: pre-wrap; }
                   <item>
                    <widget class="FontEdit" name="dbTreeLabelFont" native="true">
                     <property name="cfg" stdset="0">
-                     <string>Fonts.DbTreeLabel</string>
+                     <string notr="true">Fonts.DbTreeLabel</string>
                     </property>
                    </widget>
                   </item>
@@ -1274,7 +1300,7 @@ p, li { white-space: pre-wrap; }
                   <item>
                    <widget class="FontEdit" name="dataViewFont" native="true">
                     <property name="cfg" stdset="0">
-                     <string>Fonts.DataView</string>
+                     <string notr="true">Fonts.DataView</string>
                     </property>
                    </widget>
                   </item>
@@ -1290,7 +1316,7 @@ p, li { white-space: pre-wrap; }
                   <item>
                    <widget class="FontEdit" name="statusFieldfont" native="true">
                     <property name="cfg" stdset="0">
-                     <string>Fonts.StatusField</string>
+                     <string notr="true">Fonts.StatusField</string>
                     </property>
                    </widget>
                   </item>
@@ -1374,7 +1400,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorKeywordFg</string>
+                     <string notr="true">Colors.SqlEditorKeywordFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1390,7 +1416,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorStringFg</string>
+                     <string notr="true">Colors.SqlEditorStringFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1406,7 +1432,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorCommentFg</string>
+                     <string notr="true">Colors.SqlEditorCommentFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1422,7 +1448,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorForeground</string>
+                     <string notr="true">Colors.SqlEditorForeground</string>
                     </property>
                    </widget>
                   </item>
@@ -1438,7 +1464,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorCurrentLineBg</string>
+                     <string notr="true">Colors.SqlEditorCurrentLineBg</string>
                     </property>
                    </widget>
                   </item>
@@ -1454,7 +1480,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorLineNumAreaBg</string>
+                     <string notr="true">Colors.SqlEditorLineNumAreaBg</string>
                     </property>
                    </widget>
                   </item>
@@ -1480,7 +1506,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorParenthesisBg</string>
+                     <string notr="true">Colors.SqlEditorParenthesisBg</string>
                     </property>
                    </widget>
                   </item>
@@ -1527,7 +1553,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorBlobFg</string>
+                     <string notr="true">Colors.SqlEditorBlobFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1564,7 +1590,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorNumberFg</string>
+                     <string notr="true">Colors.SqlEditorNumberFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1580,7 +1606,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorBindParamFg</string>
+                     <string notr="true">Colors.SqlEditorBindParamFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1606,7 +1632,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.SqlEditorValidObject</string>
+                     <string notr="true">Colors.SqlEditorValidObject</string>
                     </property>
                    </widget>
                   </item>
@@ -1641,7 +1667,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.DataUncommited</string>
+                     <string notr="true">Colors.DataUncommited</string>
                     </property>
                    </widget>
                   </item>
@@ -1667,7 +1693,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.DataUncommitedError</string>
+                     <string notr="true">Colors.DataUncommitedError</string>
                     </property>
                    </widget>
                   </item>
@@ -1690,7 +1716,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.DataNullFg</string>
+                     <string notr="true">Colors.DataNullFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1713,7 +1739,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.DataDeletedBg</string>
+                     <string notr="true">Colors.DataDeletedBg</string>
                     </property>
                    </widget>
                   </item>
@@ -1748,7 +1774,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.DbTreeLabelsFg</string>
+                     <string notr="true">Colors.DbTreeLabelsFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1780,7 +1806,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.StatusFieldInfoFg</string>
+                     <string notr="true">Colors.StatusFieldInfoFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1803,7 +1829,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.StatusFieldWarnFg</string>
+                     <string notr="true">Colors.StatusFieldWarnFg</string>
                     </property>
                    </widget>
                   </item>
@@ -1826,7 +1852,7 @@ p, li { white-space: pre-wrap; }
                      <string/>
                     </property>
                     <property name="cfg" stdset="0">
-                     <string>Colors.StatusFieldErrorFg</string>
+                     <string notr="true">Colors.StatusFieldErrorFg</string>
                     </property>
                    </widget>
                   </item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/constraintdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/constraintdialog.ui
index 7df34d8..addfb9f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/constraintdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/constraintdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string notr="true">Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.cpp
index c94546e..8af131e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.cpp
@@ -45,7 +45,6 @@ void DbConverterDialog::init()
 {
     ui->setupUi(this);
     limitDialogWidth(this);
-    setWindowTitle(tr("Convert database"));
 
     widgetCover = new WidgetCover(this);
     widgetCover->setVisible(false);
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.ui
index d328e99..f6bf009 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbconverterdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Convert database</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/errorsconfirmdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/errorsconfirmdialog.ui
index 81cdb17..615a6fd 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/errorsconfirmdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/errorsconfirmdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Errors</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.ui
index 9f84232..333d887 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Export dialog</string>
+   <string>Export</string>
   </property>
   <property name="options">
    <set>QWizard::CancelButtonOnLeft|QWizard::NoDefaultButton</set>
@@ -111,7 +111,7 @@
        <item row="1" column="1">
         <widget class="QLabel" name="exportTableSeparatorLabel">
          <property name="text">
-          <string>.</string>
+          <string notr="true">.</string>
          </property>
         </widget>
        </item>
@@ -289,8 +289,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>298</width>
-         <height>288</height>
+         <width>483</width>
+         <height>318</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -347,7 +347,7 @@
            <item row="0" column="2">
             <widget class="QToolButton" name="exportFileButton">
              <property name="text">
-              <string>...</string>
+              <string notr="true">...</string>
              </property>
             </widget>
            </item>
@@ -421,17 +421,17 @@
   </widget>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SqlEditor</class>
+   <extends>QPlainTextEdit</extends>
+   <header>sqleditor.h</header>
+  </customwidget>
   <customwidget>
    <class>VerifiableWizardPage</class>
    <extends>QWizardPage</extends>
    <header>common/verifiablewizardpage.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>SqlEditor</class>
-   <extends>QPlainTextEdit</extends>
-   <header>sqleditor.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui
index b853ab8..c8756f7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/importdialog.ui
@@ -47,7 +47,7 @@
        <item row="1" column="2">
         <widget class="QLabel" name="tableSeparatorLabel">
          <property name="text">
-          <string>.</string>
+          <string notr="true">.</string>
          </property>
         </widget>
        </item>
@@ -103,8 +103,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>269</width>
-         <height>280</height>
+         <width>479</width>
+         <height>310</height>
         </rect>
        </property>
        <property name="styleSheet">
@@ -169,7 +169,7 @@
               <item>
                <widget class="QToolButton" name="inputFileButton">
                 <property name="text">
-                 <string>...</string>
+                 <string notr="true">...</string>
                 </property>
                </widget>
               </item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/indexdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/indexdialog.ui
index e231550..4e2cbac 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/indexdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/indexdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Index dialog</string>
+   <string>Index</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
new file mode 100644
index 0000000..38f6fe0
--- /dev/null
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
@@ -0,0 +1,34 @@
+#include "languagedialog.h"
+#include "ui_languagedialog.h"
+
+LanguageDialog::LanguageDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::LanguageDialog)
+{
+    ui->setupUi(this);
+}
+
+LanguageDialog::~LanguageDialog()
+{
+    delete ui;
+}
+
+void LanguageDialog::setLanguages(const QMap<QString, QString>& langs)
+{
+    for (const QString& langName : langs.keys())
+        ui->comboBox->addItem(langName, langs[langName]);
+}
+
+QString LanguageDialog::getSelectedLang() const
+{
+    return ui->comboBox->currentData().toString();
+}
+
+void LanguageDialog::setSelectedLang(const QString& lang)
+{
+    int idx = ui->comboBox->findData(lang);
+    if (idx < 0)
+        idx = 0;
+
+    ui->comboBox->setCurrentIndex(idx);
+}
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.h
new file mode 100644
index 0000000..7fc0607
--- /dev/null
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.h
@@ -0,0 +1,27 @@
+#ifndef LANGUAGEDIALOG_H
+#define LANGUAGEDIALOG_H
+
+#include <QMap>
+#include <QDialog>
+
+namespace Ui {
+    class LanguageDialog;
+}
+
+class LanguageDialog : public QDialog
+{
+        Q_OBJECT
+
+    public:
+        explicit LanguageDialog(QWidget *parent = 0);
+        ~LanguageDialog();
+
+        void setLanguages(const QMap<QString, QString>& langs);
+        QString getSelectedLang() const;
+        void setSelectedLang(const QString& lang);
+
+    private:
+        Ui::LanguageDialog *ui;
+};
+
+#endif // LANGUAGEDIALOG_H
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.ui
new file mode 100644
index 0000000..afd118e
--- /dev/null
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.ui
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LanguageDialog</class>
+ <widget class="QDialog" name="LanguageDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>374</width>
+    <height>81</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Language</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Please choose language:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QComboBox" name="comboBox"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>LanguageDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>LanguageDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/messagelistdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/messagelistdialog.ui
index 10ee6b8..010c866 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/messagelistdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/messagelistdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string notr="true">Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/searchtextdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/searchtextdialog.ui
index ce9e12e..30113af 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/searchtextdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/searchtextdialog.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>403</width>
-    <height>184</height>
+    <height>195</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Find or replace</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="1">
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui
index 4326fca..861e17b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui
@@ -11,10 +11,19 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Trigger columns</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -52,12 +61,21 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>320</width>
-           <height>239</height>
+           <width>316</width>
+           <height>237</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
          </layout>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.ui
index bf3da0a..723f903 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Trigger dialog</string>
+   <string>Trigger</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -87,7 +87,7 @@
           <string>List of columns for UPDATE OF action.</string>
          </property>
          <property name="text">
-          <string>...</string>
+          <string notr="true">...</string>
          </property>
         </widget>
        </item>
-- 
cgit v1.2.3