Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

72 files changed, 6498 insertions, 4848 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp b/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp
index 7354997..f8390a1 100644
--- a/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/constraints/tableforeignkeypanel.cpp
@@ -393,9 +393,6 @@ void TableForeignKeyPanel::readTables()
     resolver.setIgnoreSystemObjects(true);
     QStringList tables = resolver.getTables(); // TODO named db attach not supported
 
-    SqliteCreateTable* createTable = dynamic_cast<SqliteCreateTable*>(constraint->parentStatement());
-    tables.removeOne(createTable->table);
-
     tables.sort(Qt::CaseInsensitive);
 
     ui->fkTableCombo->addItems(tables);
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp
index be26d9f..4a04736 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.cpp
@@ -10,8 +10,8 @@
 SqlQueryItem::SqlQueryItem(QObject *parent) :
     QObject(parent)
 {
-    setUncommited(false);
-    setCommitingError(false);
+    setUncommitted(false);
+    setCommittingError(false);
     setRowId(RowId());
     setColumn(nullptr);
 }
@@ -36,36 +36,36 @@ void SqlQueryItem::setRowId(const RowId& rowId)
     QStandardItem::setData(rowId, DataRole::ROWID);
 }
 
-bool SqlQueryItem::isUncommited() const
+bool SqlQueryItem::isUncommitted() const
 {
-    return QStandardItem::data(DataRole::UNCOMMITED).toBool();
+    return QStandardItem::data(DataRole::UNCOMMITTED).toBool();
 }
 
-void SqlQueryItem::setUncommited(bool uncommited)
+void SqlQueryItem::setUncommitted(bool uncommitted)
 {
-    QStandardItem::setData(QVariant(uncommited), DataRole::UNCOMMITED);
-    if (!uncommited)
+    QStandardItem::setData(QVariant(uncommitted), DataRole::UNCOMMITTED);
+    if (!uncommitted)
     {
         setOldValue(QVariant());
-        setCommitingError(false);
+        setCommittingError(false);
     }
 }
 
 void SqlQueryItem::rollback()
 {
     setValue(getOldValue(), true, true);
-    setUncommited(false);
+    setUncommitted(false);
     setDeletedRow(false);
 }
 
-bool SqlQueryItem::isCommitingError() const
+bool SqlQueryItem::isCommittingError() const
 {
-    return QStandardItem::data(DataRole::COMMITING_ERROR).toBool();
+    return QStandardItem::data(DataRole::COMMITTING_ERROR).toBool();
 }
 
-void SqlQueryItem::setCommitingError(bool isError)
+void SqlQueryItem::setCommittingError(bool isError)
 {
-    QStandardItem::setData(QVariant(isError), DataRole::COMMITING_ERROR);
+    QStandardItem::setData(QVariant(isError), DataRole::COMMITTING_ERROR);
 }
 
 bool SqlQueryItem::isNewRow() const
@@ -113,7 +113,7 @@ void SqlQueryItem::setValue(const QVariant &value, bool limited, bool loadedFrom
 
     // It's modified when:
     // - original and new value is different (value or NULL status), while it's not loading from DB
-    // - this item was already marked as uncommited
+    // - this item was already marked as uncommitted
     bool modified = (
                         (
                                 newValue != origValue ||
@@ -121,7 +121,7 @@ void SqlQueryItem::setValue(const QVariant &value, bool limited, bool loadedFrom
                         ) &&
                         !loadedFromDb
                     ) ||
-                    isUncommited();
+                    isUncommitted();
 
     if (modified && !getOldValue().isValid())
         setOldValue(origValue);
@@ -134,10 +134,10 @@ void SqlQueryItem::setValue(const QVariant &value, bool limited, bool loadedFrom
 
     QStandardItem::setData(newValue, DataRole::VALUE);
     setLimitedValue(limited);
-    setUncommited(modified);
+    setUncommitted(modified);
 
     // Value for display (in a cell) will always be limited, for performance reasons
-    QStandardItem::setData("x", DataRole::VALUE_FOR_DISPLAY); // the same trick as with the DataRole::VALUE
+    setValueForDisplay("x"); // the same trick as with the DataRole::VALUE
     if (!limited)
     {
         int theLimit = SqlQueryModel::getCellDataLengthLimit();
@@ -396,11 +396,15 @@ QVariant SqlQueryItem::data(int role) const
 QString SqlQueryItem::loadFullData()
 {
     SqlQueryModelColumn* col = getColumn();
-    if (col->editionForbiddenReason.size() > 0)
-    {
-        qWarning() << "Tried to load full cell which is not editable. This should be already handled in Editor class when invoking edition action.";
-        return tr("This cell is not editable, because: %1").arg(SqlQueryModelColumn::resolveMessage(col->editionForbiddenReason.values().first()));
-    }
+
+    // Yes, this function won't be called in case of trying to edit the cell - it's handled in the Editor.
+    // However this function can be called from the FormView, to display full contents of the read-only property.
+    // I'll keep it for some time just in case. To be removed in future.
+//    if (col->editionForbiddenReason.size() > 0)
+//    {
+//        qWarning() << "Tried to load full cell which is not editable. This should be already handled in Editor class when invoking edition action.";
+//        return tr("This cell is not editable, because: %1").arg(SqlQueryModelColumn::resolveMessage(col->editionForbiddenReason.values().first()));
+//    }
 
     // This should not happen anymore (since WITHOUT ROWID tables should be handled properly now,
     // but we will keep this here for a while, just in case.
@@ -422,22 +426,37 @@ QString SqlQueryItem::loadFullData()
     Dialect dialect = db->getDialect();
 
     // Query
-    RowIdConditionBuilder rowIdBuilder;
-    rowIdBuilder.setRowId(getRowId());
-    QString query = "SELECT %1 FROM %2 WHERE " + rowIdBuilder.build();
+    QString query;
+    QHash<QString,QVariant> queryArgs;
+    QString column = wrapObjIfNeeded(col->column, dialect);
+    if (col->editionForbiddenReason.size() > 0)
+    {
+        static_qstring(tpl, "SELECT %1 FROM (%2) LIMIT 1 OFFSET %3");
+
+        // The query
+        query = tpl.arg(column, model->getQuery(), QString::number(index().row()));
+    }
+    else
+    {
+        static_qstring(tpl, "SELECT %1 FROM %2 WHERE %3");
 
-    // Column
-    query = query.arg(wrapObjIfNeeded(col->column, dialect));
+        // Db and table
+        QString source = wrapObjIfNeeded(col->table, dialect);
+        if (!col->database.isNull())
+            source.prepend(wrapObjIfNeeded(col->database, dialect)+".");
 
-    // Database and table
-    QString source = wrapObjIfNeeded(col->table, dialect);
-    if (!col->database.isNull())
-        source.prepend(wrapObjIfNeeded(col->database, dialect)+".");
+        // ROWID
+        RowIdConditionBuilder rowIdBuilder;
+        rowIdBuilder.setRowId(getRowId());
+        QString rowId = rowIdBuilder.build();
+        queryArgs = rowIdBuilder.getQueryArgs();
 
-    query = query.arg(source);
+        // The query
+        query = tpl.arg(column, source, rowId);
+    }
 
     // Get the data
-    SqlQueryPtr results = db->exec(query, rowIdBuilder.getQueryArgs());
+    SqlQueryPtr results = db->exec(query, queryArgs);
     if (results->isError())
         return results->getErrorText();
 
@@ -453,6 +472,6 @@ QVariant SqlQueryItem::getFullValue()
     QVariant originalValue = getValue();
     loadFullData();
     QVariant result = getValue();
-    setValue(originalValue, true, !isUncommited());
+    setValue(originalValue, true, !isUncommitted());
     return result;
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h
index b2552cd..805d275 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitem.h
@@ -21,8 +21,8 @@ class GUI_API_EXPORT SqlQueryItem : public QObject, public QStandardItem
                 VALUE = 1002,
                 LIMITED_VALUE = 1003,
                 COLUMN = 1004,
-                UNCOMMITED = 1005,
-                COMMITING_ERROR = 1006,
+                UNCOMMITTED = 1005,
+                COMMITTING_ERROR = 1006,
                 NEW_ROW = 1007,
                 DELETED = 1008,
                 OLD_VALUE = 1009,
@@ -39,12 +39,12 @@ class GUI_API_EXPORT SqlQueryItem : public QObject, public QStandardItem
         RowId getRowId() const;
         void setRowId(const RowId& rowId);
 
-        bool isUncommited() const;
-        void setUncommited(bool uncommited);
+        bool isUncommitted() const;
+        void setUncommitted(bool uncommitted);
         void rollback();
 
-        bool isCommitingError() const;
-        void setCommitingError(bool isError);
+        bool isCommittingError() const;
+        void setCommittingError(bool isError);
 
         bool isNewRow() const;
         void setNewRow(bool isNew);
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp
index 19090ad..74a82ca 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.cpp
@@ -17,6 +17,9 @@
 #include <QVBoxLayout>
 #include <QResizeEvent>
 #include <QScrollBar>
+#include <limits>
+
+bool SqlQueryItemDelegate::warnedAboutHugeContents = false;
 
 SqlQueryItemDelegate::SqlQueryItemDelegate(QObject *parent) :
     QStyledItemDelegate(parent)
@@ -28,9 +31,9 @@ void SqlQueryItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     QStyledItemDelegate::paint(painter, option, index);
     SqlQueryItem* item = getItem(index);
 
-    if (item->isUncommited())
+    if (item->isUncommitted())
     {
-        painter->setPen(item->isCommitingError() ? CFG_UI.Colors.DataUncommitedError.get() : CFG_UI.Colors.DataUncommited.get());
+        painter->setPen(item->isCommittingError() ? CFG_UI.Colors.DataUncommittedError.get() : CFG_UI.Colors.DataUncommitted.get());
         painter->setBrush(Qt::NoBrush);
         painter->drawRect(option.rect.x(), option.rect.y(), option.rect.width()-1, option.rect.height()-1);
     }
@@ -47,21 +50,24 @@ QWidget* SqlQueryItemDelegate::createEditor(QWidget* parent, const QStyleOptionV
 
     if (item->isDeletedRow())
     {
-        notifyWarn(tr("Cannot edit this cell. Details: %2").arg(tr("The row is marked for deletion.")));
+        notifyWarn(tr("Cannot edit this cell. Details: %1").arg(tr("The row is marked for deletion.")));
         return nullptr;
     }
 
     if (!item->getColumn()->canEdit())
     {
-        notifyWarn(tr("Cannot edit this cell. Details: %2").arg(item->getColumn()->getEditionForbiddenReason()));
+        notifyWarn(tr("Cannot edit this cell. Details: %1").arg(item->getColumn()->getEditionForbiddenReason()));
         return nullptr;
     }
 
-    if (item->isLimitedValue())
-        item->loadFullData();
+    if (item->isLimitedValue() && !item->loadFullData().isNull() && model->isStructureOutOfDate())
+    {
+        notifyWarn(tr("Cannot edit this cell. Details: %1").arg(tr("Structure of this table has changed since last data was loaded. Reload the data to proceed.")));
+        return nullptr;
+    }
 
     if (!item->getColumn()->getFkConstraints().isEmpty())
-        return getFkEditor(item, parent);
+        return getFkEditor(item, parent, model);
 
     return getEditor(item->getValue().userType(), parent);
 }
@@ -71,13 +77,15 @@ QString SqlQueryItemDelegate::displayText(const QVariant& value, const QLocale&
     UNUSED(locale);
 
     if (value.type() == QVariant::Double)
-        return doubleToString(value.toDouble());
+        return doubleToString(value);
 
     return QStyledItemDelegate::displayText(value, locale);
 }
 
 void SqlQueryItemDelegate::setEditorData(QWidget* editor, const QModelIndex& index) const
 {
+    // No need to check or load full data, it is already preloaded if necessary in createEditor().
+
     QComboBox* cb = dynamic_cast<QComboBox*>(editor);
     QLineEdit* le = dynamic_cast<QLineEdit*>(editor);
     if (cb) {
@@ -129,23 +137,40 @@ void SqlQueryItemDelegate::setModelDataForFk(QComboBox* cb, QAbstractItemModel*
     if (cbModel->isExecutionInProgress() || !cbModel->isAllDataLoaded())
         return;
 
+    QString cbText = cb->currentText();
+    if (CFG_UI.General.KeepNullWhenEmptyValue.get() && model->data(index, Qt::EditRole).isNull() && cbText.isEmpty())
+        return;
+
     int idx = cb->currentIndex();
     if (idx < 0 || idx >= cbModel->rowCount())
     {
-        model->setData(index, cb->currentText());
+        model->setData(index, cbText, Qt::EditRole);
+        return;
+    }
+
+    QList<SqlQueryItem *> row = cbModel->getRow(idx);
+    if (!row[0])
+    {
+        // This happens when inexisting value is confirmed with "Enter" key,
+        // cause rowCount() is apparently incremented, but items not yet.
+        model->setData(index, cbText, Qt::EditRole);
         return;
     }
 
-    QVariant comboData = cbModel->getRow(idx)[0]->getValue();
-    if (cb->currentText() != comboData.toString())
-        comboData = cb->currentText();
+    QVariant comboData = row[0]->getValue();
+    if (cbText != comboData.toString())
+        comboData = cbText;
 
-    model->setData(index, comboData);
+    model->setData(index, comboData, Qt::EditRole);
 }
 
 void SqlQueryItemDelegate::setModelDataForLineEdit(QLineEdit* editor, QAbstractItemModel* model, const QModelIndex& index) const
 {
     QString value = editor->text();
+
+    if (CFG_UI.General.KeepNullWhenEmptyValue.get() && model->data(index, Qt::EditRole).isNull() && value.isEmpty())
+        return;
+
     bool ok;
     QVariant variant = value.toLongLong(&ok);
     if (ok)
@@ -169,11 +194,18 @@ void SqlQueryItemDelegate::setEditorDataForLineEdit(QLineEdit* le, const QModelI
     QVariant value = index.data(Qt::EditRole);
     if (value.userType() == QVariant::Double)
     {
-        le->setText(doubleToString(value.toDouble()));
+        le->setText(doubleToString(value));
         return;
     }
 
-    le->setText(value.toString());
+    QString str = value.toString();
+    if (str.size() > HUGE_CONTENTS_WARNING_LIMIT && !warnedAboutHugeContents)
+    {
+        NOTIFY_MANAGER->warn(tr("Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It's better to edit such big contents in a Form View, or in popup editor (available under rick-click menu)."));
+        warnedAboutHugeContents = true;
+    }
+
+    le->setText(str);
 }
 
 SqlQueryItem* SqlQueryItemDelegate::getItem(const QModelIndex &index) const
@@ -186,6 +218,7 @@ QWidget* SqlQueryItemDelegate::getEditor(int type, QWidget* parent) const
 {
     UNUSED(type);
     QLineEdit *editor = new QLineEdit(parent);
+    editor->setMaxLength(std::numeric_limits<int>::max());
     editor->setFrame(editor->style()->styleHint(QStyle::SH_ItemView_DrawDelegateFrame, 0, editor));
     return editor;
 
@@ -257,12 +290,15 @@ QString SqlQueryItemDelegate::getSqlForFkEditor(SqlQueryItem* item) const
     return sql.arg(selectedCols.join(", "), fkConfitionTables.join(", "), conditionsStr);
 }
 
-qlonglong SqlQueryItemDelegate::getRowCountForFkEditor(Db* db, const QString& query) const
+qlonglong SqlQueryItemDelegate::getRowCountForFkEditor(Db* db, const QString& query, bool* isError) const
 {
     static_qstring(tpl, "SELECT count(*) FROM (%1)");
 
     QString sql = tpl.arg(query);
     SqlQueryPtr result = db->exec(sql);
+    if (isError)
+        *isError = result->isError();
+
     return result->getSingleCell().toLongLong();
 }
 
@@ -283,21 +319,35 @@ void SqlQueryItemDelegate::fkDataReady()
     // Set selected combo value to initial value from the cell
     QComboBox* cb = modelToFkCombo[model];
     QVariant value = modelToFkInitialValue[model];
-    QModelIndexList idxList = model->findIndexes(SqlQueryItem::DataRole::VALUE, value, 1);
-
-    int idx = 0;
-    if (idxList.size() > 0)
-        idx = idxList.first().row();
+    if (model->rowCount() > 0)
+    {
+        QModelIndex startIdx = model->index(0, 0);
+        QModelIndex endIdx = model->index(model->rowCount() - 1, 0);
+        QModelIndexList idxList = model->findIndexes(startIdx, endIdx, SqlQueryItem::DataRole::VALUE, value, 1);
+
+        if (idxList.size() > 0)
+            cb->setCurrentIndex(idxList.first().row());
+        else
+            cb->setCurrentText(value.toString());
+    }
+    else
+    {
+        cb->setCurrentText(value.toString());
+    }
+}
 
-    cb->setCurrentIndex(idx);
+void SqlQueryItemDelegate::fkDataFailed(const QString &errorText)
+{
+    notifyWarn(tr("Cannot edit this cell. Details: %1").arg(errorText));
 }
 
-QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent) const
+QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent, const SqlQueryModel* model) const
 {
     QString sql = getSqlForFkEditor(item);
 
-    Db* db = item->getModel()->getDb();
-    qlonglong rowCount = getRowCountForFkEditor(db, sql);
+    Db* db = model->getDb();
+    bool countingError = false;
+    qlonglong rowCount = getRowCountForFkEditor(db, sql, &countingError);
     if (rowCount > MAX_ROWS_FOR_FK)
     {
         notifyWarn(tr("Foreign key for column %2 has more than %1 possible values. It's too much to display in drop down list. You need to edit value manually.")
@@ -306,6 +356,12 @@ QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent)
         return getEditor(item->getValue().userType(), parent);
     }
 
+    if (rowCount == 0 && countingError && model->isStructureOutOfDate())
+    {
+        notifyWarn(tr("Cannot edit this cell. Details: %1").arg(tr("Structure of this table has changed since last data was loaded. Reload the data to proceed.")));
+        return nullptr;
+    }
+
     QComboBox *cb = new QComboBox(parent);
     cb->setEditable(true);
 
@@ -321,30 +377,31 @@ QWidget* SqlQueryItemDelegate::getFkEditor(SqlQueryItem* item, QWidget* parent)
         queryView->setMinimumWidth(wd);
     });
 
-    SqlQueryModel* model = new SqlQueryModel(queryView);
-    model->setView(queryView);
+    SqlQueryModel* queryModel = new SqlQueryModel(queryView);
+    queryModel->setView(queryView);
 
     // Mapping of model to cb, so we can update combo when data arrives.
-    modelToFkInitialValue[model] = item->getValue();
-    modelToFkCombo[model] = cb;
-    connect(cb, &QComboBox::destroyed, [this, model](QObject*)
+    modelToFkInitialValue[queryModel] = item->getValue();
+    modelToFkCombo[queryModel] = cb;
+    connect(cb, &QComboBox::destroyed, [this, queryModel](QObject*)
     {
-        modelToFkCombo.remove(model);
-        modelToFkInitialValue.remove(model);
+        modelToFkCombo.remove(queryModel);
+        modelToFkInitialValue.remove(queryModel);
     });
 
     // When execution is done, update combo.
-    connect(model, SIGNAL(executionSuccessful()), this, SLOT(fkDataReady()));
+    connect(queryModel, SIGNAL(executionSuccessful()), this, SLOT(fkDataReady()));
+    connect(queryModel, SIGNAL(executionFailed(QString)), this, SLOT(fkDataFailed(QString)));
 
     // Setup combo, model, etc.
-    cb->setModel(model);
+    cb->setModel(queryModel);
     cb->setView(queryView);
     cb->setModelColumn(0);
 
-    model->setHardRowLimit(MAX_ROWS_FOR_FK);
-    model->setDb(db);
-    model->setQuery(sql);
-    model->executeQuery();
+    queryModel->setHardRowLimit(MAX_ROWS_FOR_FK);
+    queryModel->setDb(db);
+    queryModel->setQuery(sql);
+    queryModel->executeQuery();
 
     queryView->verticalHeader()->setVisible(false);
     queryView->horizontalHeader()->setVisible(true);
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h
index 82d12c3..a35ef9a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryitemdelegate.h
@@ -26,23 +26,26 @@ class GUI_API_EXPORT SqlQueryItemDelegate : public QStyledItemDelegate
     private:
         SqlQueryItem* getItem(const QModelIndex &index) const;
         QWidget* getEditor(int type, QWidget* parent) const;
-        QWidget* getFkEditor(SqlQueryItem* item, QWidget* parent) const;
+        QWidget* getFkEditor(SqlQueryItem* item, QWidget* parent, const SqlQueryModel *model) const;
         void setEditorDataForLineEdit(QLineEdit* le, const QModelIndex& index) const;
         void setEditorDataForFk(QComboBox* cb, const QModelIndex& index) const;
         void setModelDataForFk(QComboBox* editor, QAbstractItemModel* model, const QModelIndex& index) const;
         void setModelDataForLineEdit(QLineEdit* editor, QAbstractItemModel* model, const QModelIndex& index) const;
         QString getSqlForFkEditor(SqlQueryItem* item) const;
-        qlonglong getRowCountForFkEditor(Db* db, const QString& query) const;
+        qlonglong getRowCountForFkEditor(Db* db, const QString& query, bool *isError) const;
 
         QSet<QWidget*> editorsWithAsyncExecution;
         mutable QHash<SqlQueryModel*, QComboBox*> modelToFkCombo;
         mutable QHash<SqlQueryModel*, QVariant> modelToFkInitialValue;
 
+        static bool warnedAboutHugeContents;
         static const qlonglong MAX_ROWS_FOR_FK = 10000L;
         static const int CELL_LENGTH_LIMIT = 30;
+        static const int HUGE_CONTENTS_WARNING_LIMIT = 32767; // pow(2, 16) / 2 - 1
 
     private slots:
         void fkDataReady();
+        void fkDataFailed(const QString& errorText);
 };
 
 #endif // SQLQUERYITEMDELEGATE_H
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp
index 15cf1bf..009b05a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.cpp
@@ -32,6 +32,11 @@ SqlQueryModel::SqlQueryModel(QObject *parent) :
     connect(queryExecutor, SIGNAL(executionFinished(SqlQueryPtr)), this, SLOT(handleExecFinished(SqlQueryPtr)));
     connect(queryExecutor, SIGNAL(executionFailed(int,QString)), this, SLOT(handleExecFailed(int,QString)));
     connect(queryExecutor, SIGNAL(resultsCountingFinished(quint64,quint64,int)), this, SLOT(resultsCountingFinished(quint64,quint64,int)));
+
+    NotifyManager* notifyManager = NotifyManager::getInstance();
+    connect(notifyManager, SIGNAL(objectModified(Db*,QString,QString)), this, SLOT(handlePossibleTableModification(Db*,QString,QString)));
+    connect(notifyManager, SIGNAL(objectRenamed(Db*,QString,QString,QString)), this, SLOT(handlePossibleTableRename(Db*,QString,QString,QString)));
+
     setItemPrototype(new SqlQueryItem());
     existingModels << this;
 }
@@ -97,12 +102,12 @@ void SqlQueryModel::executeQueryInternal()
         return;
     }
 
-    QList<SqlQueryItem*> uncommitedItems = getUncommitedItems();
-    if (uncommitedItems.size() > 0)
+    QList<SqlQueryItem*> uncommittedItems = getUncommittedItems();
+    if (uncommittedItems.size() > 0)
     {
-        QMessageBox::StandardButton result = QMessageBox::question(nullptr, tr("Uncommited data"),
-                                                                   tr("There are uncommited data changes. Do you want to proceed anyway? "
-                                                                      "All uncommited changes will be lost."));
+        QMessageBox::StandardButton result = QMessageBox::question(nullptr, tr("Uncommitted data"),
+                                                                   tr("There are uncommitted data changes. Do you want to proceed anyway? "
+                                                                      "All uncommitted changes will be lost."));
 
         if (result != QMessageBox::Yes)
         {
@@ -110,7 +115,7 @@ void SqlQueryModel::executeQueryInternal()
             return;
         }
 
-        rollback(uncommitedItems);
+        rollback(uncommittedItems);
     }
 
     emit executionStarted();
@@ -219,9 +224,9 @@ QList<SqlQueryItem*> SqlQueryModel::findItems(const QModelIndex& start, const QM
     return toItemList(findIndexes(start, end, role, value, hits));
 }
 
-QList<SqlQueryItem*> SqlQueryModel::getUncommitedItems() const
+QList<SqlQueryItem*> SqlQueryModel::getUncommittedItems() const
 {
-    return findItems(SqlQueryItem::DataRole::UNCOMMITED, true);
+    return findItems(SqlQueryItem::DataRole::UNCOMMITTED, true);
 }
 
 QList<QList<SqlQueryItem*> > SqlQueryModel::groupItemsByRows(const QList<SqlQueryItem*>& items)
@@ -253,14 +258,14 @@ QHash<AliasedTable, QList<SqlQueryItem*> > SqlQueryModel::groupItemsByTable(cons
     return itemsByTable;
 }
 
-QList<SqlQueryItem*> SqlQueryModel::filterOutCommitedItems(const QList<SqlQueryItem*>& items)
+QList<SqlQueryItem*> SqlQueryModel::filterOutCommittedItems(const QList<SqlQueryItem*>& items)
 {
     // This method doesn't make use of QMutableListIterator to remove items from passed list,
     // because it would require list in argument to drop 'const' keyword and it's already
     // there in calling methods, so it's easier to copy list and filter on the fly.
     QList<SqlQueryItem*> newList;
     foreach (SqlQueryItem* item, items)
-        if (item->isUncommited())
+        if (item->isUncommitted())
             newList << item;
 
     return newList;
@@ -291,13 +296,13 @@ QList<SqlQueryItem*> SqlQueryModel::toItemList(const QModelIndexList& indexes) c
 
 void SqlQueryModel::commit()
 {
-    QList<SqlQueryItem*> items = findItems(SqlQueryItem::DataRole::UNCOMMITED, true);
+    QList<SqlQueryItem*> items = findItems(SqlQueryItem::DataRole::UNCOMMITTED, true);
     commitInternal(items);
 }
 
 void SqlQueryModel::commit(const QList<SqlQueryItem*>& items)
 {
-    commitInternal(filterOutCommitedItems(items));
+    commitInternal(filterOutCommittedItems(items));
 }
 
 bool SqlQueryModel::commitRow(const QList<SqlQueryItem*>& itemsInRow)
@@ -334,13 +339,13 @@ void SqlQueryModel::rollbackRow(const QList<SqlQueryItem*>& itemsInRow)
 
 void SqlQueryModel::rollback()
 {
-    QList<SqlQueryItem*> items = findItems(SqlQueryItem::DataRole::UNCOMMITED, true);
+    QList<SqlQueryItem*> items = findItems(SqlQueryItem::DataRole::UNCOMMITTED, true);
     rollbackInternal(items);
 }
 
 void SqlQueryModel::rollback(const QList<SqlQueryItem*>& items)
 {
-    rollbackInternal(filterOutCommitedItems(items));
+    rollbackInternal(filterOutCommittedItems(items));
 }
 
 void SqlQueryModel::commitInternal(const QList<SqlQueryItem*>& items)
@@ -364,11 +369,11 @@ void SqlQueryModel::commitInternal(const QList<SqlQueryItem*>& items)
     int numberOfItemsAdded = groupItemsByRows(findItems(SqlQueryItem::DataRole::NEW_ROW, true)).size();
     int numberOfItemsDeleted = groupItemsByRows(findItems(SqlQueryItem::DataRole::DELETED, true)).size();
 
-    // Removing "commit error" mark from items that are going to be commited now
+    // Removing "commit error" mark from items that are going to be committed now
     for (SqlQueryItem* item : items)
-        item->setCommitingError(false);
+        item->setCommittingError(false);
 
-    // Grouping by row and commiting
+    // Grouping by row and committing
     QList<QList<SqlQueryItem*>> groupedItems = groupItemsByRows(items);
     emit aboutToCommit(groupedItems.size());
 
@@ -382,11 +387,11 @@ void SqlQueryModel::commitInternal(const QList<SqlQueryItem*>& items)
             ok = false;
             break;
         }
-        emit commitingStepFinished(step++);
+        emit committingStepFinished(step++);
     }
 
-    // Getting current uncommited list (after rows deletion it may be different)
-    QList<SqlQueryItem*> itemsLeft = findItems(SqlQueryItem::DataRole::UNCOMMITED, true);
+    // Getting current uncommitted list (after rows deletion it may be different)
+    QList<SqlQueryItem*> itemsLeft = findItems(SqlQueryItem::DataRole::UNCOMMITTED, true);
 
     // Getting common elements of initial and current item list, because of a possibility of the selective commit
     QMutableListIterator<SqlQueryItem*> it(itemsLeft);
@@ -396,20 +401,20 @@ void SqlQueryModel::commitInternal(const QList<SqlQueryItem*>& items)
             it.remove();
     }
 
-    // Commiting to the database
+    // Committing to the database
     if (ok)
     {
         if (!db->commit())
         {
             ok = false;
-            notifyError(tr("An error occurred while commiting the transaction: %1").arg(db->getErrorText()));
+            notifyError(tr("An error occurred while committing the transaction: %1").arg(db->getErrorText()));
         }
         else
         {
-            // Commited successfully
+            // Committed successfully
             for (SqlQueryItem* item : itemsLeft)
             {
-                item->setUncommited(false);
+                item->setUncommitted(false);
                 item->setNewRow(false);
             }
 
@@ -418,7 +423,7 @@ void SqlQueryModel::commitInternal(const QList<SqlQueryItem*>& items)
             for (int row : rowsDeletedSuccessfullyInTheCommit)
                 removeRow(row - removeOffset++); // deleting row decrements all rows below
 
-            emit commitStatusChanged(getUncommitedItems().size() > 0);
+            emit commitStatusChanged(getUncommittedItems().size() > 0);
         }
     }
     rowsDeletedSuccessfullyInTheCommit.clear();
@@ -450,7 +455,7 @@ void SqlQueryModel::rollbackInternal(const QList<SqlQueryItem*>& items)
     foreach (const QList<SqlQueryItem*>& itemsInRow, groupedItems)
         rollbackRow(itemsInRow);
 
-    emit commitStatusChanged(getUncommitedItems().size() > 0);
+    emit commitStatusChanged(getUncommittedItems().size() > 0);
 }
 
 void SqlQueryModel::reload()
@@ -485,7 +490,7 @@ StrHash<QString> SqlQueryModel::attachDependencyTables()
         if (!attachDb)
         {
             qCritical() << "Could not resolve database" << reqAttach << ", while it's a required attach name for SqlQueryModel to commit edited data!"
-                        << "This may result in errors when commiting some data modifications.";
+                        << "This may result in errors when committing some data modifications.";
             continue;
         }
 
@@ -493,7 +498,7 @@ StrHash<QString> SqlQueryModel::attachDependencyTables()
         if (attachName.isNull())
         {
             qCritical() << "Could not attach database" << reqAttach << ", while it's a required attach name for SqlQueryModel to commit edited data!"
-                        << "This may result in errors when commiting some data modifications.";
+                        << "This may result in errors when committing some data modifications.";
             continue;
         }
 
@@ -646,9 +651,9 @@ bool SqlQueryModel::commitEditedRow(const QList<SqlQueryItem*>& itemsInRow)
         if (results->isError())
         {
             for (SqlQueryItem* item : items)
-                item->setCommitingError(true);
+                item->setCommittingError(true);
 
-            notifyError(tr("An error occurred while commiting the data: %1").arg(results->getErrorText()));
+            notifyError(tr("An error occurred while committing the data: %1").arg(results->getErrorText()));
             return false;
         }
 
@@ -783,7 +788,7 @@ QList<QStandardItem*> SqlQueryModel::loadRow(SqlResultsRowPtr row)
     SqlQueryItem* item = nullptr;
     RowId rowId;
     int colIdx = 0;
-    foreach (const QVariant& value, row->valueList().mid(rowIdColumns))
+    foreach (const QVariant& value, row->valueList().mid(0, resultColumnCount))
     {
         item = new SqlQueryItem();
         rowId = getRowIdValue(row, colIdx);
@@ -920,16 +925,27 @@ void SqlQueryModel::readColumns()
 {
     columns.clear();
     tableToRowIdColumn.clear();
+    tablesInUse.clear();
 
     // Reading column mapping for ROWID columns
     int totalRowIdCols = 0;
-    AliasedTable table;
+    AliasedTable aliasedTable;
+    DbAndTable dbAndTable;
     foreach (const QueryExecutor::ResultRowIdColumnPtr& resCol, queryExecutor->getRowIdResultColumns())
     {
-        table.setDatabase(resCol->dbName);
-        table.setTable(resCol->table);
-        table.setTableAlias(resCol->tableAlias);
-        tableToRowIdColumn[table] = resCol->queryExecutorAliasToColumn;
+        if (resCol->dbName.isEmpty() || resCol->dbName.toLower() == "main" || resCol->dbName.toLower() == "temp")
+            dbAndTable.setDb(db);
+        else if (!resCol->dbName.isEmpty())
+            dbAndTable.setDb(DBLIST->getByName(resCol->dbName));
+
+        dbAndTable.setDatabase(resCol->database);
+        dbAndTable.setTable(resCol->table);
+        tablesInUse << dbAndTable;
+
+        aliasedTable.setDatabase(resCol->dbName);
+        aliasedTable.setTable(resCol->table);
+        aliasedTable.setTableAlias(resCol->tableAlias);
+        tableToRowIdColumn[aliasedTable] = resCol->queryExecutorAliasToColumn;
         totalRowIdCols += resCol->queryExecutorAliasToColumn.size();
     }
 
@@ -937,9 +953,12 @@ void SqlQueryModel::readColumns()
     readColumnDetails();
 
     // Preparing other usful information about columns
-    rowIdColumns = totalRowIdCols;
+    resultColumnCount = queryExecutor->getResultColumns().size();
     tablesForColumns = getTablesForColumns();
     columnEditionStatus = getColumnEditionEnabledList();
+
+    // We have fresh info about columns
+    structureOutOfDate = false;
 }
 
 void SqlQueryModel::readColumnDetails()
@@ -1191,7 +1210,7 @@ void SqlQueryModel::resultsCountingFinished(quint64 rowsAffected, quint64 rowsRe
 void SqlQueryModel::itemValueEdited(SqlQueryItem* item)
 {
     UNUSED(item);
-    emit commitStatusChanged(getUncommitedItems().size() > 0);
+    emit commitStatusChanged(getUncommittedItems().size() > 0);
 }
 
 void SqlQueryModel::changeSorting(int logicalIndex, Qt::SortOrder order)
@@ -1382,7 +1401,7 @@ void SqlQueryModel::updateSelectiveCommitRollbackActions(const QItemSelection& s
     {
         foreach (SqlQueryItem* item, selectedItems)
         {
-            if (item->isUncommited())
+            if (item->isUncommitted())
             {
                 result = true;
                 break;
@@ -1405,7 +1424,7 @@ void SqlQueryModel::addNewRowInternal(int rowIdx)
 
         item = new SqlQueryItem();
         item->setNewRow(true);
-        item->setUncommited(true);
+        item->setUncommitted(true);
         item->setColumn(columnModel);
 
         items << item;
@@ -1526,6 +1545,21 @@ int SqlQueryModel::getRowsPerPage() const
     return rowsPerPage;
 }
 
+int SqlQueryModel::getQueryCountLimitForSmartMode() const
+{
+    return queryExecutor->getQueryCountLimitForSmartMode();
+}
+
+void SqlQueryModel::setQueryCountLimitForSmartMode(int value)
+{
+    queryExecutor->setQueryCountLimitForSmartMode(value);
+}
+
+bool SqlQueryModel::isStructureOutOfDate() const
+{
+    return structureOutOfDate;
+}
+
 bool SqlQueryModel::isAllDataLoaded() const
 {
     return allDataLoaded;
@@ -1596,14 +1630,31 @@ void SqlQueryModel::deleteSelectedRows()
             }
 
             item->setDeletedRow(true);
-            item->setUncommited(true);
+            item->setUncommitted(true);
         }
     }
 
     foreach (SqlQueryItem* item, newItemsToDelete)
         removeRow(item->index().row());
 
-    emit commitStatusChanged(getUncommitedItems().size() > 0);
+    emit commitStatusChanged(getUncommittedItems().size() > 0);
+}
+
+void SqlQueryModel::handlePossibleTableModification(Db *modDb, const QString &database, const QString &objName)
+{
+    QString dbName = database.toLower() == "main" ? QString() : database;
+    DbAndTable dbAndTable(modDb, dbName, objName);
+    if (tablesInUse.contains(dbAndTable))
+        structureOutOfDate = true;
+}
+
+void SqlQueryModel::handlePossibleTableRename(Db *modDb, const QString &database, const QString &oldName, const QString &newName)
+{
+    UNUSED(newName);
+    QString dbName = database.toLower() == "main" ? QString() : database;
+    DbAndTable dbAndTable(modDb, dbName, oldName);
+    if (tablesInUse.contains(dbAndTable))
+        structureOutOfDate = true;
 }
 
 void SqlQueryModel::applySqlFilter(const QString& value)
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h
index 6af937b..7a4c282 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlquerymodel.h
@@ -55,7 +55,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
         QModelIndexList findIndexes(const QModelIndex &start, const QModelIndex& end, int role, const QVariant &value, int hits = -1) const;
         QList<SqlQueryItem*> findItems(int role, const QVariant &value, int hits = -1) const;
         QList<SqlQueryItem*> findItems(const QModelIndex &start, const QModelIndex& end, int role, const QVariant &value, int hits = -1) const;
-        QList<SqlQueryItem*> getUncommitedItems() const;
+        QList<SqlQueryItem*> getUncommittedItems() const;
         QList<SqlQueryItem*> getRow(int row);
         int columnCount(const QModelIndex& parent = QModelIndex()) const;
         QVariant headerData(int section, Qt::Orientation orientation, int role) const;
@@ -140,10 +140,15 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
 
         bool isAllDataLoaded() const;
 
+        bool isStructureOutOfDate() const;
+
+        int getQueryCountLimitForSmartMode() const;
+        void setQueryCountLimitForSmartMode(int value);
+
     protected:
         class CommitUpdateQueryBuilder : public RowIdConditionBuilder
         {
-            public:
+        public:
                 void clear();
 
                 void setDatabase(const QString& database);
@@ -230,13 +235,21 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
         QList<SqlQueryModelColumnPtr> columns;
 
         /**
+         * @brief tablesInUse
+         * List of tables that are used in currently presented data set.
+         * Database in those tables (if not empty) is a symbolic name, as listed on database list.
+         * If database is empty, then it was not explicitly typed in the query, so it's the local main db.
+         */
+        QList<DbAndTable> tablesInUse;
+
+        /**
          * @brief Limit of data length in loaded cells.
          *
          * Bytes or utf-8 characters.
          * Having this set to 10000 gives about 290 MB of memory consumption
          * while having 30 columns and 1000 result rows loaded, all with 10000 bytes.
          */
-        static const int cellDataLengthLimit = 10000;
+        static const int cellDataLengthLimit = 100;
 
     private:
         struct TableDetails
@@ -275,7 +288,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
         void storeStep1NumbersFromExecution();
         void storeStep2NumbersFromExecution();
         void restoreNumbersToQueryExecutor();
-        QList<SqlQueryItem*> filterOutCommitedItems(const QList<SqlQueryItem*>& items);
+        QList<SqlQueryItem*> filterOutCommittedItems(const QList<SqlQueryItem*>& items);
         void commitInternal(const QList<SqlQueryItem*>& items);
         void rollbackInternal(const QList<SqlQueryItem*>& items);
         void reloadInternal();
@@ -369,12 +382,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
          */
         int hardRowLimit = -1;
 
-        /**
-         * @brief rowIdColumns
-         * We skip first this number of columns from the results of the SQL query, because those are ROWID columns.
-         * The query returns ROWID columns, because this is how QueryExecutor provides this information.
-         */
-        int rowIdColumns = 0;
+        int resultColumnCount = 0;
 
         /**
          * @brief tablesForColumns
@@ -392,6 +400,8 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
 
         bool allDataLoaded = false;
 
+        bool structureOutOfDate = false;
+
         /**
          * @brief Set of existing model objects, updated for each construction and destruction.
          *
@@ -425,6 +435,8 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
         void addNewRow();
         void addMultipleRows();
         void deleteSelectedRows();
+        void handlePossibleTableModification(Db* modDb, const QString& database, const QString& objName);
+        void handlePossibleTableRename(Db* modDb, const QString& database, const QString& oldName, const QString& newName);
 
     signals:
         /**
@@ -475,7 +487,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
          * @brief commitStatusChanged
          * @param commitAvailable Tells if there's anything to commit/rollback or not.
          *
-         * Emitted after any results cell has been modified and can now be commited or rolled back.
+         * Emitted after any results cell has been modified and can now be committed or rolled back.
          * Also emitted after commit and rollback.
          */
         void commitStatusChanged(bool commitAvailable);
@@ -484,8 +496,8 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
          * @brief selectiveCommitStatusChanged
          * @param commitAvailable Tells if there's anything to commit/rollback or not.
          *
-         * Emitted when user changes selection in the view, so if the selection includes any uncommited cells,
-         * then this signal will be emitted with parameter true, or if there is no uncommited cells,
+         * Emitted when user changes selection in the view, so if the selection includes any uncommitted cells,
+         * then this signal will be emitted with parameter true, or if there is no uncommitted cells,
          * then it will be emitted with parameter false.
          */
         void selectiveCommitStatusChanged(bool commitAvailable);
@@ -498,7 +510,7 @@ class GUI_API_EXPORT SqlQueryModel : public QStandardItemModel
         void sortingUpdated(const QueryExecutor::SortList& sortOrder);
 
         void aboutToCommit(int totalSteps);
-        void commitingStepFinished(int step);
+        void committingStepFinished(int step);
         void commitFinished();
         void itemEditionEnded(SqlQueryItem* item);
 };
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp
index 50a0480..9f58fd2 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqlqueryview.cpp
@@ -48,7 +48,8 @@ void SqlQueryView::init()
     itemDelegate = new SqlQueryItemDelegate();
     setItemDelegate(itemDelegate);
     setMouseTracking(true);
-    setEditTriggers(QAbstractItemView::AnyKeyPressed);
+//    setEditTriggers(QAbstractItemView::AnyKeyPressed);
+    setEditTriggers(QAbstractItemView::AnyKeyPressed|QAbstractItemView::EditKeyPressed);
 
     setContextMenuPolicy(Qt::CustomContextMenu);
     contextMenu = new QMenu(this);
@@ -114,29 +115,29 @@ void SqlQueryView::setupActionsForMenu(SqlQueryItem* currentItem, const QList<Sq
     // Selected items count
     int selCount = selectedItems.size();
 
-    // Uncommited items count
-    QList<SqlQueryItem*> uncommitedItems = getModel()->getUncommitedItems();
-    int uncommitedCount = uncommitedItems.size();
+    // Uncommitted items count
+    QList<SqlQueryItem*> uncommittedItems = getModel()->getUncommittedItems();
+    int uncommittedCount = uncommittedItems.size();
 
-    // Uncommited & selected items count
-    int uncommitedSelCount = 0;
-    foreach (SqlQueryItem* item, uncommitedItems)
+    // Uncommitted & selected items count
+    int uncommittedSelCount = 0;
+    foreach (SqlQueryItem* item, uncommittedItems)
         if (selectedItems.contains(item))
-            uncommitedSelCount++;
+            uncommittedSelCount++;
 
-    if (uncommitedCount > 0)
+    if (uncommittedCount > 0)
         contextMenu->addAction(actionMap[COMMIT]);
 
-    if (uncommitedSelCount > 0)
+    if (uncommittedSelCount > 0)
         contextMenu->addAction(actionMap[SELECTIVE_COMMIT]);
 
-    if (uncommitedCount > 0)
+    if (uncommittedCount > 0)
         contextMenu->addAction(actionMap[ROLLBACK]);
 
-    if (uncommitedSelCount > 0)
+    if (uncommittedSelCount > 0)
         contextMenu->addAction(actionMap[SELECTIVE_ROLLBACK]);
 
-    if (uncommitedCount > 0 && selCount > 0)
+    if (uncommittedCount > 0 && selCount > 0)
         contextMenu->addSeparator();
 
     if (selCount > 0)
@@ -395,8 +396,11 @@ void SqlQueryView::goToReferencedRow(const QString& table, const QString& column
 
     static_qstring(sqlTpl, "SELECT * FROM %1 WHERE %2 = %3");
 
+    Dialect dialect = db->getDialect();
+    QString wrappedTable = wrapObjIfNeeded(table, dialect);
+    QString wrappedColumn = wrapObjIfNeeded(column, dialect);
     QString valueStr = wrapValueIfNeeded(value.toString());
-    EditorWindow* win = MAINWINDOW->openSqlEditor(db, sqlTpl.arg(table, column, valueStr));
+    EditorWindow* win = MAINWINDOW->openSqlEditor(db, sqlTpl.arg(wrappedTable, wrappedColumn, valueStr));
     if (!win)
         return;
 
@@ -516,7 +520,7 @@ void SqlQueryView::copy()
         {
             itemValue = item->getFullValue();
             if (itemValue.userType() == QVariant::Double)
-                cells << doubleToString(itemValue.toDouble());
+                cells << doubleToString(itemValue);
             else
                 cells << itemValue.toString();
 
diff --git a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp
index 20c878b..3a9f0b0 100644
--- a/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/datagrid/sqltablemodel.cpp
@@ -2,6 +2,7 @@
 #include "common/utils_sql.h"
 #include "sqlqueryitem.h"
 #include "services/notifymanager.h"
+#include "uiconfig.h"
 #include <QDebug>
 #include <QApplication>
 #include <schemaresolver.h>
@@ -28,6 +29,13 @@ void SqlTableModel::setDatabaseAndTable(const QString& database, const QString&
     this->table = table;
     setQuery("SELECT * FROM "+getDataSource());
 
+    QString dbName = database;
+    if (database.toLower() == "main" || database.isEmpty())
+        dbName = QString();
+
+    tablesInUse.clear();
+    tablesInUse << DbAndTable(db, dbName, table);
+
     SchemaResolver resolver(db);
     isWithOutRowIdTable = resolver.isWithoutRowIdTable(database, table);
 }
@@ -37,7 +45,6 @@ SqlQueryModel::Features SqlTableModel::features() const
     return INSERT_ROW|DELETE_ROW|FILTERING;
 }
 
-
 bool SqlTableModel::commitAddedRow(const QList<SqlQueryItem*>& itemsInRow)
 {
     QList<SqlQueryModelColumnPtr> modelColumns = getTableColumnModels(table);
@@ -70,9 +77,9 @@ bool SqlTableModel::commitAddedRow(const QList<SqlQueryItem*>& itemsInRow)
     if (result->isError())
     {
         foreach (SqlQueryItem* item, itemsInRow)
-            item->setCommitingError(true);
+            item->setCommittingError(true);
 
-        notifyError(tr("Error while commiting new row: %1").arg(result->getErrorText()));
+        notifyError(tr("Error while committing new row: %1").arg(result->getErrorText()));
         return false;
     }
 
@@ -135,7 +142,7 @@ bool SqlTableModel::commitDeletedRow(const QList<SqlQueryItem*>& itemsInRow)
     }
 
     if (!SqlQueryModel::commitDeletedRow(itemsInRow))
-        qCritical() << "Could not delete row from SqlQueryView while commiting row deletion.";
+        qCritical() << "Could not delete row from SqlQueryView while committing row deletion.";
 
     return true;
 }
@@ -168,7 +175,7 @@ void SqlTableModel::applyStringFilter(const QString& value)
     Dialect dialect = db->getDialect();
     QStringList conditions;
     foreach (SqlQueryModelColumnPtr column, columns)
-        conditions << wrapObjIfNeeded(column->column, dialect)+" LIKE '%"+value+"%'";
+        conditions << wrapObjIfNeeded(column->column, dialect)+" LIKE '%"+escapeString(value)+"%'";
 
     setQuery("SELECT * FROM "+getDataSource()+" WHERE "+conditions.join(" OR "));
     executeQuery();
@@ -185,7 +192,7 @@ void SqlTableModel::applyRegExpFilter(const QString& value)
     Dialect dialect = db->getDialect();
     QStringList conditions;
     foreach (SqlQueryModelColumnPtr column, columns)
-        conditions << wrapObjIfNeeded(column->column, dialect)+" REGEXP '"+value+"'";
+        conditions << wrapObjIfNeeded(column->column, dialect)+" REGEXP '"+escapeString(value)+"'";
 
     setQuery("SELECT * FROM "+getDataSource()+" WHERE "+conditions.join(" OR "));
     executeQuery();
@@ -392,7 +399,10 @@ void SqlTableModel::updateColumnsAndValues(const QList<SqlQueryItem*>& itemsInRo
         item = itemsInRow[i++];
         if (item->getValue().isNull())
         {
-            if (modelColumn->isDefault())
+            if (CFG_UI.General.UseDefaultValueForNull.get() && modelColumn->isDefault())
+                continue;
+
+            if (modelColumn->isNotNull()) // value is null, but it's NOT NULL, try using DEFAULT, or fail.
                 continue;
 
             if (modelColumn->isPk() && modelColumn->isAutoIncr())
diff --git a/SQLiteStudio3/guiSQLiteStudio/dataview.cpp b/SQLiteStudio3/guiSQLiteStudio/dataview.cpp
index 69ca9cd..6666834 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dataview.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dataview.cpp
@@ -153,7 +153,7 @@ void DataView::initWidgetCover()
     widgetCover = new WidgetCover(this);
     widgetCover->initWithProgressBarOnly("%v / %m");
     connect(model, SIGNAL(aboutToCommit(int)), this, SLOT(coverForGridCommit(int)));
-    connect(model, SIGNAL(commitingStepFinished(int)), this, SLOT(updateGridCommitCover(int)));
+    connect(model, SIGNAL(committingStepFinished(int)), this, SLOT(updateGridCommitCover(int)));
     connect(model, SIGNAL(commitFinished()), this, SLOT(hideGridCommitCover()));
 }
 
@@ -650,7 +650,7 @@ void DataView::updateFilterIcon()
     }
 }
 
-bool DataView::isUncommited() const
+bool DataView::isUncommitted() const
 {
     return uncommittedGrid || uncommittedForm;
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/dataview.h b/SQLiteStudio3/guiSQLiteStudio/dataview.h
index fcab9f2..73ccfe7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dataview.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dataview.h
@@ -78,7 +78,7 @@ class GUI_API_EXPORT DataView : public QTabWidget, public ExtActionContainer
         SqlQueryView* getGridView() const;
         SqlQueryModel* getModel() const;
         QToolBar* getToolBar(int toolbar) const;
-        bool isUncommited() const;
+        bool isUncommitted() const;
 
         static void staticInit();
         static void insertAction(ExtActionPrototype* action, ToolBar toolbar = TOOLBAR_GRID);
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
index fbe0a38..018eeb6 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
@@ -976,6 +976,13 @@ QString DbTree::getSelectedViewName() const
     return view;
 }
 
+QList<DbTreeItem *> DbTree::getSelectedItems(DbTreeItem::Type itemType)
+{
+    return getSelectedItems([itemType](DbTreeItem* item)
+    {
+        return item->getType() == itemType;
+    });
+}
 
 void DbTree::refreshSchema(Db* db)
 {
@@ -1498,7 +1505,7 @@ void DbTree::resetAutoincrement()
     if (res->isError())
         notifyError(tr("An error occurred while trying to reset autoincrement value for table '%1': %2").arg(table, res->getErrorText()));
     else
-        notifyInfo(tr("Autoincrement value for table '%1' has been reset successfly.").arg(table));
+        notifyInfo(tr("Autoincrement value for table '%1' has been reset successfully.").arg(table));
 }
 
 void DbTree::eraseTableData()
@@ -1507,27 +1514,36 @@ void DbTree::eraseTableData()
     if (!db || !db->isValid())
         return;
 
-    DbTreeItem* item = ui->treeView->currentItem();
-    QString table = item->getTable();
-    if (table.isNull())
+    QList<DbTreeItem *> items = getSelectedItems(DbTreeItem::Type::TABLE);
+    if (items.isEmpty())
     {
         qWarning() << "Tried to erase table data, while table wasn't selected in DbTree.";
         return;
     }
 
-    QMessageBox::StandardButton btn = QMessageBox::question(this, tr("Erase table data"), tr("Are you sure you want to delete all data from table '%1'?")
-                                                            .arg(table));
+    QStringList tables;
+    for (DbTreeItem* item : items)
+        tables << item->getTable();
+
+    QMessageBox::StandardButton btn = QMessageBox::question(this, tr("Erase table data"), tr("Are you sure you want to delete all data from table(s): %1?")
+                                                            .arg(tables.join(", ")));
     if (btn != QMessageBox::Yes)
         return;
 
-    SqlQueryPtr res = db->exec(QString("DELETE FROM %1;").arg(wrapObjIfNeeded(table, db->getDialect())));
-    if (res->isError())
+    static_qstring(DELETE_SQL, "DELETE FROM %1;");
+    Dialect dialect = db->getDialect();
+    SqlQueryPtr res;
+    for (const QString& table : tables)
     {
-        notifyError(tr("An error occurred while trying to delete data from table '%1': %2").arg(table, res->getErrorText()));
-        return;
-    }
+        res = db->exec(DELETE_SQL.arg(wrapObjIfNeeded(table, dialect)));
+        if (res->isError())
+        {
+            notifyError(tr("An error occurred while trying to delete data from table '%1': %2").arg(table, res->getErrorText()));
+            return;
+        }
 
-    notifyInfo(tr("All data has been deleted for table '%1'.").arg(table));
+        notifyInfo(tr("All data has been deleted for table '%1'.").arg(table));
+    }
 }
 
 void DbTree::addColumn(DbTreeItem* item)
@@ -1592,6 +1608,11 @@ void DbTree::currentChanged(const QModelIndex &current, const QModelIndex &previ
 
 void DbTree::deleteSelected(ItemFilterFunc filterFunc)
 {
+    deleteItems(getSelectedItems(filterFunc));
+}
+
+QList<DbTreeItem*> DbTree::getSelectedItems(DbTree::ItemFilterFunc filterFunc)
+{
     QModelIndexList idxList = ui->treeView->getSelectedIndexes();
     QList<DbTreeItem*> items;
     DbTreeItem* item;
@@ -1603,10 +1624,10 @@ void DbTree::deleteSelected(ItemFilterFunc filterFunc)
 
         items << item;
     }
-
-    deleteItems(items);
+    return items;
 }
 
+
 void DbTree::deleteItems(const QList<DbTreeItem*>& itemsToDelete)
 {
     QList<DbTreeItem*> items = itemsToDelete;
@@ -1741,12 +1762,22 @@ void DbTree::generateInsertForTable()
 
 void DbTree::generateUpdateForTable()
 {
+    Db* db = getSelectedDb();
+    QString table = getSelectedTableName();
 
+    QueryGenerator generator;
+    QString sql = generator.generateUpdateOfTable(db, table);
+    MAINWINDOW->openSqlEditor(db, sql);
 }
 
 void DbTree::generateDeleteForTable()
 {
+    Db* db = getSelectedDb();
+    QString table = getSelectedTableName();
 
+    QueryGenerator generator;
+    QString sql = generator.generateDeleteFromTable(db, table);
+    MAINWINDOW->openSqlEditor(db, sql);
 }
 
 void DbTree::setupDefShortcuts()
@@ -1759,11 +1790,6 @@ void DbTree::setupDefShortcuts()
     BIND_SHORTCUTS(DbTree, Action);
 }
 
-void DbTree::closeEvent(QCloseEvent *e)
-{
-    e->ignore();
-}
-
 int qHash(DbTree::Action action)
 {
     return static_cast<int>(action);
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
index ea415a4..f97e5eb 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.h
@@ -123,7 +123,6 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
     protected:
         void createActions();
         void setupDefShortcuts();
-        void closeEvent(QCloseEvent* e);
 
     private:
         typedef std::function<bool(DbTreeItem*)> ItemFilterFunc;
@@ -148,6 +147,8 @@ class GUI_API_EXPORT DbTree : public QDockWidget, public ExtActionContainer
         QString getSelectedIndexName() const;
         QString getSelectedTriggerName() const;
         QString getSelectedViewName() const;
+        QList<DbTreeItem*> getSelectedItems(DbTreeItem::Type itemType);
+        QList<DbTreeItem*> getSelectedItems(ItemFilterFunc filterFunc = nullptr);
 
         static bool areDbTreeItemsValidForItem(QList<DbTreeItem*> srcItems, const DbTreeItem* dstItem);
         static bool areUrlsValidForItem(const QList<QUrl>& srcUrls, const DbTreeItem* dstItem);
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
index 687415d..780b306 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.ui
@@ -14,7 +14,7 @@
    <bool>false</bool>
   </property>
   <property name="features">
-   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+   <set>QDockWidget::AllDockWidgetFeatures</set>
   </property>
   <property name="allowedAreas">
    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
index c11221d..9fe88c2 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp
@@ -35,7 +35,7 @@ DbTreeModel::DbTreeModel()
     connectDbManagerSignals();
 
     connect(CFG, SIGNAL(massSaveBegins()), this, SLOT(massSaveBegins()));
-    connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(massSaveCommited()));
+    connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(massSaveCommitted()));
     connect(CFG_UI.General.ShowSystemObjects, SIGNAL(changed(QVariant)), this, SLOT(markSchemaReloadingRequired()));
 
     dbOrganizer = new DbObjectOrganizer(confirmReferencedTables, resolveNameConflict, confirmConversion, confirmConversionErrors);
@@ -743,7 +743,7 @@ void DbTreeModel::massSaveBegins()
     requireSchemaReloading = false;
 }
 
-void DbTreeModel::massSaveCommited()
+void DbTreeModel::massSaveCommitted()
 {
     if (requireSchemaReloading)
     {
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h
index 122421a..50b080d 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.h
@@ -116,7 +116,7 @@ class GUI_API_EXPORT DbTreeModel : public QStandardItemModel
         void dbUnloaded(Db* db);
         void dbLoaded(Db* db);
         void massSaveBegins();
-        void massSaveCommited();
+        void massSaveCommitted();
         void markSchemaReloadingRequired();
         void dbObjectsMoveFinished(bool success, Db* srcDb, Db* dstDb);
         void dbObjectsCopyFinished(bool success, Db* srcDb, Db* dstDb);
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
index 42c7099..85ae12d 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
@@ -199,7 +199,7 @@ void ConfigDialog::init()
             << CFG_UI.General.ShowVirtualTableLabels;

 

     for (CfgEntry* cfg : entries)

-        connect(cfg, &CfgEntry::changed, this, &ConfigDialog::markRequiresSchemasRefresh);

+        connect(cfg, SIGNAL(changed(QVariant)), this, SLOT(markRequiresSchemasRefresh()));

 

     ui->activeStyleCombo->addItems(QStyleFactory::keys());

 

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
index c69ad20..6bedd25 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.ui
@@ -229,7 +229,7 @@
           </sizepolicy>

          </property>

          <property name="currentIndex">

-          <number>5</number>

+          <number>1</number>

          </property>

          <widget class="QWidget" name="databaseListPage">

           <layout class="QVBoxLayout" name="verticalLayout_36">

@@ -408,7 +408,7 @@
                 <x>0</x>

                 <y>0</y>

                 <width>564</width>

-                <height>504</height>

+                <height>580</height>

                </rect>

               </property>

               <layout class="QVBoxLayout" name="verticalLayout_34">

@@ -418,10 +418,13 @@
                   <string>Data browsing and editing</string>

                  </property>

                  <layout class="QGridLayout" name="gridLayout_2">

-                  <item row="0" column="0">

-                   <widget class="QLabel" name="rowsPerPageLabel">

+                  <item row="1" column="0">

+                   <widget class="QLabel" name="initColWidthLimitLabel">

+                    <property name="toolTip">

+                     <string>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</string>

+                    </property>

                     <property name="text">

-                     <string>Number of data rows per page:</string>

+                     <string>Limit initial data column width to (in pixels):</string>

                     </property>

                    </widget>

                   </item>

@@ -444,16 +447,6 @@
                     </property>

                    </widget>

                   </item>

-                  <item row="1" column="0">

-                   <widget class="QLabel" name="initColWidthLimitLabel">

-                    <property name="toolTip">

-                     <string>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</string>

-                    </property>

-                    <property name="text">

-                     <string>Limit initial data column width to (in pixels):</string>

-                    </property>

-                   </widget>

-                  </item>

                   <item row="1" column="1">

                    <widget class="QSpinBox" name="initColWidthLimitSpin">

                     <property name="toolTip">

@@ -473,7 +466,7 @@
                     </property>

                    </widget>

                   </item>

-                  <item row="2" column="0" colspan="2">

+                  <item row="2" column="0">

                    <widget class="QCheckBox" name="tolltipInDataViewCheck">

                     <property name="toolTip">

                      <string>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</string>

@@ -486,6 +479,39 @@
                     </property>

                    </widget>

                   </item>

+                  <item row="0" column="0">

+                   <widget class="QLabel" name="rowsPerPageLabel">

+                    <property name="text">

+                     <string>Number of data rows per page:</string>

+                    </property>

+                   </widget>

+                  </item>

+                  <item row="3" column="0">

+                   <widget class="QCheckBox" name="keepNullWhenEmptyCheck">

+                    <property name="toolTip">

+                     <string>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</string>

+                    </property>

+                    <property name="text">

+                     <string>Keep NULL value when entering empty value</string>

+                    </property>

+                    <property name="cfg" stdset="0">

+                     <string notr="true">General.KeepNullWhenEmptyValue</string>

+                    </property>

+                   </widget>

+                  </item>

+                  <item row="4" column="0" colspan="2">

+                   <widget class="QCheckBox" name="useDefaultForNullCheck">

+                    <property name="toolTip">

+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

+                    </property>

+                    <property name="text">

+                     <string>Use DEFAULT value (if defined), when committing NULL value</string>

+                    </property>

+                    <property name="cfg" stdset="0">

+                     <string notr="true">General.UseDefaultValueForNull</string>

+                    </property>

+                   </widget>

+                  </item>

                  </layout>

                 </widget>

                </item>

@@ -766,7 +792,7 @@
               <item row="0" column="0" colspan="2">

                <widget class="QCheckBox" name="dontShowDdlPreview">

                 <property name="text">

-                 <string>Don't show DDL preview dialog when commiting schema changes</string>

+                 <string>Don't show DDL preview dialog when committing schema changes</string>

                 </property>

                 <property name="cfg" stdset="0">

                  <string notr="true">General.DontShowDdlPreview</string>

@@ -1001,8 +1027,8 @@
                <rect>

                 <x>0</x>

                 <y>0</y>

-                <width>596</width>

-                <height>487</height>

+                <width>447</width>

+                <height>307</height>

                </rect>

               </property>

               <layout class="QVBoxLayout" name="verticalLayout_31">

@@ -1422,7 +1448,7 @@
                         <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:11pt; font-weight:400; font-style:normal;&quot;&gt;

+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;

 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Abcdefgh&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

                        </property>

                       </widget>

@@ -1513,8 +1539,8 @@ p, li { white-space: pre-wrap; }
                <rect>

                 <x>0</x>

                 <y>0</y>

-                <width>290</width>

-                <height>323</height>

+                <width>268</width>

+                <height>328</height>

                </rect>

               </property>

               <layout class="QVBoxLayout" name="verticalLayout_9">

@@ -1635,8 +1661,8 @@ p, li { white-space: pre-wrap; }
                <rect>

                 <x>0</x>

                 <y>0</y>

-                <width>352</width>

-                <height>806</height>

+                <width>331</width>

+                <height>829</height>

                </rect>

               </property>

               <layout class="QVBoxLayout" name="verticalLayout_12">

@@ -1921,17 +1947,17 @@ p, li { white-space: pre-wrap; }
                  </property>

                  <layout class="QGridLayout" name="gridLayout_6">

                   <item row="0" column="0">

-                   <widget class="QLabel" name="dataViewUncommitedLabel">

+                   <widget class="QLabel" name="dataViewUncommittedLabel">

                     <property name="toolTip">

-                     <string>&lt;p&gt;Any data changes will be outlined with this color, until they're commited to the database.&lt;/p&gt;</string>

+                     <string>&lt;p&gt;Any data changes will be outlined with this color, until they're committed to the database.&lt;/p&gt;</string>

                     </property>

                     <property name="text">

-                     <string>Uncommited data outline color</string>

+                     <string>Uncommitted data outline color</string>

                     </property>

                    </widget>

                   </item>

                   <item row="0" column="1">

-                   <widget class="ColorButton" name="dataViewUncommitedButton">

+                   <widget class="ColorButton" name="dataViewUncommittedButton">

                     <property name="maximumSize">

                      <size>

                       <width>50</width>

@@ -1942,14 +1968,14 @@ p, li { white-space: pre-wrap; }
                      <string/>

                     </property>

                     <property name="cfg" stdset="0">

-                     <string notr="true">Colors.DataUncommited</string>

+                     <string notr="true">Colors.DataUncommitted</string>

                     </property>

                    </widget>

                   </item>

                   <item row="1" column="0">

                    <widget class="QLabel" name="dataViewErrorLabel">

                     <property name="toolTip">

-                     <string>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</string>

+                     <string>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</string>

                     </property>

                     <property name="text">

                      <string>Commit error outline color</string>

@@ -1968,7 +1994,7 @@ p, li { white-space: pre-wrap; }
                      <string/>

                     </property>

                     <property name="cfg" stdset="0">

-                     <string notr="true">Colors.DataUncommitedError</string>

+                     <string notr="true">Colors.DataUncommittedError</string>

                     </property>

                    </widget>

                   </item>

@@ -2238,7 +2264,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>sqlEditorNumberFgButton</tabstop>

   <tabstop>sqlEditorBindParamFgButton</tabstop>

   <tabstop>sqlEditorValidObjectsButton</tabstop>

-  <tabstop>dataViewUncommitedButton</tabstop>

+  <tabstop>dataViewUncommittedButton</tabstop>

   <tabstop>dataViewErrorButton</tabstop>

   <tabstop>dataViewNullFgButton</tabstop>

   <tabstop>dataViewDeletedRowBgButton</tabstop>

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp
index 6bdf41f..781e25e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.cpp
@@ -81,7 +81,6 @@ void DbDialog::showEvent(QShowEvent *e)
         int idx = ui->typeCombo->findText(db->getTypeLabel());
         ui->typeCombo->setCurrentIndex(idx);
 
-        ui->generateCheckBox->setChecked(false);
         ui->fileEdit->setText(db->getPath());
         ui->nameEdit->setText(db->getName());
         disableTypeAutodetection = false;
@@ -126,19 +125,18 @@ void DbDialog::init()
     ui->testConnIcon->setVisible(false);
 
     connect(ui->fileEdit, SIGNAL(textChanged(QString)), this, SLOT(fileChanged(QString)));
-    connect(ui->nameEdit, SIGNAL(textChanged(QString)), this, SLOT(nameModified(QString)));
-    connect(ui->generateCheckBox, SIGNAL(toggled(bool)), this, SLOT(generateNameSwitched(bool)));
+    connect(ui->nameEdit, SIGNAL(textEdited(QString)), this, SLOT(nameModified(QString)));
     connect(ui->browseCreateButton, SIGNAL(clicked()), this, SLOT(browseClicked()));
     connect(ui->browseOpenButton, SIGNAL(clicked()), this, SLOT(browseClicked()));
     connect(ui->testConnButton, SIGNAL(clicked()), this, SLOT(testConnectionClicked()));
     connect(ui->typeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(dbTypeChanged(int)));
 
-    generateNameSwitched(true);
-
     layout()->setSizeConstraint(QLayout::SetFixedSize);
 
     if (mode == Mode::ADD && CFG_UI.General.NewDbNotPermanentByDefault.get())
         ui->permamentCheckBox->setChecked(false);
+
+    validate();
 }
 
 void DbDialog::updateOptions()
@@ -462,55 +460,76 @@ bool DbDialog::testDatabase()
 bool DbDialog::validate()
 {
     // Name
-    if (!ui->generateCheckBox->isChecked())
+    bool nameState = true;
+    if (ui->nameEdit->text().isEmpty())
+    {
+        nameState = false;
+        setValidState(ui->nameEdit, false, tr("Enter an unique database name."));
+    }
+
+    Db* registeredDb = nullptr;
+    if (nameState)
     {
-        if (ui->nameEdit->text().isEmpty())
+        registeredDb = DBLIST->getByName(ui->nameEdit->text(), Qt::CaseInsensitive);
+        if (registeredDb && (mode == Mode::ADD || registeredDb != db))
         {
-            setValidState(ui->nameEdit, false, tr("Enter an unique database name."));
-            return false;
+            nameState = false;
+            setValidState(ui->nameEdit, false, tr("This name is already in use. Please enter unique name."));
         }
     }
 
-    Db* registeredDb = DBLIST->getByName(ui->nameEdit->text(), Qt::CaseInsensitive);
-    if (registeredDb && (mode == Mode::ADD || registeredDb != db))
+    if (nameState)
     {
-        setValidState(ui->nameEdit, false, tr("This name is already in use. Please enter unique name."));
-        return false;
+        if (nameManuallyEdited)
+            setValidStateInfo(ui->nameEdit, tr("<p>Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.</p>"));
+        else
+            setValidState(ui->nameEdit, true);
     }
-    setValidState(ui->nameEdit, true);
 
     // File
+    bool fileState = true;
     if (ui->fileEdit->text().isEmpty())
     {
         setValidState(ui->fileEdit, false, tr("Enter a database file path."));
-        return false;
+        fileState = false;
     }
 
-    registeredDb = DBLIST->getByPath(ui->fileEdit->text());
-    if (registeredDb && (mode == Mode::ADD || registeredDb != db))
+    if (fileState)
     {
-        setValidState(ui->fileEdit, false, tr("This database is already on the list under name: %1").arg(registeredDb->getName()));
-        return false;
+        registeredDb = DBLIST->getByPath(ui->fileEdit->text());
+        if (registeredDb && (mode == Mode::ADD || registeredDb != db))
+        {
+            setValidState(ui->fileEdit, false, tr("This database is already on the list under name: %1").arg(registeredDb->getName()));
+            fileState = false;
+        }
     }
-    setValidState(ui->fileEdit, true);
+
+    if (fileState)
+        setValidState(ui->fileEdit, true);
 
     // Type
+    bool typeState = true;
     if (ui->typeCombo->count() == 0)
     {
         // No need to set validation message here. SQLite3 plugin is built in,
         // so if this happens, something is really, really wrong.
         qCritical() << "No db plugins loaded in db dialog!";
-        return false;
+        typeState = false;
     }
 
-    if (ui->typeCombo->currentIndex() < 0)
+    if (typeState)
     {
-        setValidState(ui->typeCombo, false, tr("Select a database type."));
-        return false;
+        if (ui->typeCombo->currentIndex() < 0)
+        {
+            setValidState(ui->typeCombo, false, tr("Select a database type."));
+            typeState = false;
+        }
     }
-    setValidState(ui->typeCombo, true);
 
-    return true;
+    if (typeState)
+        setValidState(ui->typeCombo, true);
+
+    return nameState && fileState && typeState;
 }
 
 void DbDialog::updateState()
@@ -532,13 +551,12 @@ void DbDialog::typeChanged(int index)
 {
     UNUSED(index);
     updateOptions();
-    valueForNameGenerationChanged();
 }
 
 void DbDialog::valueForNameGenerationChanged()
 {
     updateState();
-    if (!ui->generateCheckBox->isChecked())
+    if (nameManuallyEdited)
         return;
 
     QString generatedName;
@@ -566,21 +584,6 @@ void DbDialog::browseForFile()
     setFileDialogInitPathByFile(path);
 }
 
-void DbDialog::generateNameSwitched(bool checked)
-{
-    if (checked)
-    {
-        ui->nameEdit->setPlaceholderText(tr("Auto-generated"));
-        valueForNameGenerationChanged();
-    }
-    else
-    {
-        ui->nameEdit->setPlaceholderText(tr("Type the name"));
-    }
-
-    ui->nameEdit->setReadOnly(checked);
-}
-
 void DbDialog::fileChanged(const QString &arg1)
 {
     UNUSED(arg1);
@@ -637,9 +640,9 @@ void DbDialog::dbTypeChanged(int index)
     propertyChanged();
 }
 
-void DbDialog::nameModified(const QString &arg1)
+void DbDialog::nameModified(const QString &value)
 {
-    UNUSED(arg1);
+    nameManuallyEdited = !value.isEmpty();
     updateState();
 }
 
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
index 2beea3e..3d1a9da 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
@@ -70,6 +70,7 @@ class GUI_API_EXPORT DbDialog : public QDialog
         DbPluginOption::CustomBrowseHandler customBrowseHandler = nullptr;
         bool disableTypeAutodetection = false;
         bool doAutoTest = false;
+        bool nameManuallyEdited = false;
 
         static const constexpr int ADDITIONAL_ROWS_BEGIN_INDEX = 1;
 
@@ -77,13 +78,12 @@ class GUI_API_EXPORT DbDialog : public QDialog
         void typeChanged(int index);
         void valueForNameGenerationChanged();
         void browseForFile();
-        void generateNameSwitched(bool checked);
         void fileChanged(const QString &arg1);
         void browseClicked();
         void testConnectionClicked();
         void propertyChanged();
         void dbTypeChanged(int index);
-        void nameModified(const QString &arg1);
+        void nameModified(const QString &value);
 
     public slots:
         void accept();
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui
index 6f35079..9878bec 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>455</width>
-    <height>365</height>
+    <height>366</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -80,24 +80,7 @@
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_6">
       <item>
-       <widget class="QLineEdit" name="nameEdit">
-        <property name="readOnly">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="generateCheckBox">
-        <property name="toolTip">
-         <string>Generate name basing on file path</string>
-        </property>
-        <property name="text">
-         <string>Generate automatically</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
+       <widget class="QLineEdit" name="nameEdit"/>
       </item>
      </layout>
     </widget>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui
index 6f97934..20d4f21 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/quitconfirmdialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Uncommited changes</string>
+   <string>Uncommitted changes</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="1">
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp
index 462e57f..7890b3c 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.cpp
@@ -1,13 +1,18 @@
 #include "triggercolumnsdialog.h"
 #include "ui_triggercolumnsdialog.h"
-
+#include "uiutils.h"
 #include <QCheckBox>
 
-TriggerColumnsDialog::TriggerColumnsDialog(QWidget *parent) :
+TriggerColumnsDialog::TriggerColumnsDialog(QWidget *parent, int globalX, int globalY) :
     QDialog(parent, Qt::Popup),
+    globalX(globalX),
+    globalY(globalY),
     ui(new Ui::TriggerColumnsDialog)
 {
     ui->setupUi(this);
+
+    connect(ui->selectAllBtn, SIGNAL(clicked(bool)), this, SLOT(selectAll()));
+    connect(ui->deselectAllBtn, SIGNAL(clicked(bool)), this, SLOT(deselectAll()));
 }
 
 TriggerColumnsDialog::~TriggerColumnsDialog()
@@ -26,7 +31,7 @@ void TriggerColumnsDialog::addColumn(const QString& name, bool checked)
 QStringList TriggerColumnsDialog::getCheckedColumns() const
 {
     QStringList columns;
-    foreach (QCheckBox* cb, checkBoxList)
+    for (QCheckBox* cb : checkBoxList)
     {
         if (cb->isChecked())
             columns << cb->text();
@@ -49,4 +54,17 @@ void TriggerColumnsDialog::changeEvent(QEvent *e)
 void TriggerColumnsDialog::showEvent(QShowEvent*)
 {
     adjustSize();
+    move(globalX, globalY);
+}
+
+void TriggerColumnsDialog::selectAll()
+{
+    for (QCheckBox* cb : checkBoxList)
+        cb->setChecked(true);
+}
+
+void TriggerColumnsDialog::deselectAll()
+{
+    for (QCheckBox* cb : checkBoxList)
+        cb->setChecked(false);
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h
index 1ba0d69..d7e719c 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.h
@@ -15,7 +15,7 @@ class GUI_API_EXPORT TriggerColumnsDialog : public QDialog
         Q_OBJECT
 
     public:
-        explicit TriggerColumnsDialog(QWidget *parent = 0);
+        explicit TriggerColumnsDialog(QWidget *parent, int globalX, int globalY);
         ~TriggerColumnsDialog();
 
         void addColumn(const QString& name, bool checked);
@@ -27,7 +27,13 @@ class GUI_API_EXPORT TriggerColumnsDialog : public QDialog
 
     private:
         QList<QCheckBox*> checkBoxList;
+        int globalX;
+        int globalY;
         Ui::TriggerColumnsDialog *ui = nullptr;
+
+    private slots:
+        void selectAll();
+        void deselectAll();
 };
 
 #endif // TRIGGERCOLUMNSDIALOG_H
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui
index 861e17b..b01e01d 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggercolumnsdialog.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>334</width>
+    <width>232</width>
     <height>300</height>
    </rect>
   </property>
@@ -61,8 +61,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>316</width>
-           <height>237</height>
+           <width>212</width>
+           <height>205</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -83,6 +83,56 @@
        </widget>
       </item>
       <item>
+       <widget class="QFrame" name="selectionButtons">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <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>
+          <widget class="QToolButton" name="selectAllBtn">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Select all</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="deselectAllBtn">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Deselect all</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
        <widget class="QDialogButtonBox" name="buttonBox">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp
index 12baafd..3254f26 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/triggerdialog.cpp
@@ -360,7 +360,9 @@ void TriggerDialog::updateValidation()
 
 void TriggerDialog::showColumnsDialog()
 {
-    TriggerColumnsDialog dialog(this);
+    QPoint topRight = ui->actionColumns->mapToGlobal(ui->actionColumns->rect().topRight());
+
+    TriggerColumnsDialog dialog(this, topRight.x(), topRight.y());
     foreach (const QString& colName, targetColumns)
         dialog.addColumn(colName, selectedColumns.contains(colName, Qt::CaseInsensitive));
 
diff --git a/SQLiteStudio3/guiSQLiteStudio/formview.cpp b/SQLiteStudio3/guiSQLiteStudio/formview.cpp
index 6e62786..0ebb9aa 100644
--- a/SQLiteStudio3/guiSQLiteStudio/formview.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/formview.cpp
@@ -143,7 +143,7 @@ bool FormView::isCurrentRowModifiedInGrid()
 
     QModelIndex startIdx = model->index(gridView->getCurrentIndex().row(), 0);
     QModelIndex endIdx = model->index(gridView->getCurrentIndex().row(), model->columnCount() - 1);
-    return model->findIndexes(startIdx, endIdx, SqlQueryItem::DataRole::UNCOMMITED, true, 1).size() > 0;
+    return model->findIndexes(startIdx, endIdx, SqlQueryItem::DataRole::UNCOMMITTED, true, 1).size() > 0;
 }
 
 void FormView::updateDeletedState()
@@ -250,7 +250,7 @@ void FormView::createActions()
 
 void FormView::setupDefShortcuts()
 {
-    setShortcutContext({ROLLBACK, COMMIT, NEXT_ROW, PREV_ROW, FIRST_ROW, LAST_ROW, INSERT_ROW, DELETE_ROW}, Qt::WidgetWithChildrenShortcut);
+    setShortcutContext({ROLLBACK, COMMIT, NEXT_ROW, PREV_ROW, FIRST_ROW, LAST_ROW, INSERT_ROW, DELETE_ROW}, Qt::ApplicationShortcut);
 
     BIND_SHORTCUTS(FormView, Action);
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/formview.h b/SQLiteStudio3/guiSQLiteStudio/formview.h
index a6a9708..7f84e4f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/formview.h
+++ b/SQLiteStudio3/guiSQLiteStudio/formview.h
@@ -16,10 +16,10 @@ class DataWidgetMapper;
 CFG_KEY_LIST(FormView, QObject::tr("Data form view"),
     CFG_KEY_ENTRY(COMMIT,            Qt::CTRL + Qt::Key_Return,              QObject::tr("Commit changes for current row"))
     CFG_KEY_ENTRY(ROLLBACK,          Qt::CTRL + Qt::Key_Backspace,           QObject::tr("Rollback changes for current row"))
-    CFG_KEY_ENTRY(FIRST_ROW,         Qt::CTRL + Qt::Key_PageUp,              QObject::tr("Go to first row on current page"))
-    CFG_KEY_ENTRY(NEXT_ROW,          Qt::CTRL + Qt::Key_Right,               QObject::tr("Go to next row"))
-    CFG_KEY_ENTRY(PREV_ROW,          Qt::CTRL + Qt::Key_Left,                QObject::tr("Go to previous row"))
-    CFG_KEY_ENTRY(LAST_ROW,          Qt::CTRL + Qt::Key_PageDown,            QObject::tr("Go to last row on current page"))
+    CFG_KEY_ENTRY(FIRST_ROW,         Qt::CTRL + Qt::ALT + Qt::Key_PageUp,    QObject::tr("Go to first row on current page"))
+    CFG_KEY_ENTRY(NEXT_ROW,          Qt::CTRL + Qt::ALT + Qt::Key_Right,     QObject::tr("Go to next row"))
+    CFG_KEY_ENTRY(PREV_ROW,          Qt::CTRL + Qt::ALT + Qt::Key_Left,      QObject::tr("Go to previous row"))
+    CFG_KEY_ENTRY(LAST_ROW,          Qt::CTRL + Qt::ALT + Qt::Key_PageDown,  QObject::tr("Go to last row on current page"))
     CFG_KEY_ENTRY(INSERT_ROW,        Qt::Key_Insert,                         QObject::tr("Insert new row"))
     CFG_KEY_ENTRY(DELETE_ROW,        Qt::CTRL + Qt::Key_Delete,              QObject::tr("Delete current row"))
 )
diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro
index be3e876..60a85ff 100644
--- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro
+++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.pro
@@ -31,10 +31,10 @@ QMAKE_CXXFLAGS += -pedantic
 
 DEFINES += GUISQLITESTUDIO_LIBRARY
 
-TRANSLATIONS += translations/guiSQLiteStudio_it.ts \
+TRANSLATIONS += translations/guiSQLiteStudio_de.ts \
+		translations/guiSQLiteStudio_it.ts \
 		translations/guiSQLiteStudio_zh_CN.ts \
 		translations/guiSQLiteStudio_sk.ts \
-		translations/guiSQLiteStudio_de.ts \
 		translations/guiSQLiteStudio_ru.ts \
 		translations/guiSQLiteStudio_pt_BR.ts \
 		translations/guiSQLiteStudio_fr.ts \
@@ -418,3 +418,5 @@ DISTFILES += \
 
 
 
+
+
diff --git a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc
index 97ed77f..0970b86 100644
--- a/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc
+++ b/SQLiteStudio3/guiSQLiteStudio/guiSQLiteStudio.qrc
@@ -5,8 +5,12 @@
         <file>translations/guiSQLiteStudio_fr.qm</file>
         <file>translations/guiSQLiteStudio_sk.qm</file>
         <file>translations/guiSQLiteStudio_zh_CN.qm</file>
+        <file>translations/guiSQLiteStudio_de.qm</file>
     </qresource>
     <qresource prefix="/css">
         <file>general.css</file>
     </qresource>
 </RCC>
+
+
+
diff --git a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
index 7547712..2bc63a2 100644
--- a/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
+++ b/SQLiteStudio3/guiSQLiteStudio/iconmanager.h
@@ -168,6 +168,8 @@ class GUI_API_EXPORT IconManager : public QObject
             DEF_ICON(RESULTS_IN_TAB,                    "results_in_tab")
             DEF_ICON(ROLLBACK,                          "rollback")
             DEF_ICON(SAVE_SQL_FILE,                     "save_sql_file")
+            DEF_ICON(SEARCH,                            "search")
+            DEF_ICON(SEARCH_AND_REPLACE,                "search_and_replace")
             DEF_ICON(SET_NULL,                          "set_null")
             DEF_ICON(SORT_COLUMNS,                      "sort_columns")
             DEF_ICON(SORT_COUNT_01,                     "sort_cnt_01")
diff --git a/SQLiteStudio3/guiSQLiteStudio/icons.qrc b/SQLiteStudio3/guiSQLiteStudio/icons.qrc
index 6c08cc6..8819276 100644
--- a/SQLiteStudio3/guiSQLiteStudio/icons.qrc
+++ b/SQLiteStudio3/guiSQLiteStudio/icons.qrc
@@ -199,5 +199,7 @@
         <file>img/tag_hash_del.png</file>
         <file>img/tag_hash_edit.png</file>
         <file>img/wand.png</file>
+        <file>img/search_and_replace.png</file>
+        <file>img/search.png</file>
     </qresource>
 </RCC>
diff --git a/SQLiteStudio3/guiSQLiteStudio/img/search.png b/SQLiteStudio3/guiSQLiteStudio/img/search.png
new file mode 100644
index 0000000..7a5ae62
--- /dev/null
+++ b/SQLiteStudio3/guiSQLiteStudio/img/search.png
diff --git a/SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png b/SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png
new file mode 100644
index 0000000..a83efa5
--- /dev/null
+++ b/SQLiteStudio3/guiSQLiteStudio/img/search_and_replace.png
diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
index 8d80277..f7bcb83 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
@@ -887,8 +887,8 @@ bool MainWindow::confirmQuit(const QList<Committable*>& instances)
 
     for (Committable* c : instances)
     {
-        if (c->isUncommited())
-            dialog.addMessage(c->getQuitUncommitedConfirmMessage());
+        if (c->isUncommitted())
+            dialog.addMessage(c->getQuitUncommittedConfirmMessage());
     }
 
     if (dialog.getMessageCount() == 0)
diff --git a/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp
index f2257c6..685e608 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mdiwindow.cpp
@@ -156,7 +156,7 @@ void MdiWindow::changeEvent(QEvent* event)
 
 void MdiWindow::closeEvent(QCloseEvent* e)
 {
-    if (dbBeingClosed || MAINWINDOW->isClosingApp() || !getMdiChild()->isUncommited())
+    if (dbBeingClosed || MAINWINDOW->isClosingApp() || !getMdiChild()->isUncommitted())
     {
         QMdiSubWindow::closeEvent(e);
         return;
@@ -176,7 +176,7 @@ void MdiWindow::dbAboutToBeDisconnected(Db* db, bool& deny)
     if (MAINWINDOW->isClosingApp())
         return;
 
-    if (getMdiChild()->isUncommited() && !confirmClose())
+    if (getMdiChild()->isUncommitted() && !confirmClose())
         deny = true;
     else
         dbBeingClosed = true;
@@ -196,7 +196,7 @@ void MdiWindow::dbDisconnected(Db* db)
 
 bool MdiWindow::confirmClose()
 {
-    QMessageBox msgBox(QMessageBox::Question, tr("Uncommited changes"), getMdiChild()->getQuitUncommitedConfirmMessage(), QMessageBox::Yes|QMessageBox::No, this);
+    QMessageBox msgBox(QMessageBox::Question, tr("Uncommitted changes"), getMdiChild()->getQuitUncommittedConfirmMessage(), QMessageBox::Yes|QMessageBox::No, this);
     msgBox.setDefaultButton(QMessageBox::No);
 
     QAbstractButton* closeBtn = msgBox.button(QMessageBox::Yes);
diff --git a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp
index ebdf2c0..7e5c2ec 100644
--- a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.cpp
@@ -69,6 +69,9 @@ int SearchTextLocator::getStartPosition() const
 
 void SearchTextLocator::setStartPosition(int value)
 {
+    if (ignoreCursorMovements)
+        return;
+
     startPosition = value;
     initialStartPosition = value;
     afterDocPositionSwitch = false;
@@ -148,11 +151,18 @@ void SearchTextLocator::replaceCurrent()
     if (lastMatchStart == -1 || lastMatchEnd == -1)
         return;
 
+    ignoreCursorMovements = true;
+
     QTextCursor cursor(document);
     cursor.setPosition(lastMatchStart);
     cursor.setPosition(lastMatchEnd, QTextCursor::KeepAnchor);
     cursor.removeSelectedText();
     cursor.insertText(replaceString);
+
+    ignoreCursorMovements = false;
+
+    // Adjust further lookups according to replaced lenght change.
+    startPosition += replaceString.length() - lookupString.length();
 }
 
 bool SearchTextLocator::find(QTextDocument::FindFlags flags)
diff --git a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h
index 0cfdb44..02ab9fa 100644
--- a/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h
+++ b/SQLiteStudio3/guiSQLiteStudio/searchtextlocator.h
@@ -49,6 +49,7 @@ class GUI_API_EXPORT SearchTextLocator : public QObject
         int lastMatchStart = -1;
         int lastMatchEnd = -1;
         bool afterDocPositionSwitch = false;
+        bool ignoreCursorMovements = false;
 
         // Config parameters
         QString lookupString;
diff --git a/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp b/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp
index 9dc85f7..c3fd257 100644
--- a/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/sqleditor.cpp
@@ -1,4 +1,5 @@
 #include "sqleditor.h"
+#include "log.h"
 #include "uiconfig.h"
 #include "uiutils.h"
 #include "services/config.h"
@@ -93,7 +94,7 @@ void SqlEditor::init()
 
     connect(this, &QWidget::customContextMenuRequested, this, &SqlEditor::customContextMenuRequested);
     connect(CFG_UI.Fonts.SqlEditor, SIGNAL(changed(QVariant)), this, SLOT(changeFont(QVariant)));
-    connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(configModified()));
+    connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(configModified()));
 }
 
 void SqlEditor::removeErrorMarkers()
@@ -135,10 +136,10 @@ void SqlEditor::createActions()
     createAction(MOVE_BLOCK_UP, tr("Move block up", "sql editor"), this, SLOT(moveBlockUp()), this);
     createAction(COPY_BLOCK_DOWN, tr("Copy block down", "sql editor"), this, SLOT(copyBlockDown()), this);
     createAction(COPY_BLOCK_UP, tr("Copy up down", "sql editor"), this, SLOT(copyBlockUp()), this);
-    createAction(FIND, ICONS.ACT_SEARCH, tr("Find", "sql editor"), this, SLOT(find()), this);
+    createAction(FIND, ICONS.SEARCH, tr("Find", "sql editor"), this, SLOT(find()), this);
     createAction(FIND_NEXT, tr("Find next", "sql editor"), this, SLOT(findNext()), this);
     createAction(FIND_PREV, tr("Find previous", "sql editor"), this, SLOT(findPrevious()), this);
-    createAction(REPLACE, tr("Replace", "sql editor"), this, SLOT(replace()), this);
+    createAction(REPLACE, ICONS.SEARCH_AND_REPLACE, tr("Replace", "sql editor"), this, SLOT(replace()), this);
     createAction(TOGGLE_COMMENT, tr("Toggle comment", "sql editor"), this, SLOT(toggleComment()), this);
 
     actionMap[CUT]->setEnabled(false);
@@ -213,7 +214,8 @@ bool SqlEditor::handleValidObjectContextMenu(const QPoint& pos)
     if (!obj)
         return false;
 
-    QString objName = toPlainText().mid(obj->from, (obj->to - obj->from + 1));
+    Dialect dialect = getDialect();
+    QString objName = stripObjName(toPlainText().mid(obj->from, (obj->to - obj->from + 1)), dialect);
 
     validObjContextMenu->clear();
 
@@ -832,7 +834,7 @@ void SqlEditor::completerRightPressed()
 
 void SqlEditor::parseContents()
 {
-    if (document()->characterCount() > 100000)
+    if (document()->characterCount() > SqliteSyntaxHighlighter::MAX_QUERY_LENGTH)
     {
         if (richFeaturesEnabled)
             notifyWarn(tr("Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled."));
@@ -860,11 +862,14 @@ void SqlEditor::parseContents()
     }
 
     queryParser->setDialect(dialect);
-    queryParser->parse(sql);
+    if (richFeaturesEnabled)
+    {
+        queryParser->parse(sql);
+        checkForValidObjects();
+        checkForSyntaxErrors();
+        highlighter->rehighlight();
+    }
 
-    checkForValidObjects();
-    checkForSyntaxErrors();
-    highlighter->rehighlight();
 }
 
 void SqlEditor::checkForSyntaxErrors()
@@ -1494,7 +1499,7 @@ void SqlEditor::mousePressEvent(QMouseEvent* e)
         if (obj && e->button() == Qt::LeftButton)
         {
             QString objName = toPlainText().mid(obj->from, (obj->to - obj->from + 1));
-            openObject(obj->dbName, objName);
+            openObject(obj->dbName, stripObjName(objName, getDialect()));
         }
     }
 
diff --git a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp
index e3e1950..ac8d6cf 100644
--- a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp
@@ -12,7 +12,7 @@ SqliteSyntaxHighlighter::SqliteSyntaxHighlighter(QTextDocument *parent) :
     setupFormats();
     setupMapping();
     setCurrentBlockState(regulartTextBlockState);
-    connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(setupFormats()));
+    connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(setupFormats()));
 }
 
 void SqliteSyntaxHighlighter::setSqliteVersion(int version)
@@ -125,7 +125,7 @@ QString SqliteSyntaxHighlighter::getPreviousStatePrefix(TextBlockState textBlock
 
 void SqliteSyntaxHighlighter::highlightBlock(const QString &text)
 {
-    if (text.length() <= 0)
+    if (text.length() <= 0 || document()->characterCount() > MAX_QUERY_LENGTH)
         return;
 
     // Reset to default
@@ -265,7 +265,6 @@ void SqliteSyntaxHighlighter::setCreateTriggerContext(bool value)
     createTriggerContext = value;
 }
 
-
 bool SqliteSyntaxHighlighter::getObjectLinksEnabled() const
 {
     return objectLinksEnabled;
diff --git a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h
index 0696d02..48649d4 100644
--- a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h
+++ b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.h
@@ -74,6 +74,8 @@ class GUI_API_EXPORT SqliteSyntaxHighlighter : public QSyntaxHighlighter
         bool getCreateTriggerContext() const;
         void setCreateTriggerContext(bool value);
 
+        static constexpr int MAX_QUERY_LENGTH = 100000;
+
     protected:
         void highlightBlock(const QString &text);
 
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm
index 597e95f..f1dac43 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.qm
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts
index ba0392e..c597ce1 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
+<TS version="2.1" language="de_DE">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -432,8 +432,12 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
+        <source>Collations editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Collations editor window has uncommited modifications.</source>
-        <translation>Der Editorfür Kollationen enthält nicht gespeicherte Änderungen.</translation>
+        <translation type="vanished">Der Editorfür Kollationen enthält nicht gespeicherte Änderungen.</translation>
     </message>
 </context>
 <context>
@@ -906,7 +910,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
@@ -997,215 +1001,234 @@ but it&apos;s okay to use it.</source>
         <translation>Datenbearbeitung</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation>Anzahl an Datenzeilen pro Seite:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Wenn Daten in das Ergebnisfenster eingelesen werden, dann wird die Breite der Spalten dabei automatisch angepasst. Dieser Wert begrenzt maximale Breite für die automatische Breitenanpassung. Der Anwender kann die Spaltenbreite jedoch manuell über dieses Limit verbreitern.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation>Begrenze die initiale Spaltenbreite im Ergebnisfenster auf (Pixel):</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation>Neue Zeile im Gitternetz des Datenfensters hinzufügen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation>Vor der derzeitig ausgewählten Zeile</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation>Nach der derzeitig ausgewählten Zeile</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation>Am Ende der Datenfensters</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Wenn aktiviert, wird der Reiter &quot;Daten&quot; anstelle des Reiters &quot;Struktur&quot; angezeigt beim öffnen eines Tabellenfensters angezeigt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Wenn aktiviert, wird der Reiter &quot;Daten&quot; als erster Reiter angezeigt für jedes Tabellenfenster, anstelle an zweiter Stelle.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation>Den Reiter Daten als ersten Reiter im Tabellenfenster anzeigen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation>Den Reiter Daten als ersten Reiter im View-Fenster anzeigen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation>Datentypen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation>Verfügbare Editoren:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation>Für diesen Datentyp ausgewählte Editoren:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation>Schema</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation>Maximale Anzahl an DDL Änderungen im Verlauf.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation>DDL Verlaufsgröße:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
         <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation>Zeige keine DDL Vorschau, wenn Schemaänderungen committed werden</translation>
+        <translation type="vanished">Zeige keine DDL Vorschau, wenn Schemaänderungen committed werden</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation>SQL Abfragen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation>Maximale Anzahl an SQL Abfragen im Verlauf.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation>Verlaufsgröße:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Wenn diese Option aktiviert ist und sich mehrere SQL Abfragen im Editorfenster befinden, dann wird nur die SQL Abfrage ausgeführt, in der sich der Cursor befindet. Ist diese Option nicht gesetzt, dann werden alle SQL Abfragen ausgeführt. Sie können die auszuführenden SQL Abfragen selbst bestimmen, indem Sie diese vor der Ausführung mit der Maus oder Tastatur markieren.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation>Führt nur die Abfrage unter dem Cursor aus</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation>Updates</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation>Prüfe vor dem Start automatisch auf Updates</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation>Sitzung</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation>Stelle letzte Sitzung nach dem Start wieder her (aktive MDI Fenster)</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation>Statusfeld</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation>Den Panel Status immer öffnen, wenn eine neue Meldung ausgegeben wird</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation>Filtere Tastaturkürzel nach Name oder Tastenkombination</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation>Aktion</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation>Tastenkombination</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation>Die Änderung der Sprache erfordert einen Neustart des Programms.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation>Kompaktes Layout</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das kompakte Layout reduziert alle Lücken und Abstände der Oberfläche auf ein Minimum, um mehr Platz für die Darstellung der Daten zu schaffen. Die Oberfläche sieht dann zwar nicht mehr sehr ästhetisch aus, aber man hat mehr Daten im Überblick.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation>Benutze kompaktes Layout</translation>
     </message>
@@ -1285,7 +1308,7 @@ but it&apos;s okay to use it.</source>
         <translation>Zeige Systemtabellen und Indizes in der Liste an</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation>Tabellenfenster</translation>
     </message>
@@ -1294,12 +1317,12 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">Wenn die Option aktiviert ist, dann wird im Tabellenfenster der Reiter &quot;Daten&quot; angezeigt statt &quot;Strukturen&quot;.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation>Öffnet das Tabellenfenster mit dem Reiter &quot;Daten&quot; im Vordergrund</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation>Viewfenster</translation>
     </message>
@@ -1308,227 +1331,244 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">Wenn die Option aktiviert ist, dann wird im Viewfenster der Reiter &quot;Daten&quot; angezeigt statt &quot;Strukturen&quot;.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation>Öffnet das Viewfenster mit dem Reiter &quot;Daten&quot; im Vordergrund</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation>Dockingbereiche des Hauptfensters</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation>Linke und rechte Bereiche belegen die Ecken</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation>Obere und untere Bereiche belegen die Ecken</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation>Verberge eingebaute Plugins</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation>Aktueller Stil:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation>Deaktiviert</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation>Aktives Formatierungsplugin</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation>Schriftart des SQL Editors</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation>Schriftart der Datenbankliste</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation>Zusätzliche Bezeichnungen in der Datenbankliste</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation>Schriftart der Ergebnisansicht</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation>Schriftart des Statusfelds</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation>Farben des SQL Editors</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation>Hintergrundfarbe der aktuellen Zeile</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation>&lt;p&gt;SQL Zeichenketten sind mit einfachen Anführungszeichen umschlossen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation>Vordergrundfarbe von Zeichenketten</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;p&gt;Bind Parameter sind Platzhalter für Werte, die der Anwender eingibt. Sie haben dabei eine der folgenden Formen:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation>Vordergrundfarbe von Bind Parametern</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation>Hintergrundfarbe von hervorgehobener Klammern</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;p&gt;BLOB Werte sind hexadezimale Werte wie z.B.:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation>Vordergrundfarbe von BLOB Werten</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation>Reguläre Vordergrundfarbe</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation>Hintergrundfarbe der Zeilennummernleiste</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation>Vordergrundfarbe von Schlüsselwörtern</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation>Vordergrundfarbe von Ziffern</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation>Vordergrundfarbe von Kommentaren</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gültige Objekte sind Namen von Tabellen, Indizes, Triggern oder Views die in der SQLite Datenbank existieren.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation>Vordergrundfarbe von gültigen Objekten</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation>Farben der Ergebnisansicht</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Jede Datenänderung wird mit dieser Farbe kenntlich gemacht, bis die geänderten Daten in die Datenbank zurückgeschrieben worden sind.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;Jede Datenänderung wird mit dieser Farbe kenntlich gemacht, bis die geänderten Daten in die Datenbank zurückgeschrieben worden sind.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
         <source>Uncommited data outline color</source>
-        <translation>Rahmenfarbe von nicht gespeicherten Daten</translation>
+        <translation type="vanished">Rahmenfarbe von nicht gespeicherten Daten</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
         <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Tritt beim Speichern einer Änderung ein Problem auf, dann wird die problematische Zelle mit dieser Farbe markiert.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;Tritt beim Speichern einer Änderung ein Problem auf, dann wird die problematische Zelle mit dieser Farbe markiert.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation>Rahmenfarbe für fehlerhafte Daten</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation>Vordergrundfarbe für NULL Werte</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation>Hintergrundfarbe von gelöschten Zeilen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation>Farben der Datenbankliste</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zusätzliche Bezeichnungen sind solche, die z.B. die  SQLite Version oder die Anzahl an Einträgen in einer Baumliste usw. anzeigen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation>Vordergrundfarbe für zusätzliche Bezeichnungen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation>Farben des Statusfelds</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation>Vordergrundfarbe für Infomeldungen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation>Vordergrundfarbe für Warnmeldungen</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation>Vordergrundfarbe für Fehlermeldungen</translation>
     </message>
@@ -2020,22 +2060,21 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.</tran
         <translation>Datenbanktreiber</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
         <source>Generate automatically</source>
-        <translation>Automatisch generieren</translation>
+        <translation type="vanished">Automatisch generieren</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation>Permanent (in der Konfiguration behalten)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation>Verbindung testen</translation>
     </message>
@@ -2046,7 +2085,7 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.</tran
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
@@ -2056,28 +2095,27 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.</tran
         <translation>Name (in der Liste)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
         <source>Generate name basing on file path</source>
-        <translation>Leitet den Namen vom Dateipfad ab</translation>
+        <translation type="vanished">Leitet den Namen vom Dateipfad ab</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation>&lt;p&gt;Wenn diese Option aktiviert ist, wird die Datenbank in der Konfiguration gespeichert und bei jedem Start von SQLiteStudio wieder hergestellt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation>Lokalen Computer nach Datenbankdateien durchsuchen</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation>Durchsuchen</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation>Geben Sie einen eindeutigen Datenbanknamen ein.</translation>
     </message>
@@ -2087,29 +2125,32 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.</tran
         <translation>Der Name wird bereits benutzt, bitte geben Sie einen freien, eindeutigen Namen ein.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
         <source>Enter a database file path.</source>
         <translation>Geben Sie einen Dateipfad für die Datenbank ein.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
         <source>This database is already on the list under name: %1</source>
         <translation>Die Datenbank ist bereits unter folgendem Namen in der Liste enthalten: %1</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
         <source>Select a database type.</source>
         <translation>Wählen Sie einen Datebanktypen aus.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
         <source>Auto-generated</source>
-        <translation>Automatisch generiert</translation>
+        <translation type="vanished">Automatisch generiert</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
         <source>Type the name</source>
-        <translation>Geben Sie den Namen ein</translation>
+        <translation type="vanished">Geben Sie den Namen ein</translation>
     </message>
 </context>
 <context>
@@ -2398,7 +2439,7 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.</tran
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation>Tabellendaten löschen</translation>
     </message>
@@ -2419,56 +2460,66 @@ Das Aufrufen anderer Seiten ist erst nach Abschluss der Zählung möglich.</tran
         <translation>Abfrage für Tabelle generieren</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation>Gruppe erstellen</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation>Gruppenname</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation>Der Eintrag mit Namen %1 existiert bereits in der Gruppe %2.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation>Gruppe löschen</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation>Sind Sie sicher, dass Sie die Gruppe %1 löschen möchten?
 Alle Objekte in dieser Gruppe werden in die übergeordnete Gruppe verschoben.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation>Sind Sie sicher, dass Sie die Datenbank &apos;%1&apos; aus der Liste entfernen möchten?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation>Sind Sie sicher, dass Sie folgende Datenbanken aus der Liste entfernen möchten:
 %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation>Datenbank entfernen</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation>Vacuum (%1)</translation>
     </message>
     <message>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Delete database</source>
         <translation type="obsolete">Datenbank löschen</translation>
     </message>
@@ -2478,14 +2529,14 @@ Alle Objekte in dieser Gruppe werden in die übergeordnete Gruppe verschoben.</t
         <translation type="obsolete">Sind Sie sicher, dass Sie die Datenbank &apos;%1&apos; entfernen möchten?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>Der Import kann nicht durchgeführt werden, da kein Import Plugin geladen ist.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Export fehlgeschlagen, da kein Export Plugins geladen sind.</translation>
     </message>
@@ -2498,67 +2549,65 @@ Alle Objekte in dieser Gruppe werden in die übergeordnete Gruppe verschoben.</t
         <translation type="obsolete">VACUUM erfolgreich abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
         <source>Integrity check (%1)</source>
         <translation>Integritätsprüfung (%1)</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Reset autoincrement</source>
         <translation>Autoincrement zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Sind Sie sicher, dass Sie den Autoincrement Wert für die Tabelle &apos;%1&apos; zurücksetzen möchten?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>Ein Fehler ist aufgetreten beim Zurücksetzen des Autoincrementwertes für die Tabelle &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>Autoincrementwert für die Tabelle &apos;%1&apos; wurde erfolgreich zurückgesetzt.</translation>
+        <translation type="vanished">Autoincrementwert für die Tabelle &apos;%1&apos; wurde erfolgreich zurückgesetzt.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
         <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
-        <translation>Sind Sie sicher, dass Sie alle Daten der Tabelle &apos;%1&apos; löschen möchten?</translation>
+        <translation type="vanished">Sind Sie sicher, dass Sie alle Daten der Tabelle &apos;%1&apos; löschen möchten?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation>Beim Löschen der Daten aus Tabelle &apos;%1&apos; ist folgender Fehler aufgetreten: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation>Es wurden alle Daten aus Tabelle &apos;%1&apos; gelöscht.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation>Folgende Objekte werden gelöscht: %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation>Folgende Datenbanken werden aus der Liste entfernt: %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation>Die aus der gelöschten Gruppe verbleibenden Objekte werden an die Position der gelöschten Gruppe verschoben.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation>%1&lt;br&gt;&lt;br&gt;Sind Sie sicher, dass Sie fortfahren möchten?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation>Objekte löschen</translation>
     </message>
@@ -2825,78 +2874,82 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V
         <translation>View aus der Abfrage erstellen</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation>Vorherige Datenbank</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation>Nächste Datenbank</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation>Nächsten Reiter zeigen</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation>Vorherigen Reiter zeigen</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation>Fokus auf die Ergebnisse unten</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation>Fokus auf den SQL Editor oben</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation>Aktive Datenbank (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation>Abfrage in %1 Sekunde(n) abgeschlossen. %2 Zeile(n) betroffen</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation>Abfrage in %1 Sekunde(n) abgeschlossen.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation>Lösche Ausführungsverlauf</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation>Sind Sie sicher, dass Sie den gesamten SQL Ausführungsverlauf löschen möchten? Dieser Vorgang kann nicht rückgängig gemacht werden.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Es kann nicht exportiert werden, da kein Export Plugin geladen ist.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation>Es ist keine Datenbank im SQL Editor selektiert. Für eine unbekannte Datenbank kann kein View erzeugt werden.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Editor window &quot;%1&quot; has uncommited data.</source>
-        <translation>Das Editorfenster &quot;%1&quot; hat ungespeicherte Daten.</translation>
+        <translation type="vanished">Das Editorfenster &quot;%1&quot; hat ungespeicherte Daten.</translation>
     </message>
 </context>
 <context>
@@ -3356,8 +3409,12 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
+        <source>Functions editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Functions editor window has uncommited modifications.</source>
-        <translation>Der Editorfür Funktionen enthält nicht gespeicherte Änderungen.</translation>
+        <translation type="vanished">Der Editorfür Funktionen enthält nicht gespeicherte Änderungen.</translation>
     </message>
 </context>
 <context>
@@ -3956,9 +4013,13 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V
 <context>
     <name>MdiWindow</name>
     <message>
-        <location filename="../mdiwindow.cpp" line="199"/>
         <source>Uncommited changes</source>
-        <translation>Nicht gespeicherte Änderungen</translation>
+        <translation type="vanished">Nicht gespeicherte Änderungen</translation>
+    </message>
+    <message>
+        <location filename="../mdiwindow.cpp" line="199"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdiwindow.cpp" line="204"/>
@@ -4892,9 +4953,13 @@ Bitte geben Sie einen neuen, eindeutigen Namen an oder drücken Sie %1, um den V
 <context>
     <name>QuitConfirmDialog</name>
     <message>
-        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
         <source>Uncommited changes</source>
-        <translation>Nicht gespeicherte Änderungen</translation>
+        <translation type="vanished">Nicht gespeicherte Änderungen</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="20"/>
@@ -4994,180 +5059,180 @@ find next</source>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation>Komplett</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation>SQL formatieren</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation>SQL in Datei speichern</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation>SQL aus Datei laden</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation>Zeile löschen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation>Zeile löschen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation>Block nach unten verschieben</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation>Block nach oben verschieben</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation>Block nach unten kopieren</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translatorcomment>&quot;up down&quot; ??? Muss geklärt werden!</translatorcomment>
         <translation>Kopiere auf ab</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation>Finden</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation>Nächster Fund</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation>Vorheriger Fund</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation>Ersetzen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation>Kommentar umschalten</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation>SQL Inhalte in Datei speichern: %1</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation>Die Funktion Autovervollständigung kann nur genutzt werden, wenn eine gültige Datenbank für den SQL Editor gewählt wurde.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation>Der Text im SQL Editor ist sehr groß, daher wurde die Syntaxkontrolle und die farbliche Hervorhebung von Objekten vorübergehend deaktiviert.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation>In Datei speichern</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation>Die Datei &apos;%1&apos; kann nicht für Schreibzugriffe geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation>SQL Skripte (*.sql);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation>Die Datei &apos;%1&apos; kann nicht für Lesezugriffe geöffnet werden: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation>Das Dokumentenende wurde erreicht. Drücken Sie &apos;Nächster Fund&apos;, um die Suche am Dokumentenanfang fortzusetzen.</translation>
     </message>
@@ -5199,12 +5264,11 @@ find next</source>
         <translation>Bedingungen:</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
         <source>This cell is not editable, because: %1</source>
-        <translation>Diese Zelle kann nicht editiert werden, weil: %1</translation>
+        <translation type="vanished">Diese Zelle kann nicht editiert werden, weil: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation>Es können keine Daten für eine Zelle dargestellt werden, die eine bereits geschlossene Datenbank referenziert.</translation>
     </message>
@@ -5212,18 +5276,36 @@ find next</source>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
         <source>Cannot edit this cell. Details: %2</source>
-        <translation>Die Zelle kann nicht editiert. Details: %2</translation>
+        <translation type="vanished">Die Zelle kann nicht editiert. Details: %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
         <source>The row is marked for deletion.</source>
         <translation>Diese Zeile ist zum Löschen markiert.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished">Die Zelle kann nicht editiert. Details: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5231,69 +5313,85 @@ find next</source>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation>Es kann nur eine Abfrage gleichzeitig ausgeführt werden.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
         <source>Uncommited data</source>
-        <translation>Nicht gespeicherte Daten</translation>
+        <translation type="vanished">Nicht gespeicherte Daten</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
         <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
-        <translation>Es gibt ungespeicherte Änderungen. Möchten Sie wirklich fortfahren? Alle Änderungen werden dann verloren gehen.</translation>
+        <translation type="vanished">Es gibt ungespeicherte Änderungen. Möchten Sie wirklich fortfahren? Alle Änderungen werden dann verloren gehen.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
         <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation>Es können keine Daten für eine Zelle gespeichert werden, die eine bereits geschlossene Datenbank referenziert.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
         <source>Could not begin transaction on the database. Details: %1</source>
         <translation>Es kann keine Transaktion auf der Datenbank gestartet werden. Details: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
         <source>An error occurred while commiting the transaction: %1</source>
-        <translation>Fehler beim Committen der Transaktion: %1</translation>
+        <translation type="vanished">Fehler beim Committen der Transaktion: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
         <source>An error occurred while rolling back the transaction: %1</source>
         <translation>Fehler beim Rollback der Transaktion: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
         <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation>Es wurde versucht eine nicht editierbare Zelle zu committen (derzeit modifiziert und auf das Commit wartend)! Dies ist ein Fehler den Sie melden sollten.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
         <source>An error occurred while commiting the data: %1</source>
-        <translation>Fehler beim Committen der Daten: %1</translation>
+        <translation type="vanished">Fehler beim Committen der Daten: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation>Fehler beim Ausführen der SQL-Abfrage auf der Datenbank &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation>Fehler beim Laden der Abfrageergebnisse: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation>Mehrere Zeilen einfügen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation>Anzahl an Zeilen zum Einfügen:</translation>
     </message>
@@ -5301,117 +5399,117 @@ find next</source>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation>Kopieren als...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation>Einfügen als...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation>NULL Wert setzen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation>Werte löschen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation>Wert im Editor bearbeiten</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation>Commit</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation>Rollback</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation>Gewählte Zellen speichern</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation>Gewählte Zellen wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation>Sortierspalten definieren</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation>Benutzerdefinierte Sortierung entfernen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation>Zeile einfügen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation>Mehrere Zeilen einfügen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation>Gewählte Zeile löschen</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation>Es sind keine Elemente selektiert in die der Inhalt der Zwischenablage eingefügt werden könnte.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation>Werte editieren</translation>
     </message>
@@ -5419,12 +5517,16 @@ find next</source>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
         <source>Error while commiting new row: %1</source>
-        <translation>Fehler beim Committen der neuen Zeile: %1</translation>
+        <translation type="vanished">Fehler beim Committen der neuen Zeile: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation>Fehler beim Löschen der Zeile aus Tabelle %1: %2</translation>
     </message>
@@ -5687,7 +5789,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5712,409 +5814,417 @@ NULL</source>
         <translation type="unfinished">DDL</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation type="unfinished">Tabelle füllen</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation type="unfinished">Spalte nach oben verschieben</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation type="unfinished">Spalte nach unten verschieben</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation type="unfinished">Erzeuge identische Tabelle</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation type="unfinished">Index löschen</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation type="unfinished">Trigger Liste aktualisieren</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation type="unfinished">Trigger löschen</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
-        <source>Commited changes for table &apos;%1&apos; successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
-        <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation type="unfinished">Autoincrement zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished">Sind Sie sicher, dass Sie den Autoincrement Wert für die Tabelle &apos;%1&apos; zurücksetzen möchten?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished">Ein Fehler ist aufgetreten beim Zurücksetzen des Autoincrementwertes für die Tabelle &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished">Autoincrementwert für die Tabelle &apos;%1&apos; wurde erfolgreich zurückgesetzt.</translation>
+        <translation type="obsolete">Autoincrementwert für die Tabelle &apos;%1&apos; wurde erfolgreich zurückgesetzt.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation type="unfinished">Bedingung löschen</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
         <source>Uncommited changes</source>
-        <translation type="unfinished">Nicht gespeicherte Änderungen</translation>
+        <translation type="obsolete">Nicht gespeicherte Änderungen</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
-Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation type="unfinished">Spalten</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation type="unfinished">Partieller Indexzustand</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished">Details</translation>
     </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
-        <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TriggerColumnsDialog</name>
@@ -6128,6 +6238,16 @@ Do you want to commit the structure, or do you want to go back to the structure
         <source>Triggering columns:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished">Alles auswählen</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished">Auswahl aufheben</translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6219,13 +6339,13 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation type="unfinished">Fehler</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation type="unfinished">Fehler beim Ausführen des folgenden SQL Statments:
@@ -6274,7 +6394,7 @@ Do you want to commit the structure, or do you want to go back to the structure
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6316,224 +6436,228 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation type="unfinished">Spalte nach oben verschieben</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation type="unfinished">Spalte nach unten verschieben</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation type="unfinished">Trigger Liste aktualisieren</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation type="unfinished">Trigger erstellen</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished">Trigger editieren</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished">Trigger löschen</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../windows/viewwindow.cpp" line="361"/>
-        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.cpp" line="363"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
-        <source>Could not load data for view %1. Error details: %2</source>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
-        <source>Uncommited changes</source>
-        <translation type="unfinished">Nicht gespeicherte Änderungen</translation>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Go back to structure tab</source>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Commit modifications and browse data.</source>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
-        <source>Commited changes for view &apos;%1&apos; successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
+        <source>Could not load data for view %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
-        <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <source>Uncommited changes</source>
+        <translation type="obsolete">Nicht gespeicherte Änderungen</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Go back to structure tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation type="unfinished">Name</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished">Details</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts
index 715333f..2771e77 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -429,7 +429,7 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
-        <source>Collations editor window has uncommited modifications.</source>
+        <source>Collations editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -903,7 +903,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,215 +993,215 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
-        <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,242 +1277,262 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
-        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
-        <source>Uncommited data outline color</source>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
-        <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2003,22 +2023,17 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
-        <source>Generate automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2029,7 +2044,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2039,28 +2054,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
-        <source>Generate name basing on file path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2070,28 +2080,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
-        <source>Enter a database file path.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
-        <source>This database is already on the list under name: %1</source>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
-        <source>Select a database type.</source>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
+        <source>Enter a database file path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
-        <source>Auto-generated</source>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
+        <source>This database is already on the list under name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
-        <source>Type the name</source>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
+        <source>Select a database type.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2379,7 +2384,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2400,127 +2405,127 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
-        <source>Cannot import, because no import plugin is loaded.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
-        <source>Cannot export, because no export plugin is loaded.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
-        <source>Integrity check (%1)</source>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
+        <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
-        <source>Reset autoincrement</source>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
+        <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
-        <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
+        <source>Integrity check (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="1499"/>
-        <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
+        <source>Reset autoincrement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
-        <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
+        <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2784,77 +2789,77 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
-        <source>Editor window &quot;%1&quot; has uncommited data.</source>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3311,7 +3316,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
-        <source>Functions editor window has uncommited modifications.</source>
+        <source>Functions editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3911,7 +3916,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <name>MdiWindow</name>
     <message>
         <location filename="../mdiwindow.cpp" line="199"/>
-        <source>Uncommited changes</source>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4844,7 +4849,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <name>QuitConfirmDialog</name>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
-        <source>Uncommited changes</source>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4942,179 +4947,179 @@ find next</source>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5146,12 +5151,7 @@ find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
-        <source>This cell is not editable, because: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5159,18 +5159,32 @@ find next</source>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
-        <source>Cannot edit this cell. Details: %2</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <source>The row is marked for deletion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <source>The row is marked for deletion.</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5178,69 +5192,69 @@ find next</source>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
-        <source>Uncommited data</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
+        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
-        <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
+        <source>Could not begin transaction on the database. Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
-        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
+        <source>An error occurred while rolling back the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
-        <source>Could not begin transaction on the database. Details: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
+        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
-        <source>An error occurred while commiting the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
-        <source>An error occurred while rolling back the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
-        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
-        <source>An error occurred while commiting the data: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5248,117 +5262,117 @@ find next</source>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5366,12 +5380,12 @@ find next</source>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
-        <source>Error while commiting new row: %1</source>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5634,7 +5648,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5659,409 +5673,409 @@ NULL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
-        <source>Commited changes for table &apos;%1&apos; successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
-        <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
-        <source>Uncommited changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
-Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
-        <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TriggerColumnsDialog</name>
@@ -6075,6 +6089,16 @@ Do you want to commit the structure, or do you want to go back to the structure
         <source>Triggering columns:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6166,13 +6190,13 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation type="unfinished"></translation>
@@ -6220,7 +6244,7 @@ Do you want to commit the structure, or do you want to go back to the structure
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6262,224 +6286,224 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../windows/viewwindow.cpp" line="361"/>
-        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.cpp" line="363"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
-        <source>Could not load data for view %1. Error details: %2</source>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
-        <source>Uncommited changes</source>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Go back to structure tab</source>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Commit modifications and browse data.</source>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
-        <source>Commited changes for view &apos;%1&apos; successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
+        <source>Could not load data for view %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
-        <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Commit modifications and browse data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm
index 2602532..71a632e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.qm
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts
index 015a070..8a46630 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_fr.ts
@@ -31,7 +31,7 @@
     <message>
         <location filename="../dialogs/aboutdialog.ui" line="61"/>
         <source>Icon directories</source>
-        <translation>Répertoires d&rsquo;images</translation>
+        <translation>Répertoires des images</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.ui" line="81"/>
@@ -41,12 +41,12 @@
     <message>
         <location filename="../dialogs/aboutdialog.ui" line="101"/>
         <source>Plugin directories</source>
-        <translation>Répertoires des plugin</translation>
+        <translation>Répertoires des plugins</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.ui" line="121"/>
         <source>Application directory</source>
-        <translation>Répertoire de l&rsquo;application</translation>
+        <translation>Répertoire de l’application</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.ui" line="172"/>
@@ -54,6 +54,10 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>SQLite 3 version :</source>
+        <translation type="obsolete">Version SQLite :</translation>
+    </message>
+    <message>
         <location filename="../dialogs/aboutdialog.ui" line="111"/>
         <source>Configuration directory</source>
         <translation>Répertoire de configuration</translation>
@@ -61,22 +65,22 @@
     <message>
         <location filename="../dialogs/aboutdialog.ui" line="148"/>
         <source>Qt version:</source>
-        <translation>Version Qt:</translation>
+        <translation>Version Qt :</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.cpp" line="39"/>
         <source>Portable distribution.</source>
-        <translation>Portable distribution.</translation>
+        <translation>Version portable</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.cpp" line="42"/>
         <source>MacOS X application boundle distribution.</source>
-        <translation>MacOS X application boundle distribution.</translation>
+        <translation>MacOS X application boundle distribution</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.cpp" line="45"/>
         <source>Operating system managed distribution.</source>
-        <translation>Operating system managed distribution.</translation>
+        <translation>Operating system managed distribution</translation>
     </message>
     <message>
         <location filename="../dialogs/aboutdialog.cpp" line="89"/>
@@ -86,7 +90,7 @@
     <message>
         <location filename="../dialogs/aboutdialog.cpp" line="102"/>
         <source>&lt;h3&gt;Table of contents:&lt;/h3&gt;&lt;ol&gt;%2&lt;/ol&gt;</source>
-        <translation>&lt;h3&gt;Table des matières:&lt;/h3&gt;&lt;ol&gt;%2&lt;/ol&gt;</translation>
+        <translation>&lt;h3&gt;Table des matières : &lt;/h3&gt;&lt;ol&gt;%2&lt;/ol&gt;</translation>
     </message>
 </context>
 <context>
@@ -104,18 +108,18 @@
     <message>
         <location filename="../dialogs/bugdialog.ui" line="36"/>
         <source>E-mail address</source>
-        <translation>Adresse E-mail</translation>
+        <translation>Adresse électronique</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.ui" line="43"/>
         <location filename="../dialogs/bugdialog.cpp" line="121"/>
         <source>Log in</source>
-        <translation>S&rsquo;identifier</translation>
+        <translation>S’identifier</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.ui" line="68"/>
         <source>Short description</source>
-        <translation>Courte description</translation>
+        <translation>Description brève</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.ui" line="80"/>
@@ -135,7 +139,7 @@
     <message>
         <location filename="../dialogs/bugdialog.ui" line="131"/>
         <source>Operating system</source>
-        <translation>Système d&rsquo;exploitation</translation>
+        <translation>Système d’exploitation</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.ui" line="143"/>
@@ -150,18 +154,18 @@
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="66"/>
         <source>You can see all your reported bugs and ideas by selecting menu &apos;%1&apos; and then &apos;%2&apos;.</source>
-        <translation>Vous pouvez voir tous bugs et idées que vous avez rapportées en sélectionnant le menu «&nbsp;%1&nbsp;» puis «&nbsp;%2&nbsp;».</translation>
+        <translation>Vous pouvez voir tous bugs et idées que vous avez rapportées en sélectionnant le menu « %1 » puis « %2 ».</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="74"/>
         <source>A bug report sent successfully.</source>
-        <translation>Rapport de bug envoyé avec succès.</translation>
+        <translation>Rapport de bogue envoyé avec succès</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="79"/>
         <source>An error occurred while sending a bug report: %1
 %2</source>
-        <translation>Une erreur est survenue lors de l&rsquo;envoi du rapport de bug: %1
+        <translation>Une erreur est survenue lors de l’envoi du rapport de bogue : %1
 %2</translation>
     </message>
     <message>
@@ -173,13 +177,13 @@
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="88"/>
         <source>An idea proposal sent successfully.</source>
-        <translation>L&rsquo;idée proposée à été envoyée avec succès.</translation>
+        <translation>L’idée proposée à été envoyée avec succès.</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="93"/>
         <source>An error occurred while sending an idea proposal: %1
 %2</source>
-        <translation>Une erreeur est survenu lors de l&rsquo;envoi de l&rsquo;idée proposée: %1 %2</translation>
+        <translation>Une erreeur est survenu lors de l’envoi de l’idée proposée : %1 %2</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="105"/>
@@ -229,22 +233,22 @@
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="144"/>
         <source>Providing true email address will make it possible to contact you regarding your report. To learn more, press &apos;help&apos; button on the right side.</source>
-        <translation>En fournissant un mail existant il sera possible de vous contacterau sujet du rapport. Pour en savoir plus, clic sur le bouton «&nbsp;help&nbsp;» sur le coté droit.</translation>
+        <translation>En fournissant un mail existant il sera possible de vous contacterau sujet du rapport. Pour en savoir plus, clic sur le bouton « help » sur le coté droit.</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="146"/>
         <source>Enter vaild e-mail address, or log in.</source>
-        <translation>Entrez un mail valide ou connectez-vous.</translation>
+        <translation>Entrez un email valide ou connectez-vous.</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="148"/>
         <source>Short description requires at least 10 characters, but not more than 100. Longer description can be entered in the field below.</source>
-        <translation>Une description courte nécessite au moins 10 caractères , mais pas plus de 100. La longueur de la description ne peut être contenue dans ce champ.</translation>
+        <translation>Une description courte nécessite au moins 10 caractères, mais pas plus de 100. La longueur de la description ne peut être contenue dans ce champ.</translation>
     </message>
     <message>
         <location filename="../dialogs/bugdialog.cpp" line="151"/>
         <source>Long description requires at least 30 characters.</source>
-        <translation>Une descption longue require au moins 30 caractères. </translation>
+        <translation>Une descption longue require au moins 30 caractères.</translation>
     </message>
 </context>
 <context>
@@ -275,12 +279,12 @@
     <message>
         <location filename="../windows/bugreporthistorywindow.cpp" line="50"/>
         <source>Clear reports history</source>
-        <translation>Vider l&rsquo;historique de rapports</translation>
+        <translation>Vider l’historique de rapports</translation>
     </message>
     <message>
         <location filename="../windows/bugreporthistorywindow.cpp" line="51"/>
         <source>Delete selected entry</source>
-        <translation>Supprimer l&rsquo;entrée sélectionnée</translation>
+        <translation>Supprimer l’entrée sélectionnée</translation>
     </message>
     <message>
         <location filename="../windows/bugreporthistorywindow.cpp" line="90"/>
@@ -303,12 +307,12 @@
     <message>
         <location filename="../dialogs/bugreportlogindialog.ui" line="26"/>
         <source>Login:</source>
-        <translation>Identification:</translation>
+        <translation>Identification :</translation>
     </message>
     <message>
         <location filename="../dialogs/bugreportlogindialog.ui" line="36"/>
         <source>Password:</source>
-        <translation>Mot de passe:</translation>
+        <translation>Mot de passe :</translation>
     </message>
     <message>
         <location filename="../dialogs/bugreportlogindialog.ui" line="53"/>
@@ -356,12 +360,12 @@
     <message>
         <location filename="../windows/collationseditor.ui" line="194"/>
         <source>Collation name:</source>
-        <translation>Nom de regroupements:</translation>
+        <translation>Nom de regroupements :</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.ui" line="204"/>
         <source>Implementation language:</source>
-        <translation>Language d&rsquo;implémentation:</translation>
+        <translation>Language d’implémentation :</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.ui" line="132"/>
@@ -376,17 +380,17 @@
     <message>
         <location filename="../windows/collationseditor.ui" line="145"/>
         <source>Register in following databases:</source>
-        <translation>Inscrire dans les bases de données suivantes:</translation>
+        <translation>Inscrire dans les bases de données suivantes :</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.ui" line="166"/>
         <source>Implementation code:</source>
-        <translation>Code d&rsquo;inplémentation:</translation>
+        <translation>Code d’inplémentation :</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="52"/>
         <source>Collations editor</source>
-        <translation>Editeur de regroupement</translation>
+        <translation>Éditeur de regroupement</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="57"/>
@@ -396,7 +400,7 @@
     <message>
         <location filename="../windows/collationseditor.cpp" line="58"/>
         <source>Rollback all collation changes</source>
-        <translation>annuler toutes les modifications de regroupement</translation>
+        <translation>Annuler toutes les modifications de regroupement</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="60"/>
@@ -421,17 +425,21 @@
     <message>
         <location filename="../windows/collationseditor.cpp" line="291"/>
         <source>Pick the implementation language.</source>
-        <translation>Prendre le language d&rsquo;inplémentation.</translation>
+        <translation>Prendre le language d’inplémentation.</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="294"/>
         <source>Enter a non-empty implementation code.</source>
-        <translation>Saississez un nom, non vide, de language d&rsquo;implémentation.</translation>
+        <translation>Saississez un nom, non vide, de language d’implémentation.</translation>
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
+        <source>Collations editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Collations editor window has uncommited modifications.</source>
-        <translation>L&rsquo;éditeur de regroupement n&rsquo;as pas enregistré les modifications.</translation>
+        <translation type="vanished">L’éditeur de regroupement n’as pas enregistré les modifications.</translation>
     </message>
 </context>
 <context>
@@ -447,12 +455,12 @@
     <message>
         <location filename="../constraints/columncollatepanel.ui" line="41"/>
         <source>Collation name:</source>
-        <translation>Nom de la jointure:</translation>
+        <translation>Nom de la jointure :</translation>
     </message>
     <message>
         <location filename="../constraints/columncollatepanel.ui" line="73"/>
         <source>Named constraint:</source>
-        <translation>Constante nomée:</translation>
+        <translation>Constante nommée :</translation>
     </message>
     <message>
         <location filename="../constraints/columncollatepanel.cpp" line="80"/>
@@ -470,22 +478,22 @@
     <message>
         <location filename="../constraints/columndefaultpanel.ui" line="20"/>
         <source>Default value:</source>
-        <translation>Valeur par défaut:</translation>
+        <translation>Valeur par défaut :</translation>
     </message>
     <message>
         <location filename="../constraints/columndefaultpanel.ui" line="35"/>
         <source>Named constraint:</source>
-        <translation>Contrainte nommée:</translation>
+        <translation>Contrainte nommée :</translation>
     </message>
     <message>
         <location filename="../constraints/columndefaultpanel.cpp" line="39"/>
         <source>Enter a default value expression.</source>
-        <translation>Saississez l&rsquo;expression d&rsquo;une valeur par défaut.</translation>
+        <translation>Saississez l’expression d’une valeur par défaut.</translation>
     </message>
     <message>
         <location filename="../constraints/columndefaultpanel.cpp" line="78"/>
         <source>Invalid default value expression: %1</source>
-        <translation>Invalide expression d&rsquo;une valeur par défaut: %1</translation>
+        <translation>Invalide expression d’une valeur par défaut : %1</translation>
     </message>
     <message>
         <location filename="../constraints/columndefaultpanel.cpp" line="90"/>
@@ -518,17 +526,17 @@
     <message>
         <location filename="../dialogs/columndialog.ui" line="62"/>
         <source>Data type:</source>
-        <translation>Type de données:</translation>
+        <translation>Type de données :</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="69"/>
         <source>Column name:</source>
-        <translation>Nom de colonne:</translation>
+        <translation>Nom de colonne :</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="79"/>
         <source>Size:</source>
-        <translation>Taille:</translation>
+        <translation>Taille :</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="102"/>
@@ -554,7 +562,7 @@
     <message>
         <location filename="../dialogs/columndialog.ui" line="129"/>
         <source>Foreign Key</source>
-        <translation>Clé étranère</translation>
+        <translation>Clef étrangère</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="143"/>
@@ -574,7 +582,7 @@
     <message>
         <location filename="../dialogs/columndialog.ui" line="164"/>
         <source>Primary Key</source>
-        <translation>Clé primaire</translation>
+        <translation>Clef primaire</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="171"/>
@@ -587,95 +595,110 @@
         <translation>Mode avancé</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="83"/>
+        <location filename="../dialogs/columndialog.cpp" line="86"/>
         <source>Add constraint</source>
         <comment>column dialog</comment>
         <translation>Ajouter une contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="84"/>
+        <location filename="../dialogs/columndialog.cpp" line="87"/>
         <source>Edit constraint</source>
         <comment>column dialog</comment>
         <translation>Editer la contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="85"/>
-        <location filename="../dialogs/columndialog.cpp" line="229"/>
+        <location filename="../dialogs/columndialog.cpp" line="88"/>
+        <location filename="../dialogs/columndialog.cpp" line="232"/>
         <source>Delete constraint</source>
         <comment>column dialog</comment>
         <translation>Supprimer la contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="86"/>
+        <location filename="../dialogs/columndialog.cpp" line="89"/>
         <source>Move constraint up</source>
         <comment>column dialog</comment>
         <translation>Monter la contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="87"/>
+        <location filename="../dialogs/columndialog.cpp" line="90"/>
         <source>Move constraint down</source>
         <comment>column dialog</comment>
         <translation>Descendre la contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="89"/>
+        <location filename="../dialogs/columndialog.cpp" line="92"/>
         <source>Add a primary key</source>
         <comment>column dialog</comment>
-        <translation>Ajouter une clé primaire</translation>
+        <translation>Ajouter une clef primaire</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="90"/>
+        <location filename="../dialogs/columndialog.cpp" line="93"/>
         <source>Add a foreign key</source>
         <comment>column dialog</comment>
-        <translation>Ajouter une clé étrangère</translation>
+        <translation>Ajouter une clef étrangère</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="91"/>
+        <location filename="../dialogs/columndialog.cpp" line="94"/>
         <source>Add an unique constraint</source>
         <comment>column dialog</comment>
         <translation>Ajouter une contrainte unique</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="92"/>
+        <location filename="../dialogs/columndialog.cpp" line="95"/>
         <source>Add a check constraint</source>
         <comment>column dialog</comment>
         <translation>Ajouter un contrôle de la contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="93"/>
+        <location filename="../dialogs/columndialog.cpp" line="96"/>
         <source>Add a not null constraint</source>
         <comment>column dialog</comment>
         <translation>Ajouter une contrainte non NULL</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="94"/>
+        <location filename="../dialogs/columndialog.cpp" line="97"/>
         <source>Add a collate constraint</source>
         <comment>column dialog</comment>
         <translation>Ajouter un commentaire à la contrainte</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="95"/>
+        <location filename="../dialogs/columndialog.cpp" line="98"/>
         <source>Add a default constraint</source>
         <comment>column dialog</comment>
         <translation>Ajouter une contrainte par défaut</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="228"/>
+        <location filename="../dialogs/columndialog.cpp" line="231"/>
         <source>Are you sure you want to delete constraint &apos;%1&apos;?</source>
         <comment>column dialog</comment>
-        <translation>Etes-vous sûr de vouloir supprimer la contrainte «&nbsp;%1&nbsp;» ?</translation>
+        <translation>Êtes-vous sûr de vouloir supprimer la contrainte « %1 » ?</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="290"/>
+        <location filename="../dialogs/columndialog.cpp" line="293"/>
         <source>Correct the constraint&apos;s configuration.</source>
         <translation>Corrigez la configuration de la contrainte.</translation>
     </message>
     <message>
-        <location filename="../dialogs/columndialog.cpp" line="293"/>
+        <location filename="../dialogs/columndialog.cpp" line="296"/>
         <source>This constraint is not officially supported by SQLite 2,
 but it&apos;s okay to use it.</source>
-        <translation>Cette contrainte n&rsquo;est pas supportée officiellement par SQLite 2,
-mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
+        <translation>Cette contrainte n’est pas supportée officiellement par SQLite 2,
+mais c’est OK pour l’utiliser.</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/columndialog.cpp" line="385"/>
+        <source>Scale is not allowed for INTEGER PRIMARY KEY columns.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/columndialog.cpp" line="386"/>
+        <source>Precision cannot be defined without the scale.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/columndialog.cpp" line="407"/>
+        <source>Precision is not allowed for INTEGER PRIMARY KEY columns.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -704,12 +727,12 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
     <message>
         <location filename="../constraints/columnforeignkeypanel.ui" line="29"/>
         <source>Foreign table:</source>
-        <translation>Table étrangère:</translation>
+        <translation>Table étrangère :</translation>
     </message>
     <message>
         <location filename="../constraints/columnforeignkeypanel.ui" line="45"/>
         <source>Foreign column:</source>
-        <translation>Colonne étrangère:</translation>
+        <translation>Colonne étrangère :</translation>
     </message>
     <message>
         <location filename="../constraints/columnforeignkeypanel.ui" line="58"/>
@@ -719,12 +742,12 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
     <message>
         <location filename="../constraints/columnforeignkeypanel.ui" line="97"/>
         <source>Deferred foreign key</source>
-        <translation>Clé étrangère refusée</translation>
+        <translation>Clef étrangère refusée</translation>
     </message>
     <message>
         <location filename="../constraints/columnforeignkeypanel.ui" line="115"/>
         <source>Named constraint</source>
-        <translation>Contrainte nomée</translation>
+        <translation>Contrainte nommée</translation>
     </message>
     <message>
         <location filename="../constraints/columnforeignkeypanel.ui" line="122"/>
@@ -752,33 +775,33 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
     <message>
         <location filename="../constraints/columnprimarykeypanel.ui" line="26"/>
         <source>Autoincrement</source>
-        <translation>Autoincrémentation</translation>
+        <translation>Auto-incrémentation</translation>
     </message>
     <message>
         <location filename="../constraints/columnprimarykeypanel.ui" line="48"/>
         <source>Sort order:</source>
-        <translation>ordre de tri:</translation>
+        <translation>Ordre de tri :</translation>
     </message>
     <message>
         <location filename="../constraints/columnprimarykeypanel.ui" line="83"/>
         <source>Named constraint:</source>
-        <translation>Contrainte nommée:</translation>
+        <translation>Contrainte nommée :</translation>
     </message>
     <message>
         <location filename="../constraints/columnprimarykeypanel.ui" line="111"/>
         <source>On conflict:</source>
-        <translation>Sur conflit:</translation>
+        <translation>Sur conflit :</translation>
     </message>
     <message>
         <location filename="../constraints/columnprimarykeypanel.cpp" line="87"/>
         <source>Enter a name of the constraint.</source>
-        <translation>Saississez le nom d&rsquo;une contrainte.</translation>
+        <translation>Saississez le nom d’une contrainte.</translation>
     </message>
     <message>
         <location filename="../constraints/columnprimarykeypanel.cpp" line="103"/>
         <source>Autoincrement (only for %1 type columns)</source>
         <comment>column primary key</comment>
-        <translation>Autoincrémentation(seulement pour %1 colonne type)</translation>
+        <translation>Auto-incrémentation (seulement pour %1 colonne type)</translation>
     </message>
 </context>
 <context>
@@ -786,12 +809,12 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
     <message>
         <location filename="../constraints/columnuniqueandnotnullpanel.ui" line="41"/>
         <source>Named constraint:</source>
-        <translation></translation>
+        <translation>Contrainte nommée :</translation>
     </message>
     <message>
         <location filename="../constraints/columnuniqueandnotnullpanel.ui" line="69"/>
         <source>On conflict:</source>
-        <translation>Sur conflit:</translation>
+        <translation>Sur conflit :</translation>
     </message>
     <message>
         <location filename="../constraints/columnuniqueandnotnullpanel.cpp" line="73"/>
@@ -805,25 +828,25 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
         <location filename="../completer/completerwindow.cpp" line="159"/>
         <source>Column: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Colonne: %1</translation>
+        <translation>Colonne : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="161"/>
         <source>Table: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Table: %1</translation>
+        <translation>Table : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="163"/>
         <source>Index: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Index: %1</translation>
+        <translation>Index : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="165"/>
         <source>Trigger: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Déclencheur: %1</translation>
+        <translation>Déclencheur : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="167"/>
@@ -835,31 +858,31 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
         <location filename="../completer/completerwindow.cpp" line="169"/>
         <source>Database: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Base de données: %1</translation>
+        <translation>Base de données : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="181"/>
         <source>Keyword: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Mon clé: %1</translation>
+        <translation>Mot-clef : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="183"/>
         <source>Function: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Fonction: %1</translation>
+        <translation>Fonction : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="185"/>
         <source>Operator: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Opérateur: %1</translation>
+        <translation>Opérateur : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="187"/>
         <source>String</source>
         <comment>completer statusbar</comment>
-        <translation>Chainge</translation>
+        <translation>Chaîne de caractères</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="189"/>
@@ -877,614 +900,721 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
         <location filename="../completer/completerwindow.cpp" line="193"/>
         <source>Collation: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Regroupement: %1</translation>
+        <translation>Regroupement : %1</translation>
     </message>
     <message>
         <location filename="../completer/completerwindow.cpp" line="195"/>
         <source>Pragma function: %1</source>
         <comment>completer statusbar</comment>
-        <translation>Fonction Pragma: %1</translation>
+        <translation>Fonction Pragma : %1</translation>
     </message>
 </context>
 <context>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1344"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="73"/>
+        <location filename="../dialogs/configdialog.ui" line="63"/>
         <source>Search</source>
         <translation>Recherche</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="104"/>
+        <location filename="../dialogs/configdialog.ui" line="94"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="116"/>
+        <location filename="../dialogs/configdialog.ui" line="106"/>
         <source>Keyboard shortcuts</source>
         <translation>Raccourcis clavier</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="128"/>
+        <location filename="../dialogs/configdialog.ui" line="118"/>
         <source>Look &amp; feel</source>
         <translation>Aspet</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="139"/>
+        <location filename="../dialogs/configdialog.ui" line="129"/>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="151"/>
+        <location filename="../dialogs/configdialog.ui" line="141"/>
         <source>Fonts</source>
         <translation>Polices</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="163"/>
+        <location filename="../dialogs/configdialog.ui" line="153"/>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="176"/>
+        <location filename="../dialogs/configdialog.ui" line="202"/>
         <source>Plugins</source>
         <translation>Plugins</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="187"/>
+        <location filename="../dialogs/configdialog.ui" line="213"/>
         <source>Code formatters</source>
         <translation>Formatage code</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="196"/>
+        <location filename="../dialogs/configdialog.ui" line="178"/>
         <source>Data browsing</source>
         <translation>Navigation données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="207"/>
+        <location filename="../dialogs/configdialog.ui" line="189"/>
         <source>Data editors</source>
-        <translation>Editeur données</translation>
+        <translation>Éditeur de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="237"/>
+        <location filename="../dialogs/configdialog.ui" line="418"/>
         <source>Data browsing and editing</source>
-        <translation>Navigateur et editeur données</translation>
+        <translation>Navigateur et éditeur de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="243"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
-        <translation>Nombre de lignes de données par page:</translation>
+        <translation>Nombre de lignes de données par page :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="269"/>
-        <location filename="../dialogs/configdialog.ui" line="279"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Lorsque les données sont lues dans le tableau la largeur est automatiquement ajustée. Cette valeur limite la largeur initialepour l&rsquo;ajustement, mais l&rsquo;utilisateur peut recadrer les colonnes manuellement audessus de cette limite.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Lorsque les données sont lues dans le tableau, la largeur est automatiquement ajustée. Cette valeur limite la largeur initiale pour l’ajustement, mais l’utilisateur peut recadrer les colonnes manuellement au-dessus de cette limite.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="272"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
-        <translation>Lilite initial de la largeur de la colonne de données (en pixel):</translation>
+        <translation>Limite initiale de la largeur de la colonne de données (en pixel) :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="301"/>
-        <source>Inserting new row in data grid</source>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="307"/>
-        <source>Before currently selected row</source>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="316"/>
-        <location filename="../dialogs/configdialog.ui" line="329"/>
-        <location filename="../dialogs/configdialog.ui" line="342"/>
-        <source>General.InsertRowPlacement</source>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="323"/>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
+        <source>Inserting new row in data grid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
+        <source>Before currently selected row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="336"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="379"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
+        <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
+        <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
+        <source>Place data tab as first tab in a Table Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
+        <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation>Types de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="417"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
-        <translation>Editeurs disponibles:</translation>
+        <translation>Éditeurs disponibles :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="433"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
-        <translation>Editeur sélectionné pour ce type de données:</translation>
+        <translation>Éditeur sélectionné pour ce type de données :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="469"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation>Edition de schéma</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="481"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
-        <translation>Nombre de DDL modifiés gardés dans l&rsquo;historique.</translation>
+        <translation>Nombre de DDL modifiés gardés dans l’historique.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="494"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
-        <translation>Dimension de l&rsquo;historique DDL:</translation>
+        <translation>Dimension de l’historique DDL :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
         <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation>Ne pas montrer la présualisation DDL pendant l&rsquo;enregistrement de schéma modifié</translation>
+        <translation type="vanished">Ne pas montrer la présualisation DDL pendant l’enregistrement du schéma modifié</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="514"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation>Requêtes SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="526"/>
-        <location filename="../dialogs/configdialog.ui" line="539"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
-        <translation>Nombre de requêtes gardées dans l&rsquo;historique.</translation>
+        <translation>Nombre de requêtes gardées dans l’historique.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="542"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
-        <translation>Dimension de l&rsquo;historique:</translation>
+        <translation>Dimension de l’historique :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="549"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;S&rsquo;il y a plus d&rsquo;une requête dans l&rsquo;éditeur d&rsquo;SQL, alors (si cette option est permise) seulement une seule requête sera exécutée -cellesous le curseur d&rsquo;insertion. Autrement toutes les requêtes seront exécutées. Vous pouvez limiter le nombre de requêtes devant être exécutées en sélectionnant ces requêtes avant leur exécution.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;S’il y a plus d’une requête dans l’éditeur SQL, alors (si cette option est permise) seulement une seule requête sera exécutée -cellesous le curseur d’insertion. Autrement toutes les requêtes seront exécutées. Vous pouvez limiter le nombre de requêtes devant être exécutées en sélectionnant ces requêtes avant leur exécution.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation>Exécuter seulement la requête sous le curseur</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation>Mises à jour</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="571"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation>Contrôle automatique des mises à jour au lancement</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="584"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation>Session</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
-        <translation>Restaurer la dernière session(Fenêtre MDI active) après lancement</translation>
+        <translation>Restaurer la dernière session (Fenêtre MDI active) après lancement</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="632"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation>Filtre par nom raccourci ou combinaison de touches</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="673"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="678"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation>Combinaison de touches</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="722"/>
-        <location filename="../dialogs/configdialog.ui" line="1334"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation>Langage</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="728"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
-        <translation>Le changement de langage requiére le redemarrage de l&rsquo;application pour prendre effet.</translation>
+        <translation>Le changement de langage requiére le redemarrage de l’application pour prendre effet.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="745"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Présentation compacte</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="751"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="754"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Utiliser la présentation compacte</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="760"/>
         <source>General.CompactLayout</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Général.PrésentationCompacte</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="770"/>
+        <location filename="../dialogs/configdialog.ui" line="166"/>
+        <location filename="../dialogs/configdialog.ui" line="239"/>
         <source>Database list</source>
         <translation>Liste de base de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="776"/>
+        <location filename="../dialogs/configdialog.ui" line="245"/>
         <source>If switched off, then columns will be sorted in the order they are typed in CREATE TABLE statement.</source>
-        <translation>Sur off, les colonnes seront triées dans l&rsquo;ordre de saisie de l&rsquo;instruction CREATE TABLE. </translation>
+        <translation>Sur off, les colonnes seront triées dans l’ordre de saisie de l’instruction CREATE TABLE. </translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="779"/>
+        <location filename="../dialogs/configdialog.ui" line="248"/>
         <source>Sort table columns alphabetically</source>
         <translation>Ordre de tri alpha de la colonne</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="789"/>
+        <location filename="../dialogs/configdialog.ui" line="258"/>
         <source>Expand tables node when connected to a database</source>
         <translation>Déployez le noeud des tables lors de la connexion de la base de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="799"/>
+        <location filename="../dialogs/configdialog.ui" line="268"/>
         <source>&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;</source>
         <translation>&lt;p&gt;Les labels supplémentaires sont ceux montrés à côté des noms dans la liste de bases de données ( bleus,sauf autre configaration). Permettre cette option aboutira aux lablels pour des bases de données, des bases de données invalides et des noeuds (colonnes, index, déclancheur). Pour plus de labels voir des options ci-dessous.&lt;p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="802"/>
+        <location filename="../dialogs/configdialog.ui" line="271"/>
         <source>Display additional labels on the list</source>
-        <translation>Afficher des labels supplémentairesà la liste </translation>
+        <translation>Afficher des labels supplémentaires à la liste </translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="286"/>
         <source>For regular tables labels will show number of columns, indexes and triggers for each of tables.</source>
         <translation>Pour des tables courantes les labels montrerons le nombre der colonnes, index et déclencheurs pour chaque tables.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="289"/>
         <source>Display labels for regular tables</source>
         <translation>Afficher les labels pour les tables courantes</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="830"/>
+        <location filename="../dialogs/configdialog.ui" line="299"/>
         <source>Virtual tables will be marked with a &apos;virtual&apos; label.</source>
-        <translation>Les tables vituelles seront marquées avec un label «&nbsp;virtuel&nbsp;».</translation>
+        <translation>Les tables vituelles seront marquées avec un label « virtuel ».</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="302"/>
         <source>Display labels for virtual tables</source>
         <translation>Afficher les labels pour les tables virtuelles</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="846"/>
+        <location filename="../dialogs/configdialog.ui" line="315"/>
         <source>Expand views node when connected to a database</source>
         <translation>Etendre le noeud des vues lorsque la base de données est connectée</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="856"/>
+        <location filename="../dialogs/configdialog.ui" line="325"/>
         <source>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)</source>
-        <translation>Si cette option est déactivée, les objets seront triés pour qu&rsquo; ils apparaissent dans la table sqlite_master (dans l&rsquo;ordre de création)</translation>
+        <translation>Si cette option est déactivée, les objets seront triés pour qu’ ils apparaissent dans la table sqlite_master (dans l’ordre de création)</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="859"/>
+        <location filename="../dialogs/configdialog.ui" line="328"/>
         <source>Sort objects (tables, indexes, triggers and views) alphabetically</source>
-        <translation>Tri d&rsquo;objets (tables, index, déclancheurs et vues) en alpha</translation>
+        <translation>Tri d’objets (tables, index, déclancheurs et vues) en alpha</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="869"/>
+        <location filename="../dialogs/configdialog.ui" line="338"/>
         <source>Display system tables and indexes on the list</source>
         <translation>Afficher les tables système et index dans la liste</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="882"/>
+        <location filename="../dialogs/configdialog.ui" line="351"/>
+        <source>Database dialog window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="357"/>
+        <source>&lt;p&gt;When adding new database it is marked to be &quot;permanent&quot; (stored in configuration) by default. Checking this option makes every new database to NOT be &quot;permanent&quot; by default.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="360"/>
+        <source>Do not mark database to be &quot;permanent&quot; by default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="370"/>
+        <source>&lt;p&gt;When this option is enabled, then files dropped from file manager onto database list will be automatically added to the list, bypassing standard database dialog. If for various reasons automatic process fails, then standard dialog will be presented to the user.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="373"/>
+        <source>Try to bypass dialog completly when dropping database file onto the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
+        <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
+        <source>Show column and row details tooltip in data view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation>Fenêtre de ta table</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="888"/>
         <source>When enabled, Table Windows will show up with the data tab, instead of the structure tab.</source>
-        <translation>Lorsque c&rsquo;est permis, la fenêtre des tables sera affichée avec l&rsquo;onglet des données, à la place de l&rsquo;onglet structure.</translation>
+        <translation type="vanished">Lorsque c’est permis, la fenêtre des tables sera affichée avec l’onglet des données, à la place de l’onglet structure.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="891"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
-        <translation>Ourerture la fenêtre de table avec l&rsquo;onglet des données au départ</translation>
+        <translation>Ourerture la fenêtre de table avec l’onglet des données au départ</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="904"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation>Fenêtre de vue</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="910"/>
         <source>When enabled, View Windows will show up with the data tab, instead of the structure tab.</source>
-        <translation>Lorsque c&rsquo;est permis, la fenêtre des vues sera affichée avec l&rsquo;onglet des données, à la place de l&rsquo;onglet structure.</translation>
+        <translation type="vanished">Lorsque c’est permis, la fenêtre des vues sera affichée avec l’onglet des données, à la place de l’onglet structure.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="913"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
-        <translation>Ourerture la fenêtre de vue avec l&rsquo;onglet des données au départ</translation>
+        <translation>Ourerture la fenêtre de vue avec l’onglet des données au départ</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
+        <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
+        <source>Place data tab as first tab in a View Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
+        <source>Status Field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
+        <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
+        <source>Always open Status panel when new message is printed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="926"/>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="932"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="952"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1061"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation>Cacher des plugins incorporés</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1090"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
-        <translation>Style actuel:</translation>
+        <translation>Style actuel :</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1107"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation>Aperçu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1117"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation>En service</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1290"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation>Hors service</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1339"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
-        <translation>Plugin de formattage actf</translation>
+        <translation>Plugin de formattage actif</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1377"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
-        <translation>Police de l&rsquo;éditeur SQL</translation>
+        <translation>Police de caractères de l’éditeur SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1393"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
-        <translation>Liste des polices de base de données</translation>
+        <translation>Liste des polices de caractères de base de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1409"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
-        <translation>Police additionel de la liste des base de données </translation>
+        <translation>Police de caractères additionelle de la liste des bases de données </translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1425"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
-        <translation>Police des données de vue</translation>
+        <translation>Police de caractères des données de vue</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1441"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
-        <translation>Police du champ status</translation>
+        <translation>Police de caractères du champ d’état</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1499"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
-        <translation>Couleurs de l&rsquo;éditeur SQL</translation>
+        <translation>Couleurs de l’éditeur SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1505"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation>Fond actuel de la ligne</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1512"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Les chaines SQL sont encadrées avec de caractères simple quote.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1515"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation>Avant plan chaine</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1618"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation>&lt;p&gt;Les paramètres fournis par l&rsquo;utilisateur sont passés par valeur. Ils ont l&rsquo;une de ces formes:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation>&lt;p&gt;Les paramètres fournis par l’utilisateur sont passés par valeur. Ils ont l’une de ces formes : &lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1621"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation>Premier plan de paramètre de lien</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1644"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation>Parenthèses surlignées</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1651"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
-        <translation>&lt;p&gt;les valeurs BLOB sont binaire représentés comme nombres hexadécimaux, comme:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</translation>
+        <translation>&lt;p&gt;les valeurs BLOB sont binaire représentés comme nombres hexadécimaux, comme : &lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1654"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation>Premier plan de valeur BLOB</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1661"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation>Avant plan courant</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1668"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation>Zone des numéros de ligne en arrière plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1691"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
-        <translation>Mot clé en avant plan</translation>
+        <translation>Mot-clef en avant plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1698"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation>Nombre en avant plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1705"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation>Commentaire en avant plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1744"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Les objets valides sont les nom de tables, index, déclencheurs, ou vues qui existent dans la base de données SQLite.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1747"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation>Objets valides en avant plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1773"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation>Couleurs de vue de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1779"/>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Touts les modifications de données seront écrits avec cette couleur,à l&rsquo;enregistrement de la base de données.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;Toutes les modifications de données seront écrits avec cette couleur, à l’enregistrement de la base de données.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1782"/>
         <source>Uncommited data outline color</source>
-        <translation>Annulation de la couleur des données</translation>
+        <translation type="vanished">Annulation de la couleur des données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1805"/>
         <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;En cas de l&rsquo;erreur à l&rsquo;enregistrement des modifications de données, la cellule problématique sera indiquée avec cette couleur.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;En cas de l’erreur à l’enregistrement des modifications de données, la cellule problématique sera indiquée avec cette couleur.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
-        <translation>Erreur d&rsquo;enregistrement du surlignage</translation>
+        <translation>Erreur d’enregistrement du surlignage</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1831"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation>Valeur NULL au premier plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1854"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation>Ligne supprimée en arrier plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1880"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation>Liste de couleurs des bases de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1886"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Des labels supplémentaires indique la version SQLITE, le nombre d&rsquo;objets au nieau inférieur, etc.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Des labels supplémentaires indique la version SQLITE, le nombre d’objets au nievau inférieur, etc.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1889"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation>Labels additionels en avant plan</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1915"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
-        <translation>Couleurs du status des champs</translation>
+        <translation>Couleurs du champ d’état</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1921"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
-        <translation>Message d&rsquo;information devant</translation>
+        <translation>Message d’information devant</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1944"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation>Warning devant</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1967"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
-        <translation>Message d&rsquo;erreur devant</translation>
+        <translation>Message d’erreur devant</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="785"/>
         <source>Description:</source>
         <comment>plugin details</comment>
-        <translation>Description:</translation>
+        <translation>Description :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="786"/>
         <source>Category:</source>
         <comment>plugin details</comment>
-        <translation>Catégories:</translation>
+        <translation>Catégories :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="787"/>
         <source>Version:</source>
         <comment>plugin details</comment>
-        <translation>Version:</translation>
+        <translation>Version :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="788"/>
         <source>Author:</source>
         <comment>plugin details</comment>
-        <translation>Auteur:</translation>
+        <translation>Auteur :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="790"/>
         <source>Internal name:</source>
         <comment>plugin details</comment>
-        <translation>Nom interne:</translation>
+        <translation>Nom interne :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="791"/>
         <source>Dependencies:</source>
         <comment>plugin details</comment>
-        <translation>Dépendances:</translation>
+        <translation>Dépendances :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="792"/>
         <source>Conflicts:</source>
         <comment>plugin details</comment>
-        <translation>Conflicts:</translation>
+        <translation>Conflicts :</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.cpp" line="796"/>
@@ -1492,43 +1622,43 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
         <translation>Détails plugins</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1202"/>
+        <location filename="../dialogs/configdialog.cpp" line="1208"/>
         <source>Plugins are loaded/unloaded immediately when checked/unchecked, but modified list of plugins to load at startup is not saved until you commit the whole configuration dialog.</source>
-        <translation>Les plugins sont chargés/déchargés immédiatement avec vérifié/non vérifié, mais les modifications de la liste de plugins à charger au lancement ne sont pas enregistrées avant l&rsquo;enregistrement de la configuration entière.</translation>
+        <translation>Les plugins sont chargés/déchargés immédiatement avec vérifié/non vérifié, mais les modifications de la liste de plugins à charger au lancement ne sont pas enregistrées avant l’enregistrement de la configuration entière.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1266"/>
+        <location filename="../dialogs/configdialog.cpp" line="1272"/>
         <source>%1 (built-in)</source>
         <comment>plugins manager in configuration dialog</comment>
         <translation>%1 (intégré)</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1279"/>
+        <location filename="../dialogs/configdialog.cpp" line="1285"/>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1291"/>
+        <location filename="../dialogs/configdialog.cpp" line="1297"/>
         <source>No plugins in this category.</source>
         <translation>Pas de plugins dans cette catégorie.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1387"/>
+        <location filename="../dialogs/configdialog.cpp" line="1399"/>
         <source>Add new data type</source>
-        <translation>Ajoutez un nouveau type de données</translation>
+        <translation>Ajouter un nouveau type de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1391"/>
+        <location filename="../dialogs/configdialog.cpp" line="1403"/>
         <source>Rename selected data type</source>
         <translation>Renommer le type de données sélectionné</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1395"/>
+        <location filename="../dialogs/configdialog.cpp" line="1407"/>
         <source>Delete selected data type</source>
         <translation>Supprimez le type de données sélectionnées</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.cpp" line="1399"/>
+        <location filename="../dialogs/configdialog.cpp" line="1411"/>
         <source>Help for configuring data type editors</source>
         <translation>Aide à la configuration des éditeurs de type de données</translation>
     </message>
@@ -1538,12 +1668,12 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
     <message>
         <location filename="../constraints/constraintcheckpanel.ui" line="20"/>
         <source>The condition</source>
-        <translation>La condition</translation>
+        <translation>Condition</translation>
     </message>
     <message>
         <location filename="../constraints/constraintcheckpanel.ui" line="35"/>
         <source>Named constraint:</source>
-        <translation>Contrainte nommée:</translation>
+        <translation>Contrainte nommée :</translation>
     </message>
     <message>
         <location filename="../constraints/constraintcheckpanel.ui" line="51"/>
@@ -1591,13 +1721,13 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
         <location filename="../dialogs/constraintdialog.cpp" line="170"/>
         <source>Primary key</source>
         <comment>table constraints</comment>
-        <translation>Clé primaire</translation>
+        <translation>Clef primaire</translation>
     </message>
     <message>
         <location filename="../dialogs/constraintdialog.cpp" line="174"/>
         <source>Foreign key</source>
         <comment>table constraints</comment>
-        <translation>Clé étrangère</translation>
+        <translation>Clef étrangère</translation>
     </message>
     <message>
         <location filename="../dialogs/constraintdialog.cpp" line="178"/>
@@ -1642,7 +1772,7 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
         <location filename="../windows/constrainttabmodel.cpp" line="109"/>
         <source>Column (%1)</source>
         <comment>table constraints</comment>
-        <translation>Colonne(%1)</translation>
+        <translation>Colonne (%1)</translation>
     </message>
     <message>
         <location filename="../windows/constrainttabmodel.cpp" line="153"/>
@@ -1680,139 +1810,139 @@ mais c&rsquo;est OK pour l&rsquo;utiliser.</translation>
 <context>
     <name>DataView</name>
     <message>
-        <location filename="../dataview.cpp" line="98"/>
+        <location filename="../dataview.cpp" line="99"/>
         <source>Filter data</source>
         <comment>data view</comment>
         <translation>Filtre de données</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="107"/>
+        <location filename="../dataview.cpp" line="108"/>
         <source>Grid view</source>
-        <translation>Vue tableau</translation>
+        <translation>Table</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="108"/>
+        <location filename="../dataview.cpp" line="109"/>
         <source>Form view</source>
-        <translation>Vue formulaire</translation>
+        <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="165"/>
+        <location filename="../dataview.cpp" line="166"/>
         <source>Refresh table data</source>
         <comment>data view</comment>
         <translation>Actualiser les données de la table</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="182"/>
+        <location filename="../dataview.cpp" line="183"/>
         <source>First page</source>
         <comment>data view</comment>
         <translation>Première page</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="183"/>
+        <location filename="../dataview.cpp" line="184"/>
         <source>Previous page</source>
         <comment>data view</comment>
         <translation>Page précédente</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="185"/>
+        <location filename="../dataview.cpp" line="186"/>
         <source>Next page</source>
         <comment>data view</comment>
         <translation>Page suivante</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="186"/>
+        <location filename="../dataview.cpp" line="187"/>
         <source>Last page</source>
         <comment>data view</comment>
         <translation>Dernière page</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="191"/>
+        <location filename="../dataview.cpp" line="192"/>
         <source>Apply filter</source>
         <comment>data view</comment>
         <translation>Appliquer le filtre</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="206"/>
+        <location filename="../dataview.cpp" line="207"/>
         <source>Commit changes for selected cells</source>
         <comment>data view</comment>
         <translation>Enregistrer les modifications des cellules sélectionnées</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="207"/>
+        <location filename="../dataview.cpp" line="208"/>
         <source>Rollback changes for selected cells</source>
         <comment>data view</comment>
         <translation>Annuler les modifications des celulles sélectionnées</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="208"/>
+        <location filename="../dataview.cpp" line="209"/>
         <source>Show grid view of results</source>
         <comment>sql editor</comment>
-        <translation>Afficache des résultats en tableau</translation>
+        <translation>Affichage des résultats en tableau</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="209"/>
+        <location filename="../dataview.cpp" line="210"/>
         <source>Show form view of results</source>
         <comment>sql editor</comment>
         <translation>Affichage des résultat en formulaire</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="278"/>
+        <location filename="../dataview.cpp" line="284"/>
         <source>Filter by text</source>
         <comment>data view</comment>
         <translation>Filtrer par texte</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="279"/>
+        <location filename="../dataview.cpp" line="285"/>
         <source>Filter by the Regular Expression</source>
         <comment>data view</comment>
         <translation>Filtrer par une expression standard</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="280"/>
+        <location filename="../dataview.cpp" line="286"/>
         <source>Filter by SQL expression</source>
         <comment>data view</comment>
         <translation>Filtrer par une expression SQL</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="311"/>
+        <location filename="../dataview.cpp" line="317"/>
         <source>Tabs on top</source>
         <comment>data view</comment>
         <translation>Onglets en haut</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="312"/>
+        <location filename="../dataview.cpp" line="318"/>
         <source>Tabs at bottom</source>
         <comment>data view</comment>
         <translation>Onglet en bas</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="337"/>
+        <location filename="../dataview.cpp" line="343"/>
         <source>Place new rows above selected row</source>
         <comment>data view</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="338"/>
+        <location filename="../dataview.cpp" line="344"/>
         <source>Place new rows below selected row</source>
         <comment>data view</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="339"/>
+        <location filename="../dataview.cpp" line="345"/>
         <source>Place new rows at the end of the data view</source>
         <comment>data view</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="596"/>
+        <location filename="../dataview.cpp" line="613"/>
         <source>Total number of rows is being counted.
 Browsing other pages will be possible after the row counting is done.</source>
-        <translation>Le total des lignes en cours de comptage. La navigation d&rsquo;autres pages à la fin du comptage.</translation>
+        <translation>Le total des lignes en cours de comptage. La navigation d’autres pages à la fin du comptage.</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="607"/>
+        <location filename="../dataview.cpp" line="624"/>
         <source>Row: %1</source>
-        <translation>Lignes: %1</translation>
+        <translation>Lignes : %1</translation>
     </message>
 </context>
 <context>
@@ -1830,7 +1960,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="29"/>
         <source>Source database version:</source>
-        <translation>Version de la base de données source:</translation>
+        <translation>Version de la base de données source :</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="46"/>
@@ -1840,7 +1970,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="52"/>
         <source>Target version:</source>
-        <translation>Version cible:</translation>
+        <translation>Version cible :</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="59"/>
@@ -1850,12 +1980,12 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="66"/>
         <source>Target file:</source>
-        <translation>Fichier cible:</translation>
+        <translation>Fichier cible :</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="73"/>
         <source>Name of the new database:</source>
-        <translation>Nom de la nouvelle base de données:</translation>
+        <translation>Nom de la nouvelle base de données :</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.ui" line="90"/>
@@ -1870,12 +2000,12 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="129"/>
         <source>Enter valid and writable file path.</source>
-        <translation>Saississez le chemin d&rsquo;un fichier valide et en écriture.</translation>
+        <translation>Saississez le chemin d’un fichier valide et en écriture.</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="131"/>
         <source>Entered file exists and will be overwritten.</source>
-        <translation>Le fichier remplacera l&rsquo;existant.</translation>
+        <translation>Le fichier remplacera l’existant.</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="135"/>
@@ -1895,7 +2025,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="194"/>
         <source>Database %1 has been successfully converted and now is available under new name: %2</source>
-        <translation>La base de données %1 a été convertie correctement et disponible sous le nom: %2</translation>
+        <translation>La base de données %1 a été convertie correctement et disponible sous le nom : %2</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="206"/>
@@ -1905,12 +2035,12 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="214"/>
         <source>Following error occurred while converting SQL statements to the target SQLite version:</source>
-        <translation>L&rsquo;erreur suivante est survenue lors de la conversion des déclarations SQL dans cible version SQLite:</translation>
+        <translation>L’erreur suivante est survenue lors de la conversion des déclarations SQL dans cible version SQLite :</translation>
     </message>
     <message>
         <location filename="../dialogs/dbconverterdialog.cpp" line="215"/>
         <source>Would you like to ignore those errors and proceed?</source>
-        <translation>Souhaitez-vous ignorer ces erreurs et continuer?</translation>
+        <translation>Souhaitez-vous ignorer ces erreurs et continuer ?</translation>
     </message>
 </context>
 <context>
@@ -1918,12 +2048,12 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="20"/>
         <source>Database</source>
-        <translation>Base de donnée</translation>
+        <translation>Base de données</translation>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="26"/>
         <source>Database type</source>
-        <translation type="unfinished"></translation>
+        <translation>Type de base de données</translation>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="32"/>
@@ -1931,24 +2061,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation>Pilote de base de données</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
         <source>Generate automatically</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Générer automatiquement</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation type="unfinished">Options</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
-        <translation type="unfinished"></translation>
+        <translation>Permanent (conserver dans la configuration)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Tester la connexion</translation>
     </message>
     <message>
         <source>Name</source>
@@ -1965,30 +2094,29 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="51"/>
         <source>Create new database file</source>
-        <translation type="unfinished"></translation>
+        <translation>Créer un nouveau fichier de base de données</translation>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="150"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="79"/>
         <source>Name (on the list)</source>
-        <translation type="unfinished"></translation>
+        <translation>Nom (dans la liste)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
         <source>Generate name basing on file path</source>
-        <translation>Génération du nom basé sur le chemin du fichier</translation>
+        <translation type="vanished">Génération du nom basé sur le chemin du fichier</translation>
     </message>
     <message>
         <source>Permanent</source>
         <translation type="vanished">Permanent</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation>&lt;p&gt;Autorisez-ceci si vous voulez que la base de données soit stockée dans le fichier de configuration et restauré chaque fois SQLiteStudio est lancé.&lt;/p&gt;</translation>
@@ -1998,32 +2126,37 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="vanished">Test de connexion</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="151"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="284"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation>Navigateur</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="493"/>
+        <location filename="../dialogs/dbdialog.cpp" line="477"/>
         <source>This name is already in use. Please enter unique name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="501"/>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
         <source>Enter a database file path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
         <source>This database is already on the list under name: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2033,18 +2166,12 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="581"/>
-        <source>Auto-generated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>The name will be auto-generated</source>
         <translation type="vanished">Le non sera généré automatiquement</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="586"/>
         <source>Type the name</source>
-        <translation>Saississez le nom</translation>
+        <translation type="vanished">Saississez le nom</translation>
     </message>
 </context>
 <context>
@@ -2057,7 +2184,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="175"/>
         <source>Are you sure you want to delete table %1?</source>
-        <translation>Confirmez la suppression de la table %1?</translation>
+        <translation>Confirmez la suppression de la table %1 ?</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="179"/>
@@ -2067,7 +2194,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="180"/>
         <source>Are you sure you want to delete index %1?</source>
-        <translation>Confirmez la suppression de l&rsquo;indexe %1?</translation>
+        <translation>Confirmez la suppression de l’index %1 ?</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="184"/>
@@ -2077,7 +2204,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="185"/>
         <source>Are you sure you want to delete trigger %1?</source>
-        <translation>Confirmez la suppression du déclencheur %1?</translation>
+        <translation>Confirmez la suppression du déclencheur %1 ?</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="189"/>
@@ -2087,12 +2214,34 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="190"/>
         <source>Are you sure you want to delete view %1?</source>
-        <translation>Confirmez la suppression de la vue %1?</translation>
+        <translation>Confirmez la suppression de la vue %1 ?</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="218"/>
+        <location filename="../dbobjectdialogs.cpp" line="315"/>
         <source>Error while dropping %1: %2</source>
-        <translation>Erreur à l&rsquo;abandon %1: %2</translation>
+        <translation>Erreur à l’abandon %1 : %2</translation>
+    </message>
+    <message>
+        <location filename="../dbobjectdialogs.cpp" line="282"/>
+        <source>Delete objects</source>
+        <translation type="unfinished">Objets supprimés</translation>
+    </message>
+    <message>
+        <location filename="../dbobjectdialogs.cpp" line="283"/>
+        <source>Are you sure you want to delete following objects:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbobjectdialogs.cpp" line="290"/>
+        <source>Cannot start transaction. Details: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbobjectdialogs.cpp" line="327"/>
+        <source>Cannot commit transaction. Details: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2108,344 +2257,370 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation>Filtre par nom</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="102"/>
+        <location filename="../dbtree/dbtree.cpp" line="104"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="103"/>
+        <location filename="../dbtree/dbtree.cpp" line="105"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="104"/>
+        <location filename="../dbtree/dbtree.cpp" line="106"/>
         <source>Select all</source>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="105"/>
+        <location filename="../dbtree/dbtree.cpp" line="107"/>
         <source>Create a group</source>
-        <translation>Créer un group</translation>
+        <translation>Créer un groupe</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="106"/>
+        <location filename="../dbtree/dbtree.cpp" line="108"/>
         <source>Delete the group</source>
-        <translation>Supprimer un group</translation>
+        <translation>Supprimer le groupe</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="107"/>
+        <location filename="../dbtree/dbtree.cpp" line="109"/>
         <source>Rename the group</source>
-        <translation>Renommerr un group</translation>
+        <translation>Renommer le groupe</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="108"/>
+        <location filename="../dbtree/dbtree.cpp" line="110"/>
         <source>Add a database</source>
-        <translation>Ajout d&rsquo;une base de données</translation>
+        <translation>Attacher une base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="109"/>
+        <location filename="../dbtree/dbtree.cpp" line="111"/>
         <source>Edit the database</source>
         <translation>Modifier la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="110"/>
+        <location filename="../dbtree/dbtree.cpp" line="112"/>
         <source>Remove the database</source>
-        <translation>Enlever la base de données</translation>
+        <translation>Déatcher la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="111"/>
+        <location filename="../dbtree/dbtree.cpp" line="113"/>
         <source>Connect to the database</source>
-        <translation>Connecter la base de données</translation>
+        <translation>Connecter une base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="112"/>
+        <location filename="../dbtree/dbtree.cpp" line="114"/>
         <source>Disconnect from the database</source>
         <translation>Déconnecter la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="113"/>
+        <location filename="../dbtree/dbtree.cpp" line="115"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="114"/>
+        <location filename="../dbtree/dbtree.cpp" line="116"/>
         <source>Export the database</source>
         <translation>Exporter la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="115"/>
+        <location filename="../dbtree/dbtree.cpp" line="117"/>
         <source>Convert database type</source>
         <translation>Type de base de données à convertir</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="116"/>
+        <location filename="../dbtree/dbtree.cpp" line="118"/>
         <source>Vacuum</source>
         <translation>Vaccum</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="117"/>
+        <location filename="../dbtree/dbtree.cpp" line="119"/>
         <source>Integrity check</source>
-        <translation>Contrôle d&rsquo;intégrité</translation>
+        <translation>Contrôle d’intégrité</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="118"/>
+        <location filename="../dbtree/dbtree.cpp" line="120"/>
         <source>Create a table</source>
         <translation>Créer une table</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="119"/>
+        <location filename="../dbtree/dbtree.cpp" line="121"/>
         <source>Edit the table</source>
-        <translation>Modifier une table</translation>
+        <translation>Modifier la table</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="120"/>
+        <location filename="../dbtree/dbtree.cpp" line="122"/>
         <source>Delete the table</source>
-        <translation>Supprimer une table</translation>
+        <translation>Supprimer la table</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="121"/>
+        <location filename="../dbtree/dbtree.cpp" line="123"/>
         <source>Export the table</source>
-        <translation>Exporter une table</translation>
+        <translation>Exporter la table</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="122"/>
+        <location filename="../dbtree/dbtree.cpp" line="124"/>
         <source>Import into the table</source>
-        <translation>Importer dans une table</translation>
+        <translation>Importer dans la table</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="123"/>
+        <location filename="../dbtree/dbtree.cpp" line="125"/>
         <source>Populate table</source>
         <translation>Peupler une table</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="124"/>
+        <location filename="../dbtree/dbtree.cpp" line="126"/>
         <source>Create similar table</source>
         <translation>Créer une table identique</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="125"/>
+        <location filename="../dbtree/dbtree.cpp" line="127"/>
         <source>Reset autoincrement sequence</source>
-        <translation>Réinitialise l&rsquo;autoincrémentation</translation>
+        <translation>Réinitialise l’auto-incrémentation</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="126"/>
+        <location filename="../dbtree/dbtree.cpp" line="128"/>
         <source>Create an index</source>
         <translation>Créer un index</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="127"/>
+        <location filename="../dbtree/dbtree.cpp" line="129"/>
         <source>Edit the index</source>
-        <translation>Modifier un index</translation>
+        <translation>Modifier l’index</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="128"/>
+        <location filename="../dbtree/dbtree.cpp" line="130"/>
         <source>Delete the index</source>
-        <translation>Supprimer un index</translation>
+        <translation>Supprimer l’index</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="129"/>
+        <location filename="../dbtree/dbtree.cpp" line="131"/>
         <source>Create a trigger</source>
         <translation>Créer un déclencheur</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="130"/>
+        <location filename="../dbtree/dbtree.cpp" line="132"/>
         <source>Edit the trigger</source>
-        <translation>modifier un déclencheur</translation>
+        <translation>Modifier le déclencheur</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="131"/>
+        <location filename="../dbtree/dbtree.cpp" line="133"/>
         <source>Delete the trigger</source>
-        <translation>Supprimer un déclencheur</translation>
+        <translation>Supprimer le déclencheur</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="132"/>
+        <location filename="../dbtree/dbtree.cpp" line="134"/>
         <source>Create a view</source>
         <translation>Créer une vue</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="133"/>
+        <location filename="../dbtree/dbtree.cpp" line="135"/>
         <source>Edit the view</source>
-        <translation>Modier une vue</translation>
+        <translation>Modier la vue</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="134"/>
+        <location filename="../dbtree/dbtree.cpp" line="136"/>
         <source>Delete the view</source>
-        <translation>Supprimer une vue</translation>
+        <translation>Supprimer la vue</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="135"/>
+        <location filename="../dbtree/dbtree.cpp" line="137"/>
         <source>Add a column</source>
         <translation>Ajouter une colonne</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="136"/>
+        <location filename="../dbtree/dbtree.cpp" line="138"/>
         <source>Edit the column</source>
-        <translation>Modifier une colonne</translation>
+        <translation>Modifier la colonne</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="137"/>
+        <location filename="../dbtree/dbtree.cpp" line="139"/>
         <source>Delete the column</source>
-        <translation>Supprimer une colonne</translation>
+        <translation>Supprimer la colonne</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="138"/>
+        <location filename="../dbtree/dbtree.cpp" line="140"/>
         <source>Delete selected items</source>
         <translation>Supprimer les objets sélectionnés</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="139"/>
+        <location filename="../dbtree/dbtree.cpp" line="141"/>
         <source>Clear filter</source>
         <translation>Vider le filtre</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="140"/>
+        <location filename="../dbtree/dbtree.cpp" line="142"/>
         <source>Refresh all database schemas</source>
-        <translation>Actualiser tous les schémas de base de données</translation>
+        <translation>Actualiser tous les schémas de la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="141"/>
+        <location filename="../dbtree/dbtree.cpp" line="143"/>
         <source>Refresh selected database schema</source>
-        <translation>Actualiser les schémas de la base de données sélectionnée</translation>
+        <translation>Actualiser les schémas sélectionné de la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="142"/>
-        <location filename="../dbtree/dbtree.cpp" line="1421"/>
+        <location filename="../dbtree/dbtree.cpp" line="144"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="312"/>
-        <location filename="../dbtree/dbtree.cpp" line="317"/>
+        <location filename="../dbtree/dbtree.cpp" line="319"/>
+        <location filename="../dbtree/dbtree.cpp" line="324"/>
         <source>Database</source>
         <translation>Base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="327"/>
+        <location filename="../dbtree/dbtree.cpp" line="334"/>
         <source>Grouping</source>
         <translation>Groupement</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="937"/>
-        <location filename="../dbtree/dbtree.cpp" line="940"/>
+        <location filename="../dbtree/dbtree.cpp" line="339"/>
+        <source>Generate query for table</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
-        <translation>Créer groupe</translation>
+        <translation>Créer un groupe</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="937"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
-        <translation>Nom de groupe</translation>
+        <translation>Nom du groupe</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="940"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
-        <translation>L&rsquo;entrée nommée %1 existe déjà dans le group %2.</translation>
+        <translation>L’entrée nommée %1 existe déjà dans le groupe %2.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="958"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation>Supprimer le groupe</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="959"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
-        <translation>Etes-vous certain de supprimer le groupe %1?
+        <translation>Êtes-vous certain de supprimer le groupe %1 ?
 Tous les objets de ce groupe seront déplacés dans le groupe parent.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1019"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
+        <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
+        <source>Are you sure you want to remove following databases from the list:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
+        <source>Remove database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
+        <source>Vacuum (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Delete database</source>
-        <translation>Suppression de la base de données</translation>
+        <translation type="vanished">Suppression de la base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1019"/>
         <source>Are you sure you want to delete database &apos;%1&apos;?</source>
-        <translation>Etes-vous certain de vouloir supprimer la base de données: «&nbsp;%1&nbsp;» ?</translation>
+        <translation type="vanished">Êtes-vous certain de vouloir supprimer la base de données : « %1 » ?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1055"/>
-        <location filename="../dbtree/dbtree.cpp" line="1265"/>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
         <source>Cannot import, because no import plugin is loaded.</source>
-        <translation>Import impossible, car aucun plugin d&rsquo;import n&rsquo;est chargé.</translation>
+        <translation>Import impossible, car aucun plugin d’import n’est chargé.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1075"/>
-        <location filename="../dbtree/dbtree.cpp" line="1240"/>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
         <source>Cannot export, because no export plugin is loaded.</source>
-        <translation>Export impossible, car aucun plugin d&rsquo;import n&rsquo;est chargé.</translation>
+        <translation>Export impossible, car aucun plugin d’import n’est chargé.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1339"/>
         <source>Error while executing VACUUM on the database %1: %2</source>
-        <translation>Erreur pendant l&rsquo;exécution de VACCUM sur la base de données %1: %2</translation>
+        <translation type="vanished">Erreur pendant l’exécution de VACCUM sur la base de données %1 : %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
         <source>VACUUM execution finished successfully.</source>
-        <translation>Exécution de VACCUM terminé avec succès.</translation>
+        <translation type="vanished">Exécution de VACCUM terminé avec succès.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1358"/>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
         <source>Integrity check (%1)</source>
-        <translation>Contrôle d&rsquo;intégrité (%1)</translation>
+        <translation>Contrôle d’intégrité (%1)</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1395"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Reset autoincrement</source>
-        <translation>Remise à zéro de l&rsquo;autoincrément</translation>
+        <translation>Remise à zéro de l’auto-incrément</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1395"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
-        <translation>Etes-vous certain de vouloir réinitialiser l&rsquo;outoincrémentation de la table «&nbsp;%1&nbsp;» ?</translation>
+        <translation>Êtes-vous certain de vouloir réinitialiser l’auto-incrémentation de la table « %1 » ?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1402"/>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
-        <translation>Une erreur est survenue pendant la réinitialisation de la valeur de l&rsquo;autoincrémentation de la table «&nbsp;%1&nbsp;» : %2</translation>
+        <translation>Une erreur est survenue pendant la réinitialisation de la valeur de l’auto-incrémentation de la table « %1 » : %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1404"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>La valeur de l&rsquo;autoincrémentaion de la table %1 a été réinitialisé avec succès.</translation>
+        <translation type="vanished">La valeur de l’auto-incrémentation de la table %1 a été réinitialisé avec succès.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1421"/>
-        <source>Are you sure you want to delete all data from table «&nbsp;%1&nbsp;» ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dbtree/dbtree.cpp" line="1429"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1433"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1535"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
-        <translation>Les objets suivant vont être supprimés: %1.</translation>
+        <translation>Les objets suivant vont être supprimés : %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1538"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
-        <translation>Les bases de données suivantes seront enlevées de la liste: %1.</translation>
+        <translation>Les bases de données suivantes seront enlevées de la liste : %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1541"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
-        <translation>Les objets restants du groupe supprimé seront déplacés où le groupe a eu l&rsquo;habitude d&rsquo;être.</translation>
+        <translation>Les objets restants du groupe supprimé seront déplacés où le groupe a eu l’habitude d’être.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1543"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
-        <translation>%1&lt;br&gt;&lt;br&gt;Etes-vous certain de vouloir continuer?</translation>
+        <translation>%1&lt;br&gt;&lt;br&gt;Êtes-vous certain de vouloir continuer ?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1545"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation>Objets supprimés</translation>
     </message>
@@ -2480,132 +2655,137 @@ Tous les objets de ce groupe seront déplacés dans le groupe parent.</translati
 <context>
     <name>DbTreeModel</name>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="422"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="423"/>
         <source>Database: %1</source>
         <comment>dbtree tooltip</comment>
-        <translation>Base de données: %1</translation>
+        <translation>Base de données : %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="427"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="428"/>
         <source>Version:</source>
         <comment>dbtree tooltip</comment>
-        <translation>Version:</translation>
+        <translation>Version :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="430"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="431"/>
         <source>File size:</source>
         <comment>dbtree tooltip</comment>
-        <translation>Taille fichier:</translation>
+        <translation>Taille fichier :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="433"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="434"/>
         <source>Encoding:</source>
         <comment>dbtree tooltip</comment>
-        <translation>Codage:</translation>
+        <translation>Codage :</translation>
     </message>
     <message>
         <source>Error details:</source>
         <comment>dbtree tooltip</comment>
-        <translation type="vanished">Détails erreur:</translation>
+        <translation type="vanished">Détails de l’erreur :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="438"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="439"/>
         <source>Error:</source>
         <comment>dbtree tooltip</comment>
-        <translation type="unfinished"></translation>
+        <translation>Erreur :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="448"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="449"/>
         <source>Table : %1</source>
         <comment>dbtree tooltip</comment>
-        <translation>Table: %1</translation>
+        <translation>Table : %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="471"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="472"/>
         <source>Columns (%1):</source>
         <comment>dbtree tooltip</comment>
-        <translation>Colonnes:(%1):</translation>
+        <translation>Colonnes (%1):</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="474"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="475"/>
         <source>Indexes (%1):</source>
         <comment>dbtree tooltip</comment>
-        <translation>Index (%1):</translation>
+        <translation>Indexs (%1) :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="477"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="478"/>
         <source>Triggers (%1):</source>
         <comment>dbtree tooltip</comment>
-        <translation>Déclencheurs (%1):</translation>
+        <translation>Déclencheurs (%1) :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1092"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1096"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1093"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1097"/>
         <source>Move</source>
-        <translation>Déplcer</translation>
+        <translation>Déplacer</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1095"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1099"/>
         <source>Include data</source>
         <translation>Données incluses</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1096"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1100"/>
         <source>Include indexes</source>
         <translation>Index inclus</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1097"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1101"/>
         <source>Include triggers</source>
         <translation>Déclencheurs inclus</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1099"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1103"/>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1175"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1162"/>
+        <source>Could not add dropped database file &apos;%1&apos; automatically. Manual setup is necessary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1209"/>
         <source>Referenced tables</source>
         <translation>Tables référencées</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1176"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1210"/>
         <source>Do you want to include following referenced tables as well:
 %1</source>
         <translation>Vous voulez inclure des tables référencées suivantes aussi :
 %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1185"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1219"/>
         <source>Name conflict</source>
         <translation>Conflit de nom</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1186"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1220"/>
         <source>Following object already exists in the target database.
 Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</source>
-        <translation>L&rsquo;objet suivant existe déjà dans la base de données cible.
-Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;interrompre l&rsquo;opération :</translation>
+        <translation>L’objet suivant existe déjà dans la base de données cible.
+Entrez SVP un nouveau nom, unique, ou cliquez « %1 » pour d’interrompre l’opération :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1199"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1233"/>
         <source>SQL statements conversion</source>
         <translation>Conversion des déclarations SQL </translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1207"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1241"/>
         <source>Following error occurred while converting SQL statements to the target SQLite version:</source>
-        <translation>L&rsquo;erreur suivante est survenue en convertissant des déclarations de SQL de la version cible SQLite :</translation>
+        <translation>L’erreur suivante est survenue en convertissant des déclarations de SQL de la version cible SQLite :</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtreemodel.cpp" line="1208"/>
+        <location filename="../dbtree/dbtreemodel.cpp" line="1242"/>
         <source>Would you like to ignore those errors and proceed?</source>
-        <translation>Voulez-vous ignorer ces erreurs et procéder?</translation>
+        <translation>Voulez-vous ignorer ces erreurs et procéder ?</translation>
     </message>
 </context>
 <context>
@@ -2613,15 +2793,15 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/ddlhistorywindow.ui" line="35"/>
         <source>Filter by database:</source>
-        <translation>Filtre par base de données:</translation>
+        <translation>Filtre par base de données :</translation>
     </message>
     <message>
         <location filename="../windows/ddlhistorywindow.cpp" line="73"/>
         <source>-- Queries executed on database %1 (%2)
 -- Date and time of execution: %3
 %4</source>
-        <translation>-- Requête éxécutée sur la base de données %1(%2)
--- Date et heure d&rsquo;exécution: %3
+        <translation>-- Requête éxécutée sur la base de données %1 (%2)
+-- Date et heure d’exécution : %3
 %4</translation>
     </message>
     <message>
@@ -2677,7 +2857,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../windows/editorwindow.cpp" line="171"/>
         <location filename="../windows/editorwindow.cpp" line="173"/>
         <source>SQL editor %1</source>
-        <translation>Editeur SQL %1</translation>
+        <translation>Éditeur SQL %1</translation>
     </message>
     <message>
         <location filename="../windows/editorwindow.cpp" line="331"/>
@@ -2698,7 +2878,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../windows/editorwindow.cpp" line="368"/>
         <source>Clear execution history</source>
         <comment>sql editor</comment>
-        <translation>Vider l&rsquo;historique d&rsquo;exécution</translation>
+        <translation>Vider l’historique d’exécution</translation>
     </message>
     <message>
         <location filename="../windows/editorwindow.cpp" line="370"/>
@@ -2710,81 +2890,85 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../windows/editorwindow.cpp" line="372"/>
         <source>Create view from query</source>
         <comment>sql editor</comment>
-        <translation>Créer une vue à partir d&rsquo;une requête</translation>
+        <translation>Créer une vue à partir d’une requête</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation>Base de données précédente</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation>Base de données suivante</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
-        <translation>Afficher l&rsquo;onglet suivant</translation>
+        <translation>Afficher l’onglet suivant</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
-        <translation>Afficher l&rsquo;onget précédent</translation>
+        <translation>Afficher l’onget précédent</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
-        <translation>Focus sur l&rsquo;éditeur SQL ci-dessus</translation>
+        <translation>Focus sur l’éditeur SQL ci-dessus</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation>Base de données active (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
-        <translation>Requête terminée en %1 secondes. Nombre de lignes: %2</translation>
+        <translation>Requête terminée en %1 secondes. Nombre de lignes : %2</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation>Requête terminée en %1 seconde(s).</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
-        <translation>Supprimer l&rsquo;historique d&rsquo;exécution</translation>
+        <translation>Supprimer l’historique d’exécution</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
-        <translation>Etes vous certain de vouloir supprimer la totalité de l&rsquo;historique d&rsquo;exécution SQL? Aucun retour possible.</translation>
+        <translation>Êtes vous certain de vouloir supprimer la totalité de l’historique d’exécution SQL ? Aucun retour possible.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
-        <translation>Impossible d&rsquo;exporter, car aucun plugin d&rsquo;expertation n&rsquo;est chargés.</translation>
+        <translation>Impossible d’exporter, car aucun plugin d’expertation n’est chargés.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
-        <translation>Aucune base de données den sélectionnée dans l&rsquo;éditeur SQL. Impossible de créer une vue sur une base de données inconnue.</translation>
+        <translation>Aucune base de données den sélectionnée dans l’éditeur SQL. Impossible de créer une vue sur une base de données inconnue.</translation>
+    </message>
+    <message>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
         <source>Editor window &quot;%1&quot; has uncommited data.</source>
-        <translation>Fenêtre d&rsquo;éditeur &quot;%1&quot; n&rsquo;a pas enregistrer les données.</translation>
+        <translation type="vanished">Fenêtre d’éditeur &quot;%1&quot; n’a pas enregistrer les données.</translation>
     </message>
 </context>
 <context>
@@ -2797,12 +2981,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/errorsconfirmdialog.ui" line="20"/>
         <source>Following errors occured:</source>
-        <translation>Les erreurs suivantes sont arrivées:</translation>
+        <translation>Les erreurs suivantes sont arrivées :</translation>
     </message>
     <message>
         <location filename="../dialogs/errorsconfirmdialog.ui" line="34"/>
         <source>Would you like to proceed?</source>
-        <translation>Désirez-vous traiter?</translation>
+        <translation>Désirez-vous traiter ?</translation>
     </message>
 </context>
 <context>
@@ -2815,7 +2999,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="21"/>
         <source>What do you want to export?</source>
-        <translation>Que voulez-vous exporter?</translation>
+        <translation>Que voulez-vous exporter ?</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="36"/>
@@ -2825,12 +3009,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="46"/>
         <source>A single table</source>
-        <translation>une simple table</translation>
+        <translation>Une table</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="53"/>
         <source>Query results</source>
-        <translation>Résultats de requête</translation>
+        <translation>Résultats d’une requête</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="65"/>
@@ -2855,7 +3039,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="130"/>
         <source>When this option is unchecked, then only table DDL (CREATE TABLE statement) is exported.</source>
-        <translation>Lorsque cette option n&rsquo;est contrôlée, alors seulement le DDL de la table (CREATE TABLE...) est exporté.</translation>
+        <translation>Lorsque cette option n’est contrôlée, alors seulement le DDL de la table (CREATE TABLE...) est exporté.</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="133"/>
@@ -2875,7 +3059,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="175"/>
         <source>Note, that exporting table indexes and triggers may be unsupported by some output formats.</source>
-        <translation>Notez, ces index de table d&rsquo;exportation et les déclencheurs peuvent être non supportées par quelques formats de sortie.</translation>
+        <translation>NB : les index de la table d’exportation et les déclencheurs peuvent ne pas être pris en charge par certains formats d’export.</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="189"/>
@@ -2901,7 +3085,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../dialogs/exportdialog.ui" line="229"/>
         <location filename="../dialogs/exportdialog.ui" line="249"/>
         <source>Database:</source>
-        <translation>Base de données:</translation>
+        <translation>Base de données :</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="237"/>
@@ -2911,7 +3095,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="256"/>
         <source>Query to be executed for results:</source>
-        <translation>Requête à exécuter pour des résultats:</translation>
+        <translation>Requête à exécuter :</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="264"/>
@@ -2921,7 +3105,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="318"/>
         <source>Export format</source>
-        <translation>Format d&rsquo;exportation</translation>
+        <translation>Format d’exportation</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="330"/>
@@ -2931,7 +3115,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="336"/>
         <source>Exported file path</source>
-        <translation>Chemin du fichier d&rsquo;exportation</translation>
+        <translation>Chemin du fichier d’exportation</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="343"/>
@@ -2946,7 +3130,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.ui" line="382"/>
         <source>Exported text encoding:</source>
-        <translation>Texte encodé exporté:</translation>
+        <translation>Texte encodé exporté :</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.ui" line="398"/>
@@ -2956,7 +3140,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="51"/>
         <source>Cancel</source>
-        <translation>annuler</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="149"/>
@@ -2983,27 +3167,27 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="221"/>
         <source>You must provide a file name to export to.</source>
-        <translation>Vous devez fournir le nom d&rsquo;un fichier à exporter.</translation>
+        <translation>Vous devez fournir le nom d’un fichier à exporter.</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="228"/>
         <source>Path you provided is an existing directory. You cannot overwrite it.</source>
-        <translation>Le chemin fourni est un répertoire existant. Vous ne pouvez pas l&rsquo;écraser.</translation>
+        <translation>Le chemin fourni est un répertoire existant. Vous ne pouvez pas l’écraser.</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="234"/>
         <source>The directory &apos;%1&apos; does not exist.</source>
-        <translation>Le répertoire «&nbsp;%1&nbsp;» n&rsquo;existe pas.</translation>
+        <translation>Le répertoire « %1 » n’existe pas.</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="240"/>
         <source>The file &apos;%1&apos; exists and will be overwritten.</source>
-        <translation>Le fichier «&nbsp;%1&nbsp;» existe et sera écrasé.</translation>
+        <translation>Le fichier « %1 » existe et sera écrasé.</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="417"/>
         <source>All files (*)</source>
-        <translation>tous les fichiers(*)</translation>
+        <translation>Tous les fichiers(*)</translation>
     </message>
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="420"/>
@@ -3013,7 +3197,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/exportdialog.cpp" line="709"/>
         <source>Internal error during export. This is a bug. Please report it.</source>
-        <translation>Erreur interne pendant l&rsquo;exportation. c&rsquo;est un bug. SVP veuillez le reporter.</translation>
+        <translation>Erreur interne pendant l’exportation. c’est un bug. SVP veuillez le reporter.</translation>
     </message>
 </context>
 <context>
@@ -3075,13 +3259,13 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../formview.cpp" line="247"/>
         <source>Insert new row</source>
         <comment>form view</comment>
-        <translation>Insérer nouvelle ligne</translation>
+        <translation>Insérer une nouvelle ligne</translation>
     </message>
     <message>
         <location filename="../formview.cpp" line="248"/>
         <source>Delete current row</source>
         <comment>form view</comment>
-        <translation>Supprimer ligne courante</translation>
+        <translation>Supprimer la ligne courante</translation>
     </message>
 </context>
 <context>
@@ -3094,22 +3278,22 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/functionseditor.ui" line="260"/>
         <source>Function name:</source>
-        <translation>Nom fonction:</translation>
+        <translation>Nom fonction :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="273"/>
         <source>Implementation language:</source>
-        <translation>Langage:</translation>
+        <translation>Langage :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="253"/>
         <source>Type:</source>
-        <translation>Type:</translation>
+        <translation>Type :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="157"/>
         <source>Input arguments</source>
-        <translation>Entrez arguments </translation>
+        <translation>Entrez arguments</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="163"/>
@@ -3129,23 +3313,23 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/functionseditor.ui" line="218"/>
         <source>Register in following databases:</source>
-        <translation>Enregistre les bases de données suivantes:</translation>
+        <translation>Enregistre les bases de données suivantes :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="293"/>
         <source>Initialization code:</source>
-        <translation>Code d&rsquo;initialisation:</translation>
+        <translation>Code d’initialisation :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="309"/>
         <location filename="../windows/functionseditor.cpp" line="426"/>
         <source>Function implementation code:</source>
-        <translation>Fonction de code d&rsquo;implémentation:</translation>
+        <translation>Fonction de code d’implémentation :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.ui" line="325"/>
         <source>Final step implementation code:</source>
-        <translation>Etape finale de code d&rsquo;implémentaion:</translation>
+        <translation>Etape finale de code d’implémentaion :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="54"/>
@@ -3185,22 +3369,22 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/functionseditor.cpp" line="69"/>
         <source>Rename function argument</source>
-        <translation>Renomme l&rsquo;argument de la fonction</translation>
+        <translation>Renomme l’argument de la fonction</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="70"/>
         <source>Delete function argument</source>
-        <translation>Supprime l&rsquo;argument de la fonction</translation>
+        <translation>Supprime l’argument de la fonction</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="72"/>
         <source>Move function argument up</source>
-        <translation>Monte l&rsquo;argument de la fonction</translation>
+        <translation>Monte l’argument de la fonction</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="73"/>
         <source>Move function argument down</source>
-        <translation>Descend l&rsquo;argument de la fonction</translation>
+        <translation>Descend l’argument de la fonction</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="111"/>
@@ -3225,12 +3409,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/functionseditor.cpp" line="426"/>
         <source>Per step code:</source>
-        <translation>Code par étape:</translation>
+        <translation>Code par étape :</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="432"/>
         <source>Enter a non-empty implementation code.</source>
-        <translation>Saississez un code d&rsquo;implémentation non vide.</translation>
+        <translation>Saississez un code d’implémentation non vide.</translation>
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="505"/>
@@ -3240,8 +3424,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
+        <source>Functions editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Functions editor window has uncommited modifications.</source>
-        <translation>L&rsquo;éditeur de fonction n&rsquo;a pas enregistré les modifications.</translation>
+        <translation type="vanished">L’éditeur de fonction n’a pas enregistré les modifications.</translation>
     </message>
 </context>
 <context>
@@ -3284,12 +3472,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/importdialog.ui" line="182"/>
         <source>Input file:</source>
-        <translation>Fichier:</translation>
+        <translation>Fichier :</translation>
     </message>
     <message>
         <location filename="../dialogs/importdialog.ui" line="175"/>
         <source>Text encoding:</source>
-        <translation>Texte codé:</translation>
+        <translation>Texte codé :</translation>
     </message>
     <message>
         <location filename="../dialogs/importdialog.ui" line="192"/>
@@ -3324,7 +3512,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/importdialog.cpp" line="121"/>
         <source>Select import plugin.</source>
-        <translation>Sélectionnez un plugin d&rsquo;importation.</translation>
+        <translation>Sélectionnez un plugin d’importation.</translation>
     </message>
     <message>
         <location filename="../dialogs/importdialog.cpp" line="130"/>
@@ -3334,7 +3522,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/importdialog.cpp" line="137"/>
         <source>The file &apos;%1&apos; does not exist.</source>
-        <translation>Le fichier «&nbsp;%1&nbsp;» n&rsquo;existe pas.</translation>
+        <translation>Le fichier « %1 » n’existe pas.</translation>
     </message>
     <message>
         <location filename="../dialogs/importdialog.cpp" line="143"/>
@@ -3344,7 +3532,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/importdialog.cpp" line="319"/>
         <source>Pick file to import from</source>
-        <translation>Sélectionnez le fichier d&rsquo;importation</translation>
+        <translation>Sélectionnez le fichier d’importation</translation>
     </message>
 </context>
 <context>
@@ -3356,103 +3544,176 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <translation>Index</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="36"/>
+        <location filename="../dialogs/indexdialog.ui" line="88"/>
         <source>On table:</source>
-        <translation>De la table:</translation>
+        <translation>De la table :</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="43"/>
+        <location filename="../dialogs/indexdialog.ui" line="142"/>
         <source>Index name:</source>
-        <translation>Nom index:</translation>
+        <translation>Nom index :</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="50"/>
+        <location filename="../dialogs/indexdialog.ui" line="128"/>
         <source>Partial index condition</source>
-        <translation>Condition partielle d&rsquo;index</translation>
+        <translation>Condition partielle d’index</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="67"/>
+        <location filename="../dialogs/indexdialog.ui" line="135"/>
         <source>Unique index</source>
         <translation>Index unique</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="90"/>
+        <location filename="../dialogs/indexdialog.ui" line="70"/>
         <source>Column</source>
         <translation>Colonne</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="95"/>
+        <location filename="../dialogs/indexdialog.ui" line="75"/>
         <source>Collation</source>
         <translation>Regroupement</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="100"/>
+        <location filename="../dialogs/indexdialog.ui" line="80"/>
         <source>Sort</source>
         <translation>Tri</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.ui" line="115"/>
+        <location filename="../dialogs/indexdialog.ui" line="98"/>
+        <source>Delete selected indexed expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexdialog.ui" line="108"/>
+        <source>Moves selected index column up in the order, making it more significant in the index.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexdialog.ui" line="118"/>
+        <source>Moves selected index column down in the order, making it less significant in the index.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexdialog.ui" line="149"/>
+        <source>Edit selected indexed expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexdialog.ui" line="169"/>
+        <source>Add indexed expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexdialog.ui" line="180"/>
         <source>DDL</source>
         <translation>DDL</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="65"/>
+        <location filename="../dialogs/indexdialog.cpp" line="66"/>
         <source>Tried to open index dialog for closed or inexisting database.</source>
-        <translation>Vous tentez d&rsquo;ouvrir le dialogue de l&rsquo;index d&rsquo;une base de données fermée ou inexistante.</translation>
+        <translation>Vous tentez d’ouvrir le dialogue de l’index d’une base de données fermée ou inexistante.</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="131"/>
+        <location filename="../dialogs/indexdialog.cpp" line="149"/>
         <source>Could not process index %1 correctly. Unable to open an index dialog.</source>
-        <translation>Impossible de définir l&rsquo;index %1 correctement. Ouvrir un dialogue d&rsquo;index valide.</translation>
+        <translation>Impossible de définir l’index %1 correctement. Ouvrir un dialogue d’index valide.</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="185"/>
+        <location filename="../dialogs/indexdialog.cpp" line="206"/>
+        <source>Unique index cannot have indexed expressions. Either remove expressions from list below, or uncheck this option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexdialog.cpp" line="207"/>
         <source>Pick the table for the index.</source>
-        <translation>Sélectionnez la table pour l&rsquo;index.</translation>
+        <translation>Sélectionnez la table pour l’index.</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="186"/>
+        <location filename="../dialogs/indexdialog.cpp" line="208"/>
         <source>Select at least one column.</source>
         <translation>Selectionnez au moins une colonne.</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="187"/>
+        <location filename="../dialogs/indexdialog.cpp" line="209"/>
         <source>Enter a valid condition.</source>
         <translation>Saississez une condition valide.</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="236"/>
+        <location filename="../dialogs/indexdialog.cpp" line="276"/>
         <source>default</source>
         <comment>index dialog</comment>
         <translation>defaut</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="247"/>
+        <location filename="../dialogs/indexdialog.cpp" line="281"/>
         <source>Sort order</source>
         <comment>table constraints</comment>
-        <translation>ordre de tri</translation>
+        <translation>Ordre de tri</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="454"/>
-        <location filename="../dialogs/indexdialog.cpp" line="467"/>
+        <location filename="../dialogs/indexdialog.cpp" line="752"/>
+        <location filename="../dialogs/indexdialog.cpp" line="765"/>
         <source>Error</source>
         <comment>index dialog</comment>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="455"/>
+        <location filename="../dialogs/indexdialog.cpp" line="753"/>
         <source>Cannot create unique index, because values in selected columns are not unique. Would you like to execute SELECT query to see problematic values?</source>
-        <translation>Impossible de créer un index, car les valeurs des colonnes sélectionnées ne sont pas uniques. Voulez-vous exécuter une requête SELECT pour voir les valeurs problématiques?</translation>
+        <translation>Impossible de créer un index, car les valeurs des colonnes sélectionnées ne sont pas uniques. Voulez-vous exécuter une requête SELECT pour voir les valeurs problématiques ?</translation>
     </message>
     <message>
-        <location filename="../dialogs/indexdialog.cpp" line="467"/>
+        <location filename="../dialogs/indexdialog.cpp" line="765"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
-        <translation>Une erreur survenue à l&rsquo;exécution de l&rsquo;SQL:
+        <translation>Une erreur survenue à l’exécution de l’SQL :
 %1</translation>
     </message>
 </context>
 <context>
+    <name>IndexExprColumnDialog</name>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.ui" line="14"/>
+        <source>Indexed expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.ui" line="20"/>
+        <source>Expression to index</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.cpp" line="60"/>
+        <source>This expression is already indexed by the index.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.cpp" line="66"/>
+        <source>Column should be indexed directly, not by expression. Either extend this expression to contain something more than just column name, or abort and select this column in index dialog directly.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.cpp" line="76"/>
+        <source>Column &apos;%1&apos; does not belong to the table covered by this index. Indexed expressions can refer only to columns from the indexed table.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.cpp" line="84"/>
+        <source>It&apos;s forbidden to use &apos;SELECT&apos; statements in indexed expressions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.cpp" line="105"/>
+        <source>Enter an indexed expression.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/indexexprcolumndialog.cpp" line="119"/>
+        <source>Invalid expression.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LanguageDialog</name>
     <message>
         <location filename="../dialogs/languagedialog.ui" line="14"/>
@@ -3462,7 +3723,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/languagedialog.ui" line="20"/>
         <source>Please choose language:</source>
-        <translation>SVP choississez un langage:</translation>
+        <translation>SVP choississez un langage :</translation>
     </message>
 </context>
 <context>
@@ -3470,306 +3731,310 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../mainwindow.ui" line="81"/>
         <source>Database toolbar</source>
-        <translation>Barre d&rsquo;outils de base de données</translation>
+        <translation>Barre d’outils de base de données</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="92"/>
         <source>Structure toolbar</source>
-        <translation>Barre d&rsquo;outils de structure</translation>
+        <translation>Barre d’outils de structure</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="103"/>
         <source>Tools</source>
-        <translation>outils</translation>
+        <translation>Barre d’outils des éditeurs</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="120"/>
         <source>Window list</source>
-        <translation>liste fenêtre</translation>
+        <translation>Liste des fenêtres ouvertes</translation>
     </message>
     <message>
         <location filename="../mainwindow.ui" line="134"/>
         <source>View toolbar</source>
-        <translation>Barre d&rsquo;outils vues</translation>
+        <translation>Barre d’outils de fenêtrage</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="107"/>
+        <location filename="../mainwindow.cpp" line="108"/>
         <source>Configuration widgets</source>
         <translation>Configuration widgets</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="108"/>
+        <location filename="../mainwindow.cpp" line="109"/>
         <source>Syntax highlighting engines</source>
         <translation>Syntaxe surlignée des moteurs</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="109"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>Data editors</source>
-        <translation>Editeur s de données</translation>
+        <translation>Éditeurs de données</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="121"/>
+        <location filename="../mainwindow.cpp" line="122"/>
         <source>Running in debug mode. Press %1 or use &apos;Help / Open debug console&apos; menu entry to open the debug console.</source>
-        <translation>Passage en mode débogue. Cliquez %1 ou utilisez l&rsquo;entrée du menu «&nbsp;l&rsquo;Aide / Ouvrir la console de débogage&nbsp;».</translation>
+        <translation>Passage en mode débogue. Cliquez %1 ou utilisez l’entrée du menu « l’Aide / Ouvrir la console de débogage ».</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="123"/>
+        <location filename="../mainwindow.cpp" line="124"/>
         <source>Running in debug mode. Debug messages are printed to the standard output.</source>
         <translation>Passage en mode débogue. Les messages de débogage sont imprimés dans la sortie standard.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="213"/>
+        <location filename="../mainwindow.cpp" line="214"/>
         <source>You need to restart application to make the language change take effect.</source>
-        <translation>Vous devez relancer l&rsquo;application pour que le langage prenne effet.</translation>
+        <translation>Vous devez relancer l’application pour que le langage prenne effet.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="256"/>
+        <location filename="../mainwindow.cpp" line="257"/>
         <source>Open SQL editor</source>
-        <translation>Ouvrir éditeur SQL</translation>
+        <translation>Ouvrir l’éditeur SQL</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="257"/>
+        <location filename="../mainwindow.cpp" line="258"/>
         <source>Open DDL history</source>
-        <translation>Ouvrir Historique DDL</translation>
+        <translation>Ouvrir l’historique DDL</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="258"/>
+        <location filename="../mainwindow.cpp" line="259"/>
         <source>Open SQL functions editor</source>
-        <translation>Editeur de fonctions SQL</translation>
+        <translation>Éditeur de fonctions SQL</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="259"/>
+        <location filename="../mainwindow.cpp" line="260"/>
         <source>Open collations editor</source>
-        <translation>Ouvrir editeur de collections</translation>
+        <translation>Ouvrir l’éditeur de collections</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="260"/>
+        <location filename="../mainwindow.cpp" line="261"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="261"/>
+        <location filename="../mainwindow.cpp" line="262"/>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="263"/>
+        <location filename="../mainwindow.cpp" line="264"/>
         <source>Open configuration dialog</source>
-        <translation>Ouvrir dialogue de configuration</translation>
+        <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="265"/>
+        <location filename="../mainwindow.cpp" line="266"/>
         <source>Tile windows</source>
-        <translation>Organisation des fenêtres</translation>
+        <translation>Organisation des fenêtres en grille</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="266"/>
+        <location filename="../mainwindow.cpp" line="267"/>
         <source>Tile windows horizontally</source>
-        <translation>Organisation des fenêtres horizontalement</translation>
+        <translation>Organisation horizontale des fenêtres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="267"/>
+        <location filename="../mainwindow.cpp" line="268"/>
         <source>Tile windows vertically</source>
-        <translation>Organisation des fenêtres verticalement</translation>
+        <translation>Organisation verticale des fenêtres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="268"/>
+        <location filename="../mainwindow.cpp" line="269"/>
         <source>Cascade windows</source>
         <translation>Organisation des fenêtres en cascade</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="269"/>
+        <location filename="../mainwindow.cpp" line="270"/>
         <source>Next window</source>
         <translation>Fenêtre suivante</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="270"/>
+        <location filename="../mainwindow.cpp" line="271"/>
         <source>Previous window</source>
         <translation>Fenêtre précédante</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="271"/>
+        <location filename="../mainwindow.cpp" line="272"/>
         <source>Hide status field</source>
-        <translation>Ca</translation>
+        <translation>Cacher le champ d’état</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="273"/>
+        <location filename="../mainwindow.cpp" line="274"/>
         <source>Close selected window</source>
-        <translation>Fermeture fenêtre sélectionnée</translation>
+        <translation>Fermer la fenêtre sélectionnée</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="274"/>
+        <location filename="../mainwindow.cpp" line="275"/>
         <source>Close all windows but selected</source>
-        <translation>Fermeture de toutes les fenêtres sélectionnées</translation>
+        <translation>Fermer toutes les fenêtres sélectionnées</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="275"/>
+        <location filename="../mainwindow.cpp" line="276"/>
         <source>Close all windows</source>
-        <translation>Fermeture de toutes les fenêtres</translation>
+        <translation>Fermer toutes les fenêtres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="276"/>
+        <location filename="../mainwindow.cpp" line="277"/>
         <source>Restore recently closed window</source>
-        <translation>Restaure une fenêtre récemment fermée</translation>
+        <translation>Restaurer la dernière fenêtre fermée</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="277"/>
+        <location filename="../mainwindow.cpp" line="278"/>
         <source>Rename selected window</source>
-        <translation>Renomme la fenêtre sélectionnée</translation>
+        <translation>Renommer la fenêtre sélectionnée</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="279"/>
+        <location filename="../mainwindow.cpp" line="280"/>
         <source>Open Debug Console</source>
         <translation>Ouvrir la console de debogage</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="280"/>
+        <location filename="../mainwindow.cpp" line="281"/>
         <source>Open CSS Console</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ouvrir la console CSS</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="281"/>
+        <location filename="../mainwindow.cpp" line="282"/>
         <source>Report a bug</source>
-        <translation>Rapport de bug</translation>
+        <translation>Rapporter un bogue</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="282"/>
+        <location filename="../mainwindow.cpp" line="283"/>
         <source>Propose a new feature</source>
-        <translation>Proposer une nouvelle fonction</translation>
+        <translation>Proposer une fonctionnalité</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="283"/>
+        <location filename="../mainwindow.cpp" line="284"/>
         <source>About</source>
         <translation>À propos de…</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="284"/>
+        <location filename="../mainwindow.cpp" line="285"/>
         <source>Licenses</source>
         <translation>Licences</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="285"/>
+        <location filename="../mainwindow.cpp" line="286"/>
         <source>Open home page</source>
-        <translation>Ouvrir la home page</translation>
+        <translation>Page d’accueil web</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="286"/>
+        <location filename="../mainwindow.cpp" line="287"/>
         <source>Open forum page</source>
-        <translation>Ouvrir la page des forums</translation>
+        <translation>Forum d’aide</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="287"/>
+        <location filename="../mainwindow.cpp" line="288"/>
         <source>User Manual</source>
-        <translation>Manuel utilisateurs</translation>
+        <translation>Manuel utilisateurs en ligne</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="288"/>
+        <location filename="../mainwindow.cpp" line="289"/>
         <source>SQLite documentation</source>
-        <translation>Documentation SQLite</translation>
+        <translation>Documentation en ligne de SQLite</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="289"/>
+        <location filename="../mainwindow.cpp" line="290"/>
         <source>Report history</source>
-        <translation>Rapport d&rsquo;historique</translation>
+        <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="291"/>
+        <location filename="../mainwindow.cpp" line="292"/>
         <source>Check for updates</source>
-        <translation>Vérification de mises à jour</translation>
+        <translation>Vérifier les mises à jour</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="329"/>
+        <location filename="../mainwindow.cpp" line="330"/>
         <source>Database</source>
         <comment>menubar</comment>
         <translation>Base de données</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="349"/>
+        <location filename="../mainwindow.cpp" line="350"/>
         <source>Structure</source>
         <comment>menubar</comment>
         <translation>Structure</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="370"/>
+        <location filename="../mainwindow.cpp" line="371"/>
         <source>View</source>
         <comment>menubar</comment>
         <translation>Vue</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="374"/>
+        <location filename="../mainwindow.cpp" line="375"/>
         <source>Window list</source>
         <comment>menubar view menu</comment>
-        <translation>Liste de fenêtres</translation>
+        <translation>Liste des fenêtres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="395"/>
+        <location filename="../mainwindow.cpp" line="396"/>
         <source>Tools</source>
         <comment>menubar</comment>
         <translation>Outils</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="409"/>
+        <location filename="../mainwindow.cpp" line="410"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="571"/>
+        <location filename="../mainwindow.cpp" line="572"/>
         <source>Could not set style: %1</source>
         <comment>main window</comment>
-        <translation>Impossible de positionner le style: %1</translation>
+        <translation>Impossible de positionner le style : %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="644"/>
+        <location filename="../mainwindow.cpp" line="669"/>
         <source>Cannot export, because no export plugin is loaded.</source>
-        <translation>Exportation impossible, aucun plugin d&rsquo;exportation n&rsquo;est chargé.</translation>
+        <translation>Exportation impossible, aucun plugin d’exportation n’est chargé.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="660"/>
+        <location filename="../mainwindow.cpp" line="685"/>
         <source>Cannot import, because no import plugin is loaded.</source>
-        <translation>Importation impossible, aucun plugin d&rsquo;importation n&rsquo;est chargé.</translation>
+        <translation>Importation impossible, aucun plugin d’importation n’est chargé.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="693"/>
+        <location filename="../mainwindow.cpp" line="718"/>
         <source>Rename window</source>
         <translation>Renommer la fenêtre</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="693"/>
+        <location filename="../mainwindow.cpp" line="718"/>
         <source>Enter new name for the window:</source>
-        <translation>Saississez un nouveau nom de fenêtre:</translation>
+        <translation>Saississez un nouveau nom de fenêtre :</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="779"/>
+        <location filename="../mainwindow.cpp" line="804"/>
         <source>New updates are available. &lt;a href=&quot;%1&quot;&gt;Click here for details&lt;/a&gt;.</source>
         <translation>Une nouvelle mise à jour est disponible. &lt;a href=&quot;%1&quot;&gt; cliquez ici pour détails&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="787"/>
+        <location filename="../mainwindow.cpp" line="812"/>
         <source>You&apos;re running the most recent version. No updates are available.</source>
         <translation>Vous utilisez la dernière version. Aucune mise à jour de disponible.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="904"/>
+        <location filename="../mainwindow.cpp" line="929"/>
         <source>Database passed in command line parameters (%1) was already on the list under name: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="911"/>
+        <location filename="../mainwindow.cpp" line="936"/>
         <source>Database passed in command line parameters (%1) has been temporarily added to the list under name: %2</source>
-        <translation>La base de données passée en paramètre dans la ligne de commande (%1)a été temporaire ajoutée à la liste sous le nom: %2</translation>
+        <translation>La base de données passée en paramètre dans la ligne de commande (%1)a été temporaire ajoutée à la liste sous le nom : %2</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="916"/>
+        <location filename="../mainwindow.cpp" line="941"/>
         <source>Could not add database %1 to list.</source>
-        <translation>Impossible d&rsquo;ajouter la base de données %1 à la liste.</translation>
+        <translation>Impossible d’ajouter la base de données %1 à la liste.</translation>
     </message>
 </context>
 <context>
     <name>MdiWindow</name>
     <message>
-        <location filename="../mdiwindow.cpp" line="199"/>
         <source>Uncommited changes</source>
-        <translation>Modification non enregistrées</translation>
+        <translation type="vanished">Modification non enregistrées</translation>
+    </message>
+    <message>
+        <location filename="../mdiwindow.cpp" line="199"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdiwindow.cpp" line="204"/>
@@ -3793,12 +4058,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../multieditor/multieditor.cpp" line="77"/>
         <source>Configure editors for this data type</source>
-        <translation>Configurer l&rsquo;éditeur pour ce type de données</translation>
+        <translation>Configurer l’éditeur pour ce type de données</translation>
     </message>
     <message>
         <location filename="../multieditor/multieditor.cpp" line="287"/>
         <source>Data editor plugin &apos;%1&apos; not loaded, while it is defined for editing &apos;%1&apos; data type.</source>
-        <translation>Plugin d&quot;éditeur de données «&nbsp;%1&nbsp;» non chargé, ausii il n&rsquo;ai pas défini pourle type de données «&nbsp;%1&nbsp;».</translation>
+        <translation>Plugin d&quot;éditeur de données « %1 » non chargé, ausii il n’ai pas défini pour le type de données « %1 ».</translation>
     </message>
     <message>
         <location filename="../multieditor/multieditor.cpp" line="372"/>
@@ -3826,7 +4091,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../multieditor/multieditordate.cpp" line="14"/>
         <source>Date</source>
-        <translation>Datee</translation>
+        <translation>Date</translation>
     </message>
 </context>
 <context>
@@ -3834,7 +4099,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../multieditor/multieditordatetime.cpp" line="181"/>
         <source>Date &amp; time</source>
-        <translation>Heure &amp; date</translation>
+        <translation>date &amp; heure</translation>
     </message>
 </context>
 <context>
@@ -3889,12 +4154,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../multieditor/multieditortext.cpp" line="111"/>
         <source>Undo</source>
-        <translation>Défaire</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../multieditor/multieditortext.cpp" line="112"/>
         <source>Redo</source>
-        <translation>refaire</translation>
+        <translation>Rétablir</translation>
     </message>
 </context>
 <context>
@@ -3917,14 +4182,14 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../dialogs/newconstraintdialog.cpp" line="97"/>
         <source>Primary Key</source>
         <comment>new constraint dialog</comment>
-        <translation>Clé primaire</translation>
+        <translation>Clef primaire</translation>
     </message>
     <message>
         <location filename="../dialogs/newconstraintdialog.cpp" line="89"/>
         <location filename="../dialogs/newconstraintdialog.cpp" line="99"/>
         <source>Foreign Key</source>
         <comment>new constraint dialog</comment>
-        <translation>Clé étrangère</translation>
+        <translation>Clef étrangère</translation>
     </message>
     <message>
         <location filename="../dialogs/newconstraintdialog.cpp" line="91"/>
@@ -3969,7 +4234,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/newversiondialog.ui" line="26"/>
         <source>New updates are available!</source>
-        <translation>Les nouvelles mises à jours sont valides!</translation>
+        <translation>Les nouvelles mises à jours sont valides !</translation>
     </message>
     <message>
         <location filename="../dialogs/newversiondialog.ui" line="70"/>
@@ -3994,12 +4259,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/newversiondialog.ui" line="101"/>
         <source>Update to new version!</source>
-        <translation>Mettre à jour la nouvelle version!</translation>
+        <translation>Mettre à jour la nouvelle version !</translation>
     </message>
     <message>
         <location filename="../dialogs/newversiondialog.ui" line="114"/>
         <source>The update will be automatically downloaded and installed. This will also restart application at the end.</source>
-        <translation>La mise à jour sera automatiquement téléchargée et installée. Un redémarrage de l&rsquo;application sera aussi effectué à la fin.</translation>
+        <translation>La mise à jour sera automatiquement téléchargée et installée. Un redémarrage de l’application sera aussi effectué à la fin.</translation>
     </message>
     <message>
         <location filename="../dialogs/newversiondialog.ui" line="121"/>
@@ -4050,7 +4315,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../dialogs/populatedialog.ui" line="102"/>
         <source>Number of rows to populate:</source>
-        <translation>Nombre de lignes à peupler:</translation>
+        <translation>Nombre de lignes à peupler :</translation>
     </message>
     <message>
         <location filename="../dialogs/populatedialog.cpp" line="42"/>
@@ -4094,17 +4359,17 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="67"/>
         <source>Cannot edit columns that are result of compound %1 statements (one that includes %2, %3 or %4 keywords).</source>
-        <translation>impossible d&rsquo;éditer les colonnes qui ont le résultat composé des déclarations %1 (inclus %2, %3 ou %4 mots-clés).</translation>
+        <translation>impossible d’éditer les colonnes qui ont le résultat composé des déclarations %1 (inclus %2, %3 ou %4 mots-clefs).</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="70"/>
         <source>The query execution mechanism had problems with extracting ROWID&apos;s properly. This might be a bug in the application. You may want to report this.</source>
-        <translation>Le mécanisme d&rsquo;exécution de la requête a eu des problèmes avec l&rsquo;extraction du ROWID&rsquo;S. Ceci pourrait être un bogue de l&rsquo;application. Vous pouvez le rapporter.</translation>
+        <translation>Le mécanisme d’exécution de la requête a eu des problèmes avec l’extraction du ROWID’S. Ceci pourrait être un bogue de l’application. Vous pouvez le rapporter.</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="72"/>
         <source>Requested column is a result of SQL expression, instead of a simple column selection. Such columns cannot be edited.</source>
-        <translation>La colonne demandée est un résultat d&rsquo;expression de SQL, au lieu d&rsquo;une sélection de colonne simple. De telles colonnes ne peuvent pas être éditées.</translation>
+        <translation>La colonne demandée est un résultat d’expression de SQL, au lieu d’une sélection de colonne simple. De telles colonnes ne peuvent pas être éditées.</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="74"/>
@@ -4114,22 +4379,22 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="76"/>
         <source>Cannot edit results of query other than %1.</source>
-        <translation>Impossible d&rsquo;éditer les résultats de la requëte autrement que %1.</translation>
+        <translation>Impossible d’éditer les résultats de la requëte autrement que %1.</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="78"/>
         <source>Cannot edit columns that are result of aggregated %1 statements.</source>
-        <translation>Impossible d&rsquo;éditer les colonnes qui sont le résultat de déclarations agrégées %1.</translation>
+        <translation>Impossible d’éditer les colonnes qui sont le résultat de déclarations agrégées %1.</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="80"/>
         <source>Cannot edit columns that are result of %1 statement.</source>
-        <translation>Impossible d&rsquo;éditer les colonnesqui sont le résultat de déclaration %1.</translation>
+        <translation>Impossible d’éditer les colonnesqui sont le résultat de déclaration %1.</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="82"/>
         <source>Cannot edit columns that are result of common table expression statement (%1).</source>
-        <translation>Impossible d&rsquo;éditer les colonnes qui sont le résultat de table commune de déclaration (%1).</translation>
+        <translation>Impossible d’éditer les colonnes qui sont le résultat de table commune de déclaration (%1).</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="357"/>
@@ -4138,7 +4403,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="447"/>
         <source>on conflict: %1</source>
         <comment>data view tooltip</comment>
-        <translation>Sur conflit %1</translation>
+        <translation>Sur conflit : %1</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="377"/>
@@ -4150,136 +4415,136 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="444"/>
         <source>condition: %1</source>
         <comment>data view tooltip</comment>
-        <translation>Condition: %1</translation>
+        <translation>Condition : %1</translation>
     </message>
     <message>
         <location filename="../datagrid/sqlquerymodelcolumn.cpp" line="464"/>
         <source>collation name: %1</source>
         <comment>data view tooltip</comment>
-        <translation>Nom de collation: %1</translation>
+        <translation>Nom de collation : %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="19"/>
+        <location filename="../datagrid/sqlqueryview.h" line="20"/>
         <source>Data grid view</source>
         <translation>Vue de tableau de données</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="20"/>
+        <location filename="../datagrid/sqlqueryview.h" line="21"/>
         <source>Copy cell(s) contents to clipboard</source>
         <translation>Copie le contenu de cellule(s) dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="22"/>
+        <location filename="../datagrid/sqlqueryview.h" line="23"/>
         <source>Paste cell(s) contents from clipboard</source>
         <translation>Colle</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="24"/>
+        <location filename="../datagrid/sqlqueryview.h" line="25"/>
         <source>Set empty value to selected cell(s)</source>
         <translation>Efface le contenu de cellule(s)</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="25"/>
+        <location filename="../datagrid/sqlqueryview.h" line="26"/>
         <source>Set NULL value to selected cell(s)</source>
         <translation>Met à NULL les cellules séléctionnées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="26"/>
+        <location filename="../datagrid/sqlqueryview.h" line="27"/>
         <source>Commit changes to cell(s) contents</source>
         <translation>Enregistre les modifications de cellule(s)</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="27"/>
+        <location filename="../datagrid/sqlqueryview.h" line="28"/>
         <source>Rollback changes to cell(s) contents</source>
         <translation>Annule les modifications de cellule(s)</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="28"/>
+        <location filename="../datagrid/sqlqueryview.h" line="29"/>
         <source>Delete selected data row</source>
-        <translation>Supprimeles données de la ligne sélectionnée</translation>
+        <translation>Supprime les données de la ligne sélectionnée</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="29"/>
+        <location filename="../datagrid/sqlqueryview.h" line="30"/>
         <source>Insert new data row</source>
         <translation>Insére une nouvelle ligne de données</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.h" line="30"/>
+        <location filename="../datagrid/sqlqueryview.h" line="31"/>
         <source>Open contents of selected cell in a separate editor</source>
         <translation>Contenu ouvert de cellule choisie dans un éditeur séparé</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="573"/>
+        <location filename="../dataview.cpp" line="590"/>
         <source>Total pages available: %1</source>
-        <translation>Total de pages: %1</translation>
+        <translation>Nombre de pages disponibles : %1</translation>
     </message>
     <message>
-        <location filename="../dataview.cpp" line="583"/>
+        <location filename="../dataview.cpp" line="600"/>
         <source>Total rows loaded: %1</source>
-        <translation>Total dee lignes chargées: %1</translation>
+        <translation>Nombre de lignes chargées : %1</translation>
     </message>
     <message>
-        <location filename="../dataview.h" line="18"/>
+        <location filename="../dataview.h" line="19"/>
         <source>Data view (both grid and form)</source>
-        <translation>Vue de données (tableau et formulaire)</translation>
+        <translation>Vue des données (tableau et formulaire)</translation>
     </message>
     <message>
-        <location filename="../dataview.h" line="19"/>
+        <location filename="../dataview.h" line="20"/>
         <source>Refresh data</source>
         <translation>Actualisation des données</translation>
     </message>
     <message>
-        <location filename="../dataview.h" line="20"/>
+        <location filename="../dataview.h" line="21"/>
         <source>Switch to grid view of the data</source>
-        <translation>Basculer sur la vue tableau de données</translation>
+        <translation>Basculer sur la vue des données en table</translation>
     </message>
     <message>
-        <location filename="../dataview.h" line="21"/>
+        <location filename="../dataview.h" line="22"/>
         <source>Switch to form view of the data</source>
-        <translation>Basculer sur la vue formulaire de données</translation>
+        <translation>Basculer sur la vue des données en formulaire</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="26"/>
+        <location filename="../dbtree/dbtree.h" line="27"/>
         <source>Database list</source>
         <translation>Liste de bases de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="27"/>
+        <location filename="../dbtree/dbtree.h" line="28"/>
         <source>Delete selected item</source>
-        <translation>Suppression de l&rsquo;item sélectionné</translation>
+        <translation>Suppression de l’item sélectionné</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="28"/>
+        <location filename="../dbtree/dbtree.h" line="29"/>
         <source>Clear filter contents</source>
         <translation>Effacer le contenu du filtre</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="29"/>
+        <location filename="../dbtree/dbtree.h" line="30"/>
         <source>Refresh schema</source>
         <translation>Actualiser le schéma</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="30"/>
+        <location filename="../dbtree/dbtree.h" line="31"/>
         <source>Refresh all schemas</source>
         <translation>Actualiser tous les schémas</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="31"/>
+        <location filename="../dbtree/dbtree.h" line="32"/>
         <source>Add database</source>
-        <translation>Ajouter une base de donnés</translation>
+        <translation>Ajouter une base de données</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="32"/>
+        <location filename="../dbtree/dbtree.h" line="33"/>
         <source>Select all items</source>
-        <translation>Séléctionner tous les items</translation>
+        <translation>Séléctionner tous les éléments</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="33"/>
+        <location filename="../dbtree/dbtree.h" line="34"/>
         <source>Copy selected item(s)</source>
-        <translation>Copie d&rsquo;item(s) sélectionné(s)</translation>
+        <translation>Copie d’item(s) sélectionné(s)</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.h" line="34"/>
+        <location filename="../dbtree/dbtree.h" line="35"/>
         <location filename="../multieditor/multieditortext.h" line="15"/>
         <location filename="../sqleditor.h" line="25"/>
         <source>Paste from clipboard</source>
@@ -4363,7 +4628,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../mainwindow.h" line="44"/>
         <source>Open SQL editor</source>
-        <translation>Ouvrir l&rsquo;éditeur SQL</translation>
+        <translation>Ouvrir l’éditeur SQL</translation>
     </message>
     <message>
         <location filename="../mainwindow.h" line="45"/>
@@ -4378,12 +4643,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../mainwindow.h" line="47"/>
         <source>Hide status area</source>
-        <translation>Cacher la barre de status</translation>
+        <translation>Cacher la barre d’état</translation>
     </message>
     <message>
         <location filename="../mainwindow.h" line="48"/>
         <source>Open configuration dialog</source>
-        <translation>Ouvrir le dialogue de configuration</translation>
+        <translation>Préférences</translation>
     </message>
     <message>
         <location filename="../mainwindow.h" line="49"/>
@@ -4393,12 +4658,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../mainwindow.h" line="50"/>
         <source>Open CSS Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Ouvrir la console CSS</translation>
     </message>
     <message>
         <location filename="../multieditor/multieditortext.h" line="12"/>
         <source>Cell text value editor</source>
-        <translation>Editeur de texte de cellule</translation>
+        <translation>Éditeur de cellule</translation>
     </message>
     <message>
         <location filename="../multieditor/multieditortext.h" line="13"/>
@@ -4422,23 +4687,23 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <location filename="../multieditor/multieditortext.h" line="17"/>
         <location filename="../sqleditor.h" line="28"/>
         <source>Undo</source>
-        <translation>Défaire</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../multieditor/multieditortext.h" line="18"/>
         <location filename="../sqleditor.h" line="29"/>
         <source>Redo</source>
-        <translation>Refaire</translation>
+        <translation>Rétablir</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="22"/>
         <source>SQL editor input field</source>
-        <translation>Editeur SQL saisie de champ</translation>
+        <translation>Éditeur SQL saisie de champ</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="27"/>
         <source>Select whole editor contents</source>
-        <translation>Sélectionnez le contenu entier de l&rsquo;éditeur</translation>
+        <translation>Sélectionnez le contenu entier de l’éditeur</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="30"/>
@@ -4448,7 +4713,7 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../sqleditor.h" line="31"/>
         <source>Load contents from a file</source>
-        <translation>Charger le contenu d&rsquo;un fichier</translation>
+        <translation>Charger le contenu d’un fichier</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="32"/>
@@ -4458,12 +4723,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../sqleditor.h" line="33"/>
         <source>Find next</source>
-        <translation>Recherche suivante</translation>
+        <translation>Occurence suivante</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="34"/>
         <source>Find previous</source>
-        <translation>Recherche précédente</translation>
+        <translation>Occurence précédente</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="35"/>
@@ -4488,27 +4753,32 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../sqleditor.h" line="39"/>
         <source>Move selected block of text one line down</source>
-        <translation>Déplacer le block de texte sélectionné à la ligne inférieure</translation>
+        <translation>Déplacer le bloc de texte sélectionné à la ligne inférieure</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="40"/>
         <source>Move selected block of text one line up</source>
-        <translation>Déplacer le block de texte sélectionné à la ligne supérieure</translation>
+        <translation>Déplacer le bloc de texte sélectionné à la ligne supérieure</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="41"/>
         <source>Copy selected block of text and paste it a line below</source>
-        <translation>Copier le block de texte sélectionné à la ligne au dessus</translation>
+        <translation>Copier le bloc de texte sélectionné à la ligne au-dessus</translation>
     </message>
     <message>
         <location filename="../sqleditor.h" line="42"/>
         <source>Copy selected block of text and paste it a line above</source>
-        <translation>Copier le block de texte sélectionné à la ligne au dessous</translation>
+        <translation>Copier le bloc de texte sélectionné à la ligne au-dessous</translation>
+    </message>
+    <message>
+        <location filename="../sqleditor.h" line="43"/>
+        <source>Toggle comment</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../uiutils.cpp" line="32"/>
         <source>All SQLite databases</source>
-        <translation>Tius les bases de données SQLite</translation>
+        <translation>Toutes les bases de données SQLite</translation>
     </message>
     <message>
         <location filename="../uiutils.cpp" line="35"/>
@@ -4524,17 +4794,17 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/bugreporthistorywindow.h" line="11"/>
         <source>Reports history window</source>
-        <translation>Fenêtre d&rsquo;historique</translation>
+        <translation>Fenêtre d’historique</translation>
     </message>
     <message>
         <location filename="../windows/bugreporthistorywindow.h" line="12"/>
         <source>Delete selected entry</source>
-        <translation>Effacer l&rsquo;entrée sélectionnée</translation>
+        <translation>Effacer l’entrée sélectionnée</translation>
     </message>
     <message>
         <location filename="../windows/editorwindow.h" line="26"/>
         <source>SQL editor window</source>
-        <translation>Fenêtre de l&rsquo;éditeur SQL</translation>
+        <translation>Fenêtre de l’éditeur SQL</translation>
     </message>
     <message>
         <location filename="../windows/editorwindow.h" line="27"/>
@@ -4559,12 +4829,12 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/editorwindow.h" line="31"/>
         <source>Go to next editor tab</source>
-        <translation>Aller à l&rsquo;onglet d&rsquo;éditeur suivant</translation>
+        <translation>Aller à l’onglet d’éditeur suivant</translation>
     </message>
     <message>
         <location filename="../windows/editorwindow.h" line="32"/>
         <source>Go to previous editor tab</source>
-        <translation>Aller à l&rsquo;onglet d&rsquo;éditeur précédent</translation>
+        <translation>Aller à l’onglet d’éditeur précédent</translation>
     </message>
     <message>
         <location filename="../windows/editorwindow.h" line="33"/>
@@ -4577,109 +4847,109 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
         <translation>Déplacement au-dessous du focus des résultats de vue par les touches</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="30"/>
+        <location filename="../windows/tablewindow.h" line="31"/>
         <source>Table window</source>
         <translation>Fenêtre de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="31"/>
+        <location filename="../windows/tablewindow.h" line="32"/>
         <source>Refresh table structure</source>
         <translation>Actualiser la structure de la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="32"/>
+        <location filename="../windows/tablewindow.h" line="33"/>
         <source>Add new column</source>
-        <translation>Ajout nouvelle colonne</translation>
+        <translation>Ajouter une nouvelle colonne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="33"/>
+        <location filename="../windows/tablewindow.h" line="34"/>
         <source>Edit selected column</source>
         <translation>Modifier la colonne sélectionnée</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="34"/>
+        <location filename="../windows/tablewindow.h" line="35"/>
         <source>Delete selected column</source>
         <translation>Supprime la colonne sélectionnée</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="35"/>
+        <location filename="../windows/tablewindow.h" line="36"/>
         <source>Export table data</source>
         <translation>Exporte les données de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="36"/>
+        <location filename="../windows/tablewindow.h" line="37"/>
         <source>Import data to the table</source>
         <translation>Importe les données de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="37"/>
+        <location filename="../windows/tablewindow.h" line="38"/>
         <source>Add new table constraint</source>
         <translation>Ajoute une nouvelle contrainte à la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="38"/>
+        <location filename="../windows/tablewindow.h" line="39"/>
         <source>Edit selected table constraint</source>
         <translation>Modifie la contrainte de la table sélectionnée</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="39"/>
+        <location filename="../windows/tablewindow.h" line="40"/>
         <source>Delete selected table constraint</source>
         <translation>Supprime la contrainte de la table sélectionnée</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="40"/>
+        <location filename="../windows/tablewindow.h" line="41"/>
         <source>Refresh table index list</source>
-        <translation>Actualise la liste des index de table</translation>
+        <translation>Actualise la liste des index de la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="41"/>
+        <location filename="../windows/tablewindow.h" line="42"/>
         <source>Add new index</source>
         <translation>Ajoute un nouvel index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="42"/>
+        <location filename="../windows/tablewindow.h" line="43"/>
         <source>Edit selected index</source>
-        <translation>Modifie l&rsquo;index sélectionné</translation>
+        <translation>Modifie l’index sélectionné</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="43"/>
+        <location filename="../windows/tablewindow.h" line="44"/>
         <source>Delete selected index</source>
-        <translation>Supprime l&rsquo;index sélectionné</translation>
+        <translation>Supprime l’index sélectionné</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="44"/>
+        <location filename="../windows/tablewindow.h" line="45"/>
         <source>Refresh table trigger list</source>
         <translation>Actualise la liste des déclencheurs de la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="45"/>
+        <location filename="../windows/tablewindow.h" line="46"/>
         <location filename="../windows/viewwindow.h" line="25"/>
         <source>Add new trigger</source>
         <translation>Ajoute un nouveau déclencheur</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="46"/>
+        <location filename="../windows/tablewindow.h" line="47"/>
         <location filename="../windows/viewwindow.h" line="26"/>
         <source>Edit selected trigger</source>
         <translation>Modifie le déclencheur sélectionné</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="47"/>
+        <location filename="../windows/tablewindow.h" line="48"/>
         <location filename="../windows/viewwindow.h" line="27"/>
         <source>Delete selected trigger</source>
         <translation>Supprime le déclencheur sélectionné</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="48"/>
+        <location filename="../windows/tablewindow.h" line="49"/>
         <location filename="../windows/viewwindow.h" line="28"/>
         <source>Go to next tab</source>
-        <translation>Aller à l&rsquo;onglet suivant</translation>
+        <translation>Aller à l’onglet suivant</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.h" line="49"/>
+        <location filename="../windows/tablewindow.h" line="50"/>
         <location filename="../windows/viewwindow.h" line="29"/>
         <source>Go to previous tab</source>
-        <translation>Aller à l&rsquo;onglet précédent</translation>
+        <translation>Aller à l’onglet précédent</translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.h" line="23"/>
@@ -4689,22 +4959,26 @@ Entrez SVP un nouveau nom, unique, ou cliquez «&nbsp;%1&nbsp;» pour d&rsquo;in
     <message>
         <location filename="../windows/viewwindow.h" line="24"/>
         <source>Refresh view trigger list</source>
-        <translation>Actualise l&rsquo;affichage de la liste des déclencheur</translation>
+        <translation>Actualise l’affichage de la liste des déclencheurs</translation>
     </message>
 </context>
 <context>
     <name>QuitConfirmDialog</name>
     <message>
-        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
         <source>Uncommited changes</source>
-        <translation>modifications non enregistrées</translation>
+        <translation type="vanished">modifications non enregistrées</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="20"/>
         <source>Are you sure you want to quit the application?
 
 Following items are pending:</source>
-        <translation>Confirmez la fermeture de l&rsquo;application:</translation>
+        <translation>Confirmez la fermeture de l’application ?</translation>
     </message>
 </context>
 <context>
@@ -4717,12 +4991,12 @@ Following items are pending:</source>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="23"/>
         <source>Find:</source>
-        <translation>Trouvé:</translation>
+        <translation>Trouvé :</translation>
     </message>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="36"/>
         <source>Case sensitive</source>
-        <translation>Case sensiible</translation>
+        <translation>Sensible à la casse</translation>
     </message>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="43"/>
@@ -4732,7 +5006,7 @@ Following items are pending:</source>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="50"/>
         <source>Regular expression matching</source>
-        <translation>Correspondance d&rsquo;expression régulière</translation>
+        <translation>Correspondance d’expression régulière</translation>
     </message>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="60"/>
@@ -4744,7 +5018,7 @@ recherche suivant</translation>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="78"/>
         <source>Replace with:</source>
-        <translation>Remplacer par:</translation>
+        <translation>Remplacer par :</translation>
     </message>
     <message>
         <location filename="../dialogs/searchtextdialog.ui" line="91"/>
@@ -4795,173 +5069,179 @@ recherche suivant</translation>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation>Couper</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
-        <translation>Défaire</translation>
+        <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
-        <translation>Refaire</translation>
+        <translation>Rétablir</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation>Complet</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation>Format SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation>Enregistrer le SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation>Charger le SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation>Ligne suppimée</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
-        <translation>Descendre le block</translation>
+        <translation>Descendre le bloc</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
-        <translation>Monter le block</translation>
+        <translation>Monter le bloc</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
-        <translation>Copier block au-dessus</translation>
+        <translation>Copier bloc au-dessus</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
-        <translation>Copier block au-dessous</translation>
+        <translation>Copier bloc au-dessous</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation>Chercher</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation>Chercher suivant</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation>Chercher précédent</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation>Remplacer</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="255"/>
+        <location filename="../sqleditor.cpp" line="143"/>
+        <source>Toggle comment</source>
+        <comment>sql editor</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="434"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
-        <translation>L&rsquo;achèvement de syntaxe peut être utilisé seulement quand une base de données valable est utilisée dans l&rsquo;éditeur SQL.</translation>
+        <translation>L’achèvement de syntaxe peut être utilisé seulement quand une base de données valable est utilisée dans l’éditeur SQL.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="822"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
-        <translation>Le contenu l&rsquo;éditeur SQL est important, aussi la détectiond&rsquo;objets en erreur est temporairement mise hors de service.</translation>
+        <translation>Le contenu l’éditeur SQL est important, aussi la détectiond’objets en erreur est temporairement mise hors de service.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1057"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="245"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
-        <translation>Impossible d&rsquo;ouvrir en écriture le fichier «&nbsp;%1&nbsp;» : %2</translation>
+        <translation>Impossible d’ouvrir en écriture le fichier « %1 » : %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1069"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
-        <translation>Scripts SQL (*.sql);;tous fichiers (*)</translation>
+        <translation>Scripts SQL (*.sql);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1070"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation>Fichier ouvert</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1079"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
-        <translation>Impossible d&rsquo;ouvrir en lecture le fichier «&nbsp;%1&nbsp;» : %2</translation>
+        <translation>Impossible d’ouvrir en lecture le fichier « %1 » : %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1288"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation>Fin de document atteint. Saississez de nouveau la recherche pour relancer la recherche.</translation>
     </message>
@@ -4969,213 +5249,272 @@ recherche suivant</translation>
 <context>
     <name>SqlQueryItem</name>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="251"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="252"/>
         <source>Column:</source>
         <comment>data view tooltip</comment>
-        <translation>Colonne:</translation>
+        <translation>Colonne :</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="252"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="253"/>
         <source>Data type:</source>
         <comment>data view</comment>
-        <translation>Type de données:</translation>
+        <translation>Type de données :</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="255"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="256"/>
         <source>Table:</source>
         <comment>data view tooltip</comment>
-        <translation>Table:</translation>
+        <translation>Table :</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="285"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="286"/>
         <source>Constraints:</source>
         <comment>data view tooltip</comment>
-        <translation>Contrainte:</translation>
+        <translation>Contrainte :</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="398"/>
         <source>This cell is not editable, because: %1</source>
-        <translation>Cette cellule n&rsquo;est pas modifiable: %1</translation>
+        <translation type="vanished">Cette cellule n’est pas modifiable : %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="415"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
-        <translation>Impossible de charger les données pour une cellule référantà une base de données fermée.</translation>
+        <translation>Impossible de charger les données pour une cellule référant à une base de données fermée.</translation>
     </message>
 </context>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="41"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="47"/>
         <source>Cannot edit this cell. Details: %2</source>
-        <translation>impossible de modifier cette cellule. détails: %2</translation>
+        <translation type="vanished">Impossible de modifier cette cellule. Détails : %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="41"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
         <source>The row is marked for deletion.</source>
-        <translation>La ligne est marquée poureffacement.</translation>
+        <translation>La ligne est marquée pour effacement.</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished">Impossible de modifier cette cellule. Détails : %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
+        <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="63"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="487"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation>Uniquement une seule requête peut être exécutée à la fois.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="95"/>
         <source>Uncommited data</source>
-        <translation>Données non enregistrées</translation>
+        <translation type="vanished">Données non enregistrées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="96"/>
-        <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="343"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
         <source>Cannot commit the data for a cell that refers to the already closed database.</source>
-        <translation>Impossible d&rsquo;enregistrer les données pour la cell qui référe à une base de données déjà fermée.</translation>
+        <translation>Impossible d’enregistrer les données pour la celle qui référe à une base de données déjà fermée.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="374"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
         <source>Could not begin transaction on the database. Details: %1</source>
-        <translation>Impossible de lancer la transaction sur la base de données. Détails: %1</translation>
+        <translation>Impossible de lancer la transaction sur la base de données. Détails : %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="420"/>
         <source>An error occurred while commiting the transaction: %1</source>
-        <translation>Une erreur est survenuelors de l&rsquo;enregistrement de la transaction: %1</translation>
+        <translation type="vanished">Une erreur est survenuelors de l’enregistrement de la transaction : %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="445"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
         <source>An error occurred while rolling back the transaction: %1</source>
-        <translation>Une erreur est survenuelors de l&rsquo;annulation de la transaction: %1</translation>
+        <translation>Une erreur est survenuelors de l’annulation de la transaction : %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="573"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
         <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
-        <translation>Tentative d&rsquo;enregistrement d&rsquo;une une cellule qui n&rsquo;est pas modifiable! Ceci est un bogue. Rapportez-le SVP.</translation>
+        <translation>Tentative d’enregistrement d’une une cellule qui n’est pas modifiable ! Ceci est un bogue. Rapportez-le SVP.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="599"/>
         <source>An error occurred while commiting the data: %1</source>
-        <translation>Une erreur est survenuelors de l&rsquo;enregistrement des données: %1</translation>
+        <translation type="vanished">Une erreur est survenuelors de l’enregistrement des données : %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1045"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1100"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
-        <translation>Erreur pendant l&rsquo;exécution de la requête sur la base de données «&nbsp;%1&nbsp;» : %2</translation>
+        <translation>Erreur pendant l’exécution de la requête sur la base de données « %1 » : %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1097"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
-        <translation>Erreur lors du chargement des résultats de la requête: %1</translation>
+        <translation>Erreur lors du chargement des résultats de la requête : %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1452"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation>Insérer plusieurs lignes</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1452"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
-        <translation>Nombre de lignes à inserrer:</translation>
+        <translation>Nombre de lignes à inserer :</translation>
     </message>
 </context>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="72"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
+        <source>Go to referenced row in...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="73"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
-        <translation>Copier comme ...</translation>
+        <translation>Copier comme…</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="74"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="75"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
-        <translation>Coller comme ...</translation>
+        <translation>Coller comme…</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="76"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation>Valeurs NULL positionnées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="77"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation>valeurs écrasées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
-        <translation>Valeur modifiée par l&rsquo;éditeur</translation>
+        <translation>Valeur modifiée par l’éditeur</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation>Enregistrer les cellules sélectionnées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation>Annuler les modifications des cellules sélectionnées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation>Définit les colonnes triées par</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation>Enléve le tri personnalisé</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation>Insérer une ligne</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation>Insérer plusieurs lignes</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation>Supprimer les lignes sélectionnées</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="256"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
+        <source>Generate query for selected cells</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="510"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
+        <source>Go to referenced row in table &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
+        <source>table &apos;%1&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
+        <source>Referenced row (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation>Modifier la valeur</translation>
     </message>
@@ -5183,14 +5522,18 @@ recherche suivant</translation>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="74"/>
         <source>Error while commiting new row: %1</source>
-        <translation>Erreur à l&rsquo;nregistrement d&rsquo;une nouvelle ligne: %1</translation>
+        <translation type="vanished">Erreur à l’enregistrement d’une nouvelle ligne : %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="132"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
-        <translation>Erreur à la suppression d&rsquo;une ligne de la table %1: %2</translation>
+        <translation>Erreur à la suppression d’une ligne de la table %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -5198,12 +5541,12 @@ recherche suivant</translation>
     <message>
         <location filename="../statusfield.ui" line="14"/>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation>Barre d’état</translation>
     </message>
     <message>
         <location filename="../statusfield.cpp" line="164"/>
         <source>Copy</source>
-        <translation>Cipier</translation>
+        <translation>Copier</translation>
     </message>
     <message>
         <location filename="../statusfield.cpp" line="171"/>
@@ -5237,13 +5580,13 @@ recherche suivant</translation>
     <message>
         <location filename="../constraints/tableforeignkeypanel.ui" line="29"/>
         <source>Foreign table:</source>
-        <translation>Table étrangère:</translation>
+        <translation>Table étrangère :</translation>
     </message>
     <message>
         <location filename="../constraints/tableforeignkeypanel.ui" line="48"/>
         <source>SQLite 2 does not support foreign keys officially,
 but it&apos;s okay to use them anyway.</source>
-        <translation>SQLite 2 ne supporte pas officielement les clés étrangères, mais vous pouvez les utilisées tout de même.</translation>
+        <translation>SQLite 2 ne supporte pas officielement les clefs étrangères, mais vous pouvez les utilisées tout de même.</translation>
     </message>
     <message>
         <location filename="../constraints/tableforeignkeypanel.ui" line="62"/>
@@ -5273,7 +5616,7 @@ but it&apos;s okay to use them anyway.</source>
     <message>
         <location filename="../constraints/tableforeignkeypanel.ui" line="183"/>
         <source>Named constraint</source>
-        <translation>Nommer la contrainte</translation>
+        <translation>Contrainte nommée</translation>
     </message>
     <message>
         <location filename="../constraints/tableforeignkeypanel.ui" line="190"/>
@@ -5337,7 +5680,7 @@ but it&apos;s okay to use them anyway.</source>
     <message>
         <location filename="../constraints/tablepkanduniquepanel.ui" line="145"/>
         <source>Autoincrement</source>
-        <translation>Autoincrémentation</translation>
+        <translation>Auto-incrémentation</translation>
     </message>
     <message>
         <location filename="../constraints/tablepkanduniquepanel.ui" line="167"/>
@@ -5380,19 +5723,58 @@ but it&apos;s okay to use them anyway.</source>
 <context>
     <name>TableStructureModel</name>
     <message>
-        <location filename="../windows/tablestructuremodel.cpp" line="299"/>
+        <location filename="../windows/tablestructuremodel.cpp" line="301"/>
         <source>Name</source>
         <comment>table structure columns</comment>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../windows/tablestructuremodel.cpp" line="301"/>
+        <location filename="../windows/tablestructuremodel.cpp" line="303"/>
         <source>Data type</source>
         <comment>table structure columns</comment>
         <translation>Type de données</translation>
     </message>
     <message>
+        <location filename="../windows/tablestructuremodel.cpp" line="305"/>
+        <source>Primary
+Key</source>
+        <comment>table structure columns</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablestructuremodel.cpp" line="307"/>
+        <source>Foreign
+Key</source>
+        <comment>table structure columns</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablestructuremodel.cpp" line="309"/>
+        <source>Unique</source>
+        <comment>table structure columns</comment>
+        <translation type="unfinished">Unique</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablestructuremodel.cpp" line="311"/>
+        <source>Check</source>
+        <comment>table structure columns</comment>
+        <translation type="unfinished">Contrôle</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablestructuremodel.cpp" line="313"/>
+        <source>Not
+NULL</source>
+        <comment>table structure columns</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../windows/tablestructuremodel.cpp" line="315"/>
+        <source>Collate</source>
+        <comment>table structure columns</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablestructuremodel.cpp" line="317"/>
         <source>Default value</source>
         <comment>table structure columns</comment>
         <translation>Valeur par défaut</translation>
@@ -5408,10 +5790,11 @@ but it&apos;s okay to use them anyway.</source>
     <message>
         <location filename="../windows/tablewindow.ui" line="60"/>
         <source>Table name:</source>
-        <translation>Nom de la table:</translation>
+        <translation>Nom de la table :</translation>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation>Données</translation>
     </message>
@@ -5436,409 +5819,444 @@ but it&apos;s okay to use them anyway.</source>
         <translation>DDL</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="191"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation>Exporter une table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="192"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
-        <translation>Importer les données d&rsquo;une table</translation>
+        <translation>Importer les données d’une table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="193"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation>Peupler une table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="207"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation>Actualiser la structure</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="209"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
-        <translation>Enregistrer les modification de la structure</translation>
+        <translation>Enregistrer les modifications de la structure</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="210"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
-        <translation>Annuler les modification de la structure</translation>
+        <translation>Annuler les modifications de la structure</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="211"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation>Ajouter une colonne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="212"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation>Modifier une colonne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="213"/>
-        <location filename="../windows/tablewindow.cpp" line="300"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation>Supprimer une colonne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="214"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation>Monter la colonne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="215"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation>Descendre la colonne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation>Créer une table identique</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
-        <translation>Réinitialisation de l&rsquo;incrémentation</translation>
+        <translation>Réinitialisation de l’incrémentation</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="225"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation>Ajouter une contrainte de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="226"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation>Modifier la contrainte de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="227"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation>Supprimer la contrainte de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="228"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation>Monter la contrainte de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="229"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation>Descendre la contrainte de table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
-        <translation>Ajouter une clé primaire à la table</translation>
+        <translation>Ajouter une clef primaire à la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="232"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
-        <translation>Ajouter une clé étrangère à la table</translation>
+        <translation>Ajouter une clef étrangère à la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="233"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
-        <translation>Ajouter une contrainte clé unique à la table</translation>
+        <translation>Ajouter une contrainte clef unique à la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation>Ajouter une contrainte de contrôle à la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="252"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
-        <translation>Actualiser la liste d&rsquo;index</translation>
+        <translation>Actualiser la liste des index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="254"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation>Créer un index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="255"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation>Modifier un index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="256"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation>Supprimer un index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="262"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
-        <translation>Actualiser la liste d&rsquo;index</translation>
+        <translation>Actualiser la liste des déclencheurs</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation>Créer un déclencheur</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation>Modifier un déclencheur</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="266"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation>Supprimer un déclencheur</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="299"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
-        <translation>Etes-vous certain de vouloir supprimer la colonne : «&nbsp;%1&nbsp;» ?</translation>
+        <translation>Êtes-vous certain de vouloir supprimer la colonne : « %1 » ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="327"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation>Des problèmes suivants auront lieu en modifiant la table.
-Voudriez-vous procéder?</translation>
+Voudriez-vous procéder ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="329"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation>Modification de la table</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="467"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
-        <translation>Impossible de charger les données de table %1. Détails d&rsquo; erreur: %2</translation>
+        <translation>Impossible de charger les données de table %1. Détails d’ erreur : %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="580"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
-        <translation>Impossible de lancer correctement la table %1. Impossible d&rsquo;ouvrir la fenêtre de table.</translation>
+        <translation>Impossible de lancer correctement la table %1. Impossible d’ouvrir la fenêtre de table.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="635"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="641"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="648"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="657"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Could not restore window, because database %1 could not be resolved.</source>
         <translation type="vanished">Impossible de restaurer la fenêtre, car la base de données %1 ne peut ëtre résolue.</translation>
     </message>
     <message>
         <source>Could not restore window, because the table %1 doesn&apos;t exist in the database %2.</source>
-        <translation type="vanished">Impossible de restaurer la fenêtre, car la vue %1 n&rsquo;existe pas dans la base de données %2..</translation>
+        <translation type="vanished">Impossible de restaurer la fenêtre, car la vue %1 n’existe pas dans la base de données %2..</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="682"/>
-        <location filename="../windows/tablewindow.cpp" line="684"/>
+        <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation>Nouvelle table %1</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="835"/>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
-        <translation>Impossible d&rsquo;enregistrer la structure de table. Message d&rsquo;erreur: %1</translation>
+        <translation>Impossible d’enregistrer la structure de table. Message d’erreur : %1</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="857"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
-        <translation>Réinitialisation de l&rsquo;incrémentation</translation>
+        <translation>Réinitialisation de l’incrémentation</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="857"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
-        <translation>Etes-vous certain de vouloir réinitialiser l&rsquo;autoincrémentation de la table %1?</translation>
+        <translation>Êtes-vous certain de vouloir réinitialiser l’auto-incrémentation de la table %1 ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="864"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
-        <translation>Une erreur est survenue pendant la réinitialisation de la valeur de l&rsquo;autoincrémentation de la table «&nbsp;%1&nbsp;»: %2</translation>
+        <translation>Une erreur est survenue pendant la réinitialisation de la valeur de l’auto-incrémentation de la table « %1 » : %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>La valeur de l&rsquo;autoincrémentaion de la table %1 a été réinitialisé avec succès.</translation>
+        <translation type="vanished">La valeur de l’auto-incrémentaion de la table %1 a été réinitialisé avec succès.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="946"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation>Nom vide</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="946"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation>Un nom vide pour la vue dans SQLITE est admis, mais on ne le recommande pas.
 Êtes-vous sûrs que vous voulez créer une vue avec le nom vide ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="955"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation>Impossible de créer une table sans au moins une colonne.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="981"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
-        <translation>Impossible de créer la table %1, s&rsquo;il n&rsquo;y a pas de clé primaire de définie. Toute fois ne pas contrôler %2 ou définir une clé primaire.</translation>
+        <translation>Impossible de créer la table %1, s’il n’y a pas de clef primaire de définie. Toutefois ne pas contrôler %2 ou définir une clef primaire.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="988"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
-        <translation>Impossible d&rsquo;utiliser l&rsquo;autoincrémentation pour une clé primaire quand la clause %1 est utilisée. Toute fois ne pas contrôler %2, ou utiliser l&rsquo;autoincrémentation sur une clé primaire.</translation>
+        <translation>Impossible d’utiliser l’auto-incrémentation pour une clef primaire quand la clause %1 est utilisée. Toutefois ne pas contrôler %2, ou utiliser l’auto-incrémentation sur une clef primaire.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1125"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
-        <translation>Etes-vous sûr de vouloir supprimer la contrainte «&nbsp;%1&nbsp;» ?</translation>
+        <translation>Êtes-vous sûr de vouloir supprimer la contrainte « %1 » ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1126"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation>Supprimer la contrainte</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1180"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
-        <translation>Export impossible, car aucun plugin d&rsquo;import n&rsquo;est chargé.</translation>
+        <translation>Export impossible, car aucun plugin d’import n’est chargé.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1193"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
-        <translation>Import impossible, car aucun plugin d&rsquo;import n&rsquo;est chargé.</translation>
+        <translation>Import impossible, car aucun plugin d’import n’est chargé.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1225"/>
         <source>Uncommited changes</source>
-        <translation>Modification non enregistrées</translation>
+        <translation type="vanished">Modification non enregistrées</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1226"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Il ya des modifications de structure non enregistrées. Vous ne pouvez pas naviguer ou modifier des données jusqu&rsquo;à ce que vous ailliez installer la structure de table.
-Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet de structure ?</translation>
+        <translation type="vanished">Il ya des modifications de structure non enregistrées. Vous ne pouvez pas naviguer ou modifier des données jusqu’à ce que vous ailliez installer la structure de table.
+Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet de structure ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
-        <translation>Retour à l&rsquo;onglet de structure</translation>
+        <translation>Retour à l’onglet de structure</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
-        <translation>Enregistrer les modifications et naviger dans les données.</translation>
+        <translation>Enregistrer les modifications et continuer</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1379"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1380"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation>Unique</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1381"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation>Colonnes</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1382"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
-        <translation>Condition partielle d&rsquo;index</translation>
+        <translation>Condition partielle d’index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1436"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1437"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation>Événement</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1438"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation>Condition</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1439"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Details</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1528"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>La fenêtre de table &quot;%1&quot; n&rsquo;a pas enregistré les modifications de structure et de données.</translation>
+        <translation type="vanished">La fenêtre de table &quot;%1&quot; n’a pas enregistré les modifications de structure et de données.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1530"/>
         <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation>La fenêtre de table &quot;%1&quot; n&rsquo;a pas enregistrer les données.</translation>
+        <translation type="vanished">La fenêtre de table &quot;%1&quot; n’a pas enregistrer les données.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1532"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>La fenêtre de table &quot;%1&quot; n&rsquo;a pas enregistré les modifications de structure.</translation>
+        <translation type="vanished">La fenêtre de table &quot;%1&quot; n’a pas enregistré les modifications de structure.</translation>
     </message>
 </context>
 <context>
@@ -5851,7 +6269,17 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     <message>
         <location filename="../dialogs/triggercolumnsdialog.ui" line="47"/>
         <source>Triggering columns:</source>
-        <translation>Colonnes avec déclencheurs:</translation>
+        <translation>Colonnes avec déclencheurs :</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished">Tout sélectionner</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished">Tout désélectionner</translation>
     </message>
 </context>
 <context>
@@ -5865,12 +6293,12 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="30"/>
         <source>On table:</source>
-        <translation>Sur table:</translation>
+        <translation>Sur table :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="40"/>
         <source>Action:</source>
-        <translation>Action:</translation>
+        <translation>Action :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="56"/>
@@ -5881,37 +6309,37 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="59"/>
         <source>Pre-condition:</source>
-        <translation>Précondition:</translation>
+        <translation>Précondition :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="66"/>
         <source>The scope is still not fully supported by the SQLite database.</source>
-        <translation>La portée n&rsquo;est toujours pas entièrement supportée par la base de données SQLITE.</translation>
+        <translation>La portée n’est toujours pas entièrement supportée par la base de données SQLITE.</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="73"/>
         <source>Trigger name:</source>
-        <translation>Nom du déclencheur:</translation>
+        <translation>Nom du déclencheur :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="80"/>
         <source>When:</source>
-        <translation>Quand:</translation>
+        <translation>Quand :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="87"/>
         <source>List of columns for UPDATE OF action.</source>
-        <translation>Liste des colonnes pour l&rsquo;action UPDATE OF.</translation>
+        <translation>Liste des colonnes pour l’action UPDATE OF.</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="97"/>
         <source>Scope:</source>
-        <translation>Portée:</translation>
+        <translation>Portée :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="104"/>
         <source>Code:</source>
-        <translation>Code:</translation>
+        <translation>Code :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.ui" line="111"/>
@@ -5926,12 +6354,12 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     <message>
         <location filename="../dialogs/triggerdialog.cpp" line="159"/>
         <source>On view:</source>
-        <translation>Sur vue:</translation>
+        <translation>Sur vue :</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.cpp" line="183"/>
         <source>Could not process trigger %1 correctly. Unable to open a trigger dialog.</source>
-        <translation>Impossible d&rsquo;exécuter correctement le déclencheur %1. Ouverture invalide du dialogue de déclencheur.</translation>
+        <translation>Impossible d’exécuter correctement le déclencheur %1. Ouverture invalide du dialogue de déclencheur.</translation>
     </message>
     <message>
         <location filename="../dialogs/triggerdialog.cpp" line="353"/>
@@ -5944,16 +6372,16 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
         <translation>Saisissez un code de déclencheur valide.</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
-        <translation>Une erreur survenue lors de l&rsquo;exécution de l&rsquo;intruction SQL: %1</translation>
+        <translation>Une erreur survenue lors de l’exécution de l’intruction SQL : %1</translation>
     </message>
 </context>
 <context>
@@ -5966,7 +6394,7 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     <message>
         <location filename="../dialogs/versionconvertsummarydialog.ui" line="20"/>
         <source>Following changes to the SQL statements will be made:</source>
-        <translation>Des modifications suivantes aux déclarations SQL seront faits:</translation>
+        <translation>Des modifications suivantes aux déclarations SQL seront faits :</translation>
     </message>
     <message>
         <location filename="../dialogs/versionconvertsummarydialog.cpp" line="10"/>
@@ -5989,20 +6417,26 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     <message>
         <location filename="../windows/viewwindow.ui" line="60"/>
         <source>View name:</source>
-        <translation>Nom de la vue:</translation>
+        <translation>Nom de la vue :</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.ui" line="113"/>
+        <source>Output column names</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.ui" line="77"/>
+        <location filename="../windows/viewwindow.ui" line="156"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation>Données</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.ui" line="87"/>
+        <location filename="../windows/viewwindow.ui" line="166"/>
         <source>Triggers</source>
         <translation>Déclencheur</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.ui" line="119"/>
+        <location filename="../windows/viewwindow.ui" line="198"/>
         <source>DDL</source>
         <translation>DDL</translation>
     </message>
@@ -6016,194 +6450,284 @@ Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet
     </message>
     <message>
         <source>Could not restore window, because the view %1 doesn&apos;t exist in the database %2.</source>
-        <translation type="vanished">Impossible de restaurer la fenêtre, car la vue %1 n&rsquo;existe pas dans la base de données %2..</translation>
+        <translation type="vanished">Impossible de restaurer la fenêtre, car la vue %1 n’existe pas dans la base de données %2..</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="103"/>
-        <location filename="../windows/viewwindow.cpp" line="109"/>
+        <location filename="../windows/viewwindow.cpp" line="108"/>
+        <location filename="../windows/viewwindow.cpp" line="114"/>
         <source>Could not restore window &apos;%1&apos;, because no database or view was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="116"/>
+        <location filename="../windows/viewwindow.cpp" line="121"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="122"/>
+        <location filename="../windows/viewwindow.cpp" line="127"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be open.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="131"/>
+        <location filename="../windows/viewwindow.cpp" line="136"/>
         <source>Could not restore window &apos;%1&apos;, because the view %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="158"/>
+        <location filename="../windows/viewwindow.cpp" line="162"/>
+        <location filename="../windows/viewwindow.cpp" line="164"/>
         <source>New view %1</source>
         <translation>Nouvelle vue %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="283"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation>Actualisation de la vue</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="285"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation>Enregistrement des changements dans la vue</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="286"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation>Annulation des changements dans la vue</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="293"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
+        <source>Explicit column names</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <source>Generate output column names automatically basing on result columns of the view.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <source>Add column</source>
+        <comment>view window</comment>
+        <translation type="unfinished">Ajouter une colonne</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <source>Edit column</source>
+        <comment>view window</comment>
+        <translation type="unfinished">Modifier une colonne</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <source>Delete column</source>
+        <comment>view window</comment>
+        <translation type="unfinished">Supprimer une colonne</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
+        <source>Move column up</source>
+        <comment>view window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
+        <source>Move column down</source>
+        <comment>view window</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation>Actualisation de la liste des déclencheurs</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="295"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
-        <translation>Création d&rsquo;un nouveau déclencheur</translation>
+        <translation>Création d’un nouveau déclencheur</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="296"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation>Modification du déclencheur sélectionné</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="297"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation>Suppression du déclencheur sélectionné</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="361"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="363"/>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>La fenêtre de la vue &quot;%1&quot; n&rsquo;a pas enregistré les modifications de structure et de données.</translation>
+        <translation type="vanished">La fenêtre de la vue &quot;%1&quot; n’a pas enregistré les modifications de structure et de données.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>View window &quot;%1&quot; has uncommited data.</source>
-        <translation>La fenêtre de la vue &quot;%1&quot; n&rsquo;a pas enregistré les modifications de données.</translation>
+        <translation type="vanished">La fenêtre de la vue &quot;%1&quot; n’a pas enregistré les modifications de données.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="322"/>
         <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>La fenêtre de la vue &quot;%1&quot; n&rsquo;a pas enregistré les modifications de structure.</translation>
+        <translation type="vanished">La fenêtre de la vue &quot;%1&quot; n’a pas enregistré les modifications de structure.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="463"/>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
         <source>Could not load data for view %1. Error details: %2</source>
-        <translation>Impossible de charher les données de vue %1. Détails d&rsquo; erreur: %2</translation>
+        <translation>Impossible de charher les données de vue %1. Détails d’ erreur : %2</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="474"/>
         <source>Uncommited changes</source>
-        <translation>Modifications non enregistrées</translation>
+        <translation type="vanished">Modifications non enregistrées</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="475"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Des modifications de structure n&rsquo;ont pa été enregistrées.
-        Vous ne pouvez pas naviger ou éditer des données jusqu&rsquo;à ce que vous installliez la structure de vue.
-Voulez-vous enregistrer la structure, ou voulez-vous retourner à l&rsquo;onglet de structure ?</translation>
+        <translation type="vanished">Des modifications de structure n’ont pa été enregistrées.
+        Vous ne pouvez pas naviguer ou éditer des données jusqu’à ce que vous installliez la structure de vue.
+Voulez-vous enregistrer la structure, ou voulez-vous retourner à l’onglet de structure ?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="478"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Go back to structure tab</source>
-        <translation>Retour à l&rsquo;onlet de structure</translation>
+        <translation>Retour à l’onlet de structure</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="478"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Commit modifications and browse data.</source>
         <translation>Enregistrement des modifications et navigation des données.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="536"/>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
-        <translation>Impossible d&rsquo;enregistrer les modifivations de vue. Message d&rsquo;erreur: %1</translation>
+        <translation>Impossible d’enregistrer les modifications de vue. Message d’erreur : %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="614"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
+        <source>Override columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
+        <source>Currently defined columns will be overriden. Do you want to continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
+        <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="615"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
-        <translation>A la place de</translation>
+        <translation>À la place de</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="616"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation>Condition</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="617"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Détails</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="657"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
-        <translation>Impossible de lancer correctement la vue %1. Impossible d&rsquo;ouvrir la fenêtre de vue.</translation>
+        <translation>Impossible de lancer correctement la vue %1. Impossible d’ouvrir la fenêtre de vue.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="692"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
-        <translation>Nom vode</translation>
+        <translation>Nom absent</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="692"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation>Un nom vide pour la vue dans SQLITE est admis, mais on ne le recommande pas.
 Êtes-vous sûrs que vous voulez créer une vue avec le nom vide ?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="707"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
-        <translation>La déclaration SELECT ne peut être analysé. SVP corrigez la requête et réessayez.
-Details: %1</translation>
+        <translation>La déclaration SELECT ne peut être analysé. Veuillez corriger la requête et réessayer.
+Details : %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="715"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
-        <translation>La vue ne peut être modifiée a cause d&rsquo;une erreur interne de SQLiteStudio. SVP repportez l&rsquo;erreur!</translation>
+        <translation>La vue ne peut être modifiée a cause d’une erreur interne de SQLiteStudio. SVP repportez l’erreur !</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
+        <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="741"/>
-        <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&rsquo;s bug. Please report it.</source>
-        <translation>La vue ne être correctement analysée avant exécution.Cest un bug SQLiteStudion. SVP reporter le.</translation>
+        <source>The view code could not be parsed properly for execution. This is a SQLiteStudio’s bug. Please report it.</source>
+        <translation type="vanished">La vue ne peut être correctement analysée avant exécution. Cest un bug SQLiteStudio. Veuillez le signaler.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="754"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation>Des problèmes suivants auront lieu en modifiant la vue.
-Voudriez-vous procéder?</translation>
+Veulez-vous continuer ?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="756"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation>Fenêtre vue</translation>
@@ -6214,7 +6738,7 @@ Voudriez-vous procéder?</translation>
     <message>
         <location filename="../common/widgetcover.cpp" line="234"/>
         <source>Interrupt</source>
-        <translation>Inperruption</translation>
+        <translation>Interruption</translation>
     </message>
 </context>
 </TS>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts
index 2803575..aaac2b6 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_it.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it_IT">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -429,7 +429,7 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
-        <source>Collations editor window has uncommited modifications.</source>
+        <source>Collations editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -903,7 +903,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,215 +993,215 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
-        <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,242 +1277,262 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
-        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
-        <source>Uncommited data outline color</source>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
-        <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2004,7 +2024,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2019,48 +2039,38 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
-        <source>Generate name basing on file path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
-        <source>Generate automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2070,28 +2080,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
-        <source>Enter a database file path.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
-        <source>This database is already on the list under name: %1</source>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
-        <source>Select a database type.</source>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
+        <source>Enter a database file path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
-        <source>Auto-generated</source>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
+        <source>This database is already on the list under name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
-        <source>Type the name</source>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
+        <source>Select a database type.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2379,7 +2384,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2400,127 +2405,127 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
-        <source>Cannot import, because no import plugin is loaded.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
-        <source>Cannot export, because no export plugin is loaded.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
-        <source>Integrity check (%1)</source>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
+        <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
-        <source>Reset autoincrement</source>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
+        <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
-        <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
+        <source>Integrity check (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="1499"/>
-        <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
+        <source>Reset autoincrement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
-        <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
+        <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2784,77 +2789,77 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
-        <source>Editor window &quot;%1&quot; has uncommited data.</source>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3311,7 +3316,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
-        <source>Functions editor window has uncommited modifications.</source>
+        <source>Functions editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3911,7 +3916,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <name>MdiWindow</name>
     <message>
         <location filename="../mdiwindow.cpp" line="199"/>
-        <source>Uncommited changes</source>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4844,7 +4849,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <name>QuitConfirmDialog</name>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
-        <source>Uncommited changes</source>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4942,179 +4947,179 @@ find next</source>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5146,12 +5151,7 @@ find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
-        <source>This cell is not editable, because: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5159,18 +5159,32 @@ find next</source>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
-        <source>Cannot edit this cell. Details: %2</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <source>The row is marked for deletion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <source>The row is marked for deletion.</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5178,69 +5192,69 @@ find next</source>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
-        <source>Uncommited data</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
+        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
-        <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
+        <source>Could not begin transaction on the database. Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
-        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
+        <source>An error occurred while rolling back the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
-        <source>Could not begin transaction on the database. Details: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
+        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
-        <source>An error occurred while commiting the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
-        <source>An error occurred while rolling back the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
-        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
-        <source>An error occurred while commiting the data: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5248,117 +5262,117 @@ find next</source>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5366,12 +5380,12 @@ find next</source>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
-        <source>Error while commiting new row: %1</source>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5634,7 +5648,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5659,409 +5673,409 @@ NULL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
-        <source>Commited changes for table &apos;%1&apos; successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
-        <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
-        <source>Uncommited changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
-Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
-        <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TriggerColumnsDialog</name>
@@ -6075,6 +6089,16 @@ Do you want to commit the structure, or do you want to go back to the structure
         <source>Triggering columns:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6166,13 +6190,13 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation type="unfinished"></translation>
@@ -6220,7 +6244,7 @@ Do you want to commit the structure, or do you want to go back to the structure
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6262,224 +6286,224 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../windows/viewwindow.cpp" line="361"/>
-        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.cpp" line="363"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
-        <source>Could not load data for view %1. Error details: %2</source>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
-        <source>Uncommited changes</source>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Go back to structure tab</source>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Commit modifications and browse data.</source>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
-        <source>Commited changes for view &apos;%1&apos; successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
+        <source>Could not load data for view %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
-        <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Commit modifications and browse data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm
index dfc8b5e..0adb64a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.qm
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts
index 50dd7ce..ad6aaf3 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
+<TS version="2.1" language="pl_PL">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -431,9 +431,13 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
-        <source>Collations editor window has uncommited modifications.</source>
+        <source>Collations editor window has uncommitted modifications.</source>
         <translation>Okno edytora zestawień ma niezatwierdzone zmiany.</translation>
     </message>
+    <message>
+        <source>Collations editor window has uncommited modifications.</source>
+        <translation type="vanished">Okno edytora zestawień ma niezatwierdzone zmiany.</translation>
+    </message>
 </context>
 <context>
     <name>ColorButton</name>
@@ -906,7 +910,7 @@ ale można go używać.</translation>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation>Konfiguracja</translation>
     </message>
@@ -971,154 +975,153 @@ ale można go używać.</translation>
         <translation>Przeglądanie i edycja danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation>Liczba wierszy danych na stronie:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kiedy dane są wczytane do widoku siatki, szerokość kolumn jest automatycznie dostosowywana. Ta wartość ogranicza początkową szerokość tego dostosowywania, ale użytkownik nadal może rozszerzać kolumnę ręcznie poza ten limit.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation>Ogranicz początkową szerokość kolumn danych (w pikselach):</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation>Wstawianie nowego wiersza w widoku siatki danych.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation>Przed aktualnie wybranym wierszem</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation>Po aktualnie wybranym wierszu.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation>Na końcu widoku siatki danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation>Type danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation>Dostępne edytory:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation>Edytory wybrane dla tego typu danych:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation>Edycja schematu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation>Liczba zmian DDL trzymanych w historii.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation>Rozmiar historii DDL:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
         <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation>Nie pokazuj okna podglądu DDL podczas zatwierdzania zmian schematu</translation>
+        <translation type="vanished">Nie pokazuj okna podglądu DDL podczas zatwierdzania zmian schematu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation>Zapytania SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation>Liczba zapytań trzymana w historii.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation>Rozmiar historii:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Jeśli w oknie edytora SQL jest więcej niż jedno zapytanie, to (jeśli ta opcja jest włączona) tylko jedno zapytanie będzie wykonana - to, które znajduje się pod kursorem pisania. W przeciwnym wypadku wszystkie zapytania będą wykonywane. Zawsze możesz ograniczyć zapytania do wywołania przez zaznaczenie tych zapytań, które chcesz wywołać.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation>Wykonuj tylko zapytania będące pod kursorem</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation>Aktualizacje</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation>Sprawdzaj aktualizacje automatycznie przy starcie</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation>Sesje</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation>Przywróć ostatnią sesję (aktywne okna MDI) po starcie</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation>Filtruj skróty po nazwie, lub kombinacji klawiszy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation>Akcja</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation>Kombinacja klawiszy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation>Zmiana języka wymaga restartu aplikacji, aby zadziałać.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation>Układ kompaktowy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Układ kompaktowy zmniejsza wszystkie marginesy i odstępy na interfejsie do minimum, robiąc więcej miejsca na wyświetlanie danych. Powoduje to, że interfejs jest nieco mniej estetyczny, ale pozwala to na prezentację większej ilości danych naraz.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation>Użyj układu kompaktowego</translation>
     </message>
@@ -1194,7 +1197,7 @@ ale można go używać.</translation>
         <translation>Wyświetlaj tabele i indeksy systemowe na liście</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation>Okna tabel</translation>
     </message>
@@ -1203,12 +1206,12 @@ ale można go używać.</translation>
         <translation type="obsolete">Gdy włączone, Okna Tabel będą się pokazywać z zakładką danych, zamiast z zakładką struktury.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation>Otwieraj Okna Tabeli z zakładką danych na początek</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation>Okna Widoków</translation>
     </message>
@@ -1217,42 +1220,42 @@ ale można go używać.</translation>
         <translation type="obsolete">Gdy włączone, Okna Widoków będą się pokazywać z zakładką danych, zamiast z zakładką struktury.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation>Otwieraj Okna Widoku z zakładką danych na początek</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation>Strefy dokowania głównego okna</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation>Lewa i prawa strefa zajmują rogi</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation>Górna i dolna strefa zajmują rogi</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation>Ukryj wtyczki wbudowane</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation>Aktualny styl:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
@@ -1261,13 +1264,13 @@ ale można go używać.</translation>
         <translation type="obsolete">Kolumna</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation>Wyłączone</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation>Język</translation>
     </message>
@@ -1297,237 +1300,274 @@ ale można go używać.</translation>
         <translation>Próbuj całkowicie pomijać dialog podczas upuszczania pliku bazy na listę</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation>Zachowaj wartość NULL gdy wstawiania jest pusta wartość</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gdy to jest włączone i użytkownik zatrzyma kursor myszy nad komórką w widoku siatki danych (wyniki zapytania, dane tabeli, dane widoku), to pojawi się podpowiedź ze szczegółami odnośnie komórki - zawiera ona szczegóły , jak typ danych kolumny, ograniczenia, ROWID i inne.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation>Pokazuj podpowiedź ze szczegółami o kolumnie i wierszu w widoku siatki danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Kiedy edytowana jest komórka, która miała wartość NULL, a nowa wartość wprowadzona jest pusta, to ta opcja decyduje o tym, czy wartość powinna pozostać NULL (gdy ta opcja jest włączona), czy powinna być nadpisana pustym łańcuchem znaków (gdy ta opcja wyłączona).&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Włącz to, aby wymusić wartość DEFAULT podczas zatwierdzania wartości NULL dla kolumn, które mają zdefiniowaną wartość DEFAULT, nawet jeśli kolumna dopuszcza wartości NULL.&lt;/p&gt;&lt;p&gt;Wyłącz tą opcję aby używać wartości DEFAULT tylko i wyłącznie, gdy wartość NULL jest zatwierdzana dla kolumny z ograniczeniem NOT NULL.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation>Używaj wartości DEFAULT (jeśli zdefiniowana), gdy zatwierdzana jest wartość NULL</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gdy włączone, Okna Tabeli będą się otwierać na zakładce danych, zamiast na zakładce struktury.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gdy włączone, to zakładka &quot;Dane&quot; będzie umieszczona jako pierwsza w każdym Oknie Tabeli, zamiast jako druga.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation>Ustaw zakładkę danych jako pierwszą w Oknie Tabeli</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gdy włączone, Okna Widoku będą się otwierać na zakładce danych, zamiast na zakładce struktury.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gdy włączone, to zakładka &quot;Dane&quot; będzie umieszczona jako pierwsza w każdym Oknie Widoku, zamiast jako druga.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation>Ustaw zakładkę danych jako pierwszą w Oknie Widoku</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation>Nie pokazuj okna podglądu DDL podczas zatwierdzania zmian struktury</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation>Pole Statusu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kiedy użytkownik ręcznie zamyka panel Statusu, ta opcja zapewnia, że zostanie ono otwarte ponownie, gdy jest wyświetlona nowa wiadomość. Jeśli jest ona wyłączona, to panel Statusu może być otwarte tylko ręcznie z menu &quot;Widok&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation>Zawsze otwieraj panel Statusu, gdy wyświetlona jest nowa wiadomość</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation>Aktywna wtyczka formatera</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation>Czcionka edytora SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation>Czcionka listy baz danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation>Czcionka dodatkowych etykiety listy baz danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation>Czcionka widoku danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation>Czcionka pola statusu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation>Kolory edytora SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation>Tło bieżącej linii</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Łańcuchy znaków SQL są zamknięte pomiędzy znakami apostrofu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation>Czcionka łańcucha znaków</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;b&gt;Parametry wiążące to wyrażenia zastępcze dla wartości, które mają być dopiero dostarczone przez użytkownika. Mają one jedną z form: &lt;/p&gt;&lt;ul&gt;&lt;li&gt;:nazwa_parametru&lt;/li&gt;&lt;li&gt;$nazwa_parametru&lt;/li&gt;&lt;li&gt;@nazwa_parametru&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation>Czcionka parametru wiążącego</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation>Tło podświetlonych nawiasów</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;p&gt;Wartości BLOB są wartościami binarnymi, reprezentowanymi jako liczby heksadecymalne, jak np:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation>Standardowa czcionka</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation>Tło obszaru numerów linii</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation>Czcionka słowa kluczowego</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation>Czcionka liczby</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation>Czcionka komentarza</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Poprawne obiekty to nazwy tabel, indekstów, wyzwalaczy i widoków, które istnieją w basie SQLite.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation>Czcionka poprawnych obiektów</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation>Kolory widoku danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Jakiekolwiek zmiany danych będą otoczone ramką w tym kolorze, dopóki nie zostaną zatwierdzone do bazy.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
+        <translation>Kolor obramowania niezatwierdzonych danych</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;W razie błędu podczas zatwierdzania zmian w danych, komórki sprawiające problem będą obramowane tym kolorem.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Jakakolwiek zmiana danych będzie obrysowana tym kolorem, dopóki nie zostanie zatwierdzona do bazy danych.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;Jakakolwiek zmiana danych będzie obrysowana tym kolorem, dopóki nie zostanie zatwierdzona do bazy danych.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
         <source>Uncommited data outline color</source>
-        <translation>Kolor obrysu niezatwierdzonych danych</translation>
+        <translation type="vanished">Kolor obrysu niezatwierdzonych danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
         <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;W przypadku błędu podczas zatwierdzania zmian danych, komórka będąca przyczyną problemu zostanie obrysowana tym kolorem.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;W przypadku błędu podczas zatwierdzania zmian danych, komórka będąca przyczyną problemu zostanie obrysowana tym kolorem.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation>Kolor obrysu błędu zatwierdzania</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation>Kolor czcionki wartości NULL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation>Tło wiersza usuniętego</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation>Kolory listy baz danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Dodatkowe etykiety to te, które mówią o wersji SQLite, liczbie obiektów w głębszych częściach drzewa, itp.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation>Czcionka dodatkowych etykiet</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation>Kolory pola statusu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation>Czcionka wiadomości informującej</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation>Czcionka wiadomości ostrzegającej</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation>Czcionka wiadomości błędu</translation>
     </message>
@@ -2019,22 +2059,21 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
         <translation>Sterownik bazy danych</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
         <source>Generate automatically</source>
-        <translation>Generuj automatycznie</translation>
+        <translation type="vanished">Generuj automatycznie</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation>Trwała (trzymaj w konfiguracji)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation>Testuj połączenie</translation>
     </message>
@@ -2057,7 +2096,7 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
@@ -2067,16 +2106,15 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
         <translation>Nazwa (na liście)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
         <source>Generate name basing on file path</source>
-        <translation>Generuj nazwę bazując na ścieżce do pliku</translation>
+        <translation type="vanished">Generuj nazwę bazując na ścieżce do pliku</translation>
     </message>
     <message>
         <source>Permanent</source>
         <translation type="obsolete">Trwała</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation>&lt;p&gt;Włącz to, jeśli chcesz aby baza danych była przechowywana w pliku konfiguracji i przywracana za każdym razem, gdy startuje SQLiteStudio.&lt;/p&gt;</translation>
@@ -2086,17 +2124,17 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
         <translation type="obsolete">Testuj połączenie z bazą</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation>Przeglądaj lokalny komputer w poszukiwaniu istniejącej bazy</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation>Przeglądaj</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation>Wprowadź unikalną nazwę bazy danych.</translation>
     </message>
@@ -2106,33 +2144,36 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
         <translation>Ta nazwa jest już w użyciu. Proszę wprowadzić unikalną nazwę.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Automatyczne generowanie nazwy zostało wyłączone, ponieważ nazwa była edytowana ręcznie. Aby przywrócić automatyczne generowanie, proszę wyczyścić pole nazwy.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
         <source>Enter a database file path.</source>
         <translation>Wprowadź ścieżkę do pliku bazy danych.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
         <source>This database is already on the list under name: %1</source>
         <translation>Ta baza jest już na liście pod nazwą: %1</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
         <source>Select a database type.</source>
         <translation>Wybierz typ bazy danych.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
         <source>Auto-generated</source>
-        <translation>Auto-generowana</translation>
+        <translation type="vanished">Auto-generowana</translation>
     </message>
     <message>
         <source>The name will be auto-generated</source>
         <translation type="obsolete">Nazwa będzie generowana automatycznie</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
         <source>Type the name</source>
-        <translation>Wprowadź nazwę</translation>
+        <translation type="vanished">Wprowadź nazwę</translation>
     </message>
 </context>
 <context>
@@ -2314,33 +2355,43 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
         <translation>Generuj zapytanie dla tabeli</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation>Pozycja o nazwie %1 istnieje już w grupie %2.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation>Czy napewno chcesz wycofać bazę &apos;%1&apos; z listy?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation>Czy na pewno chcesz wycofać następujące bazy z listy:
 %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation>Wycofaj bazę</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation>Odkurz (%1)</translation>
     </message>
     <message>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation>Wartość automatycznej inkrementacji dla tabeli &apos;%1&apos; została zresetowana.</translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
+        <translation>Czy na pewno chcesz usunąć wszystkie dane z tabel(i): %1?</translation>
+    </message>
+    <message>
         <source>Drop the table</source>
         <translation type="obsolete">Porzuć tabelę</translation>
     </message>
@@ -2468,7 +2519,7 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation>Wymaż dane tabeli</translation>
     </message>
@@ -2484,23 +2535,23 @@ Przeglądanie pozostałych stron będzie możliwe kiedy liczenie wierszy zostani
         <translation>Grupowanie</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation>Utwórz grupę</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation>Nazwa grupy</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation>Usuń grupę</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation>Czy na pewno chcesz usunąć grupę %1?
@@ -2515,14 +2566,14 @@ Wszystkie obiekty z tej grupy zostaną przeniesione do nadrzędnej grupy.</trans
         <translation type="obsolete">Czy na pewno chcesz usunąć bazę danych &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>Nie można zaimportować, ponieważ żadna wtyczka importu nie została załadowana.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Nie można wyeksportować, ponieważ żadna wtyczka eksportu nie została załadowana.</translation>
     </message>
@@ -2535,67 +2586,65 @@ Wszystkie obiekty z tej grupy zostaną przeniesione do nadrzędnej grupy.</trans
         <translation type="obsolete">Wykonanie VACUUM przebiegło pomyślnie.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
         <source>Integrity check (%1)</source>
         <translation>Sprawdzanie spójności (%1)</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Reset autoincrement</source>
         <translation>Wyzeruj autoinkrementację</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Czy na pewno chcesz wyzerować wartość autoinkrementacji dla tabeli &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>Wystąpił błąd podczas próby wyzerowania wartości autoinkrementacji dla tabeli &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>Wartość autoinkrementacji dla tabeli &apos;%1&apos; została pomyślnie wyzerowana.</translation>
+        <translation type="vanished">Wartość autoinkrementacji dla tabeli &apos;%1&apos; została pomyślnie wyzerowana.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
         <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
-        <translation>Czy na pewno chcesz usunąć wszystkie dane z tabeli &apos;%1&apos;?</translation>
+        <translation type="vanished">Czy na pewno chcesz usunąć wszystkie dane z tabeli &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation>Wystąpił błąd podczas próby usunięcia danych z tabeli &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation>Wszystkie dane z tabeli &apos;%1&apos; zostały usunięte.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation>Następujące obiekty zostaną usunięte: %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation>Następujące bazy danych zostaną usunięte z listy: %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation>Pozostałe obiekty z usuniętej grupy będą przeniesione w miejsce, gdzie dotychczas była ta grupa.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation>%1&lt;br&gt;&lt;br&gt;Czy na pewno chcesz kontynuować?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation>Usuń obiekty</translation>
     </message>
@@ -2868,82 +2917,86 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć &apos;%1&apos;, aby przer
         <translation>Utwórz widok z zapytania</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation>Poprzednia baza danych</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation>Następna baza danych</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation>Pokaż następną kartę</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation>Pokaż poprzednią kartę</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation>Aktywuj wyniki poniżej</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation>Aktywuj edytor SQL powyżej</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation>Aktywna baza danych (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation>Zapytanie ukończone w %1 sekund(y). Liczba przetworzonych wierszy: %2</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation>Zapytanie ukończone w %1 sekund(y).</translation>
     </message>
     <message>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
+        <translation>Okno edytora &quot;%1&quot; ma niezatwierdzone dane.</translation>
+    </message>
+    <message>
         <source>Query finished in %2 second(s).</source>
         <translation type="obsolete">Zapytanie ukończone w %2 sekund(y).</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation>Wymaż historię zapytań</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation>Czy na pewno chcesz wymazać całą historię zapytań SQL? Tego nie można odwrócić.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Nie można wyeksportować, ponieważ żadna wtyczka eksportu nie została załadowana.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation>Nie wybrano bazdy danych w edytorze SQL. Nie można utworzyć widoku dla nieznanej bazy.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
         <source>Editor window &quot;%1&quot; has uncommited data.</source>
-        <translation>Okno edytora &quot;%1&quot; ma niezatwierdzone dane.</translation>
+        <translation type="vanished">Okno edytora &quot;%1&quot; ma niezatwierdzone dane.</translation>
     </message>
 </context>
 <context>
@@ -3399,8 +3452,12 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć &apos;%1&apos;, aby przer
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
+        <source>Functions editor window has uncommitted modifications.</source>
+        <translation>Okno edytora funkcji ma niezatwierdzone modyfikacje.</translation>
+    </message>
+    <message>
         <source>Functions editor window has uncommited modifications.</source>
-        <translation>Okno edytora funkcji ma niezatwierdzone zmiany.</translation>
+        <translation type="vanished">Okno edytora funkcji ma niezatwierdzone zmiany.</translation>
     </message>
 </context>
 <context>
@@ -3999,9 +4056,13 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć &apos;%1&apos;, aby przer
 <context>
     <name>MdiWindow</name>
     <message>
-        <location filename="../mdiwindow.cpp" line="199"/>
         <source>Uncommited changes</source>
-        <translation>Niezatwierdzone dane</translation>
+        <translation type="vanished">Niezatwierdzone dane</translation>
+    </message>
+    <message>
+        <location filename="../mdiwindow.cpp" line="199"/>
+        <source>Uncommitted changes</source>
+        <translation>Niezatwierdzone zmiany</translation>
     </message>
     <message>
         <location filename="../mdiwindow.cpp" line="204"/>
@@ -4936,9 +4997,13 @@ Proszę podać nową, unikalną nazwę, lub nacisnąć &apos;%1&apos;, aby przer
 <context>
     <name>QuitConfirmDialog</name>
     <message>
-        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
         <source>Uncommited changes</source>
-        <translation>Niezatwierdzone dane</translation>
+        <translation type="vanished">Niezatwierdzone dane</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
+        <source>Uncommitted changes</source>
+        <translation>Niezatwierdzone zmiany</translation>
     </message>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="20"/>
@@ -5038,179 +5103,179 @@ znajdź następny</translation>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation>Wytnij</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation>Cofnij</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation>Przywróć</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation>Dopełnij</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation>Formatuj SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation>Zapisz SQL do pliku</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation>Wybierz plik do zapisu SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation>Wczytaj SQL z pliku</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation>Usuń linię</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation>Przesuń blok w dół</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation>Przesuń blok w górę</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation>Skopiuj blok w dół</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation>Skopiuj blok w górę</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation>Znajdź</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation>Znajdź następny</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation>Znajdź poprzedni</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation>Zastąp</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation>Przełącz komentarz</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation>Zapisano zawartość SQL do pliku: %1</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation>Dopełnianie składni może być użyte tylko wtedy, gdy poprawna baza danych jest ustawiona w edytorze SQL.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation>Zawartość edytora SQL jest ogromna, więc sprawdzanie błędów i podświetlanie istniejących obiektów zostało tymczasowo wyłączone.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation>Zapisz do pliku</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation>Nie udało się otworzyć pliku &apos;%1&apos; do zapisu: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation>Skrypty SQL (*.sql);;Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation>Nie udało się otworzyć pliku &apos;%1&apos; do odczytu: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation>Osiągnięto koniec dokumentu. Wciśnij szukanie ponownie, aby zrestartować szukanie.</translation>
     </message>
@@ -5242,12 +5307,11 @@ znajdź następny</translation>
         <translation>Ograniczenie:</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
         <source>This cell is not editable, because: %1</source>
-        <translation>Tej komórki nie można edytować, ponieważ: %1</translation>
+        <translation type="vanished">Tej komórki nie można edytować, ponieważ: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation>Nie można załadować danych dla komórki, która odwołuje się do zamkniętej już bazy danych.</translation>
     </message>
@@ -5255,18 +5319,36 @@ znajdź następny</translation>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
         <source>Cannot edit this cell. Details: %2</source>
-        <translation>Nie można edytować tej komórki. Szczegóły: %2</translation>
+        <translation type="vanished">Nie można edytować tej komórki. Szczegóły: %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
         <source>The row is marked for deletion.</source>
         <translation>Wiersz jest zaznaczony do usunięcia.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation>Nie można edytować tej komórki. Szczegóły: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation>Struktura tej tabeli zmieniła się od ostatniego ładowania danych. Przeładuj dane, aby kontynuować.</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
+        <translation>Edytowanie ogromnych ilości danych w podręcznym edytorze nie jest dobrym pomysłem. Może być on powolny i nieporęczny. Lepiej edytować takie duże ilości danych w Widoku Formularza, lub w osobnym oknie edytora (dostępnym w menu prawego kliknięcia myszy).</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation>Klucz obcy dla kolumny %2 ma więcej niż %1 możliwych wartości. To zbyt wiele, by wyświetlić w liście rozwijanej. Musisz edytować wartość ręcznie.</translation>
     </message>
@@ -5274,54 +5356,50 @@ znajdź następny</translation>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation>Tylko jedno zapytanie może być wykonywane w danym momencie.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
         <source>Uncommited data</source>
-        <translation>Niezatwierdzone dane</translation>
+        <translation type="vanished">Niezatwierdzone dane</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
         <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
-        <translation>Niektóre zmiany w danych nie zostały zatwierdzone. Czy na pewno chcesz kontynuować? Wszystkie niezatwierdzone zmiany zostaną utracone.</translation>
+        <translation type="vanished">Niektóre zmiany w danych nie zostały zatwierdzone. Czy na pewno chcesz kontynuować? Wszystkie niezatwierdzone zmiany zostaną utracone.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
         <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation>Nie można zatwierdzić danych dla komórki, która odnosi się do zamkniętej już bazy danych.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
         <source>Could not begin transaction on the database. Details: %1</source>
         <translation>Nie udało się rozpocząć transakcji na bazie danych. Szczegóły: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
         <source>An error occurred while commiting the transaction: %1</source>
-        <translation>Wystąpił błąd podczas zatwierdzania transakcji: %1</translation>
+        <translation type="vanished">Wystąpił błąd podczas zatwierdzania transakcji: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
         <source>An error occurred while rolling back the transaction: %1</source>
         <translation>Wystąpił błąd podczas wycofywania transakcji: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
         <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation>Próbowano zatwierdzić komórkę, której nie można edytować (a mimo to została zmodyfikowana i czeka na zatwierdzenie)! To jest błąd. Proszę to zgłosić.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
         <source>An error occurred while commiting the data: %1</source>
-        <translation>Wystąpił błąd podczas zatwierdzania danych: %1</translation>
+        <translation type="vanished">Wystąpił błąd podczas zatwierdzania danych: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation>Błąd podczas wykonywania zapytania SQL na bazie &apos;%1&apos;: %2</translation>
     </message>
@@ -5330,17 +5408,37 @@ znajdź następny</translation>
         <translation type="obsolete">Błąd podczas wykonywania zapytania SQL: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
+        <translation>Niezatwierdzone dane</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
+        <translation>Niektóre zmiany w danych nie zostały zatwierdzone. Czy na pewno chcesz kontynuować? Wszystkie niezatwierdzone zmiany zostaną utracone.</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
+        <translation>Wystąpił błąd podczas zatwierdzania transakcji: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
+        <translation>Wystąpił błąd podczas zatwierdzania danych: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation>Błąd podczas wczytywania wyników zapytania: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation>Wstaw wiele wierszy</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation>Liczba wierszy do wstawienia:</translation>
     </message>
@@ -5348,117 +5446,117 @@ znajdź następny</translation>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation>Idź do powiązanego wiersza w...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation>Kopiuj jako...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation>Wklej jako...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation>Ustaw wartości NULL</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation>Wymaż wartości</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation>Edytuj wartość w edytorze</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation>Zatwierdź</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation>Wycofaj</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation>Zatwierdź zaznaczone komórki</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation>Wycofaj zaznaczone komórki</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation>Zdefiniuj kolumny po których sortować</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation>Wycofaj własne sortowanie</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation>Wstaw wiersz</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation>Wstaw wiele wierszy</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation>Usuń zaznaczony wiersz</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation>Generuj zapytanie dla wybranych komórek</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation>Nie wybrano elementów do których należy wkleić zawartość schowka.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation>Idź do powiązanego wiersza w tabeli &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation>tabela &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation>Powiązany wiersz (%1)</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation>Edytuj wartość</translation>
     </message>
@@ -5466,12 +5564,16 @@ znajdź następny</translation>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
         <source>Error while commiting new row: %1</source>
+        <translation type="vanished">Błąd podczas zatwierdzania nowego wiersza: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
         <translation>Błąd podczas zatwierdzania nowego wiersza: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation>Błąd podczas usuwania wiersza z tabeli %1: %2</translation>
     </message>
@@ -5738,7 +5840,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation>Dane</translation>
     </message>
@@ -5763,194 +5865,194 @@ NULL</source>
         <translation>DDL</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation>Eksportuj tabelę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation>Importuj do tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation>Zaludnij tabelę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation>Odśwież strukturę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation>Zatwierdź zmiany w strukturze</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation>Wycofaj zmiany w strukturze</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation>Dodaj kolumnę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation>Edytuj kolumnę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation>Usuń kolumnę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation>Przesuń kolumnę w górę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation>Przesuń kolumnę w dół</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation>Utwórz podobną tabelę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation>Wyzeruj wartość autoinkrementacji</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation>Dodaj ograniczenie tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation>Edytuj ograniczenie tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation>Usuń ograniczenie tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation>Przesuń ograniczenie tabeli w górę</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation>Przesuń ograniczenie tabeli w dół</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation>Dodaj klucz główny tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation>Dodaj klucz obcy tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation>Dodaj ograniczenie unikalnych wartości tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation>Dodaj ograniczenie warunkiem tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation>Odśwież listę indeksów</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation>Utwórz indeks</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation>Edytuj indeks</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation>Usuń indeks</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation>Odśwież listę wyzwalaczy</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation>Utwórz wyzwalacz</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation>Edytuj wyzwalacz</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation>Usuń wyzwalacz</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation>Czy na pewno chcesz usunąć kolumnę &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
@@ -5958,42 +6060,84 @@ Would you like to proceed?</source>
 Czy chcesz kontynuować?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation>Modyfikacja tabeli</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation>Nie udało się załadować danych dla tabeli %1. Szczegóły błędu: %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation>Nie udało się przetworzyć poprawnie tabeli %1. Nie można otworzyć okna tabeli.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation>Nie można przywrócić okna %1, ponieważ nie ma bazy danych lub tabeli zachowanej w sesji dla tego okna.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation>Nie można przywrócić okna %1, ponieważ nie ma bazy danych lub tabeli zachowanej w sesji dla tego okna.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation>Nie udało się przywrócić okna &apos;%1&apos;, ponieważ nie udało się ustalić bazy danych %2.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation>Nie można przywrócić okna &apos;%1&apos;, ponieważ tabela %2 już nie jestnieje w bazie danych %3.</translation>
     </message>
     <message>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
+        <translation>Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation>Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos; (nazwanej wcześniej &apos;%2&apos;).</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation>Wartość automatycznej inkrementacji dla tabeli &apos;%1&apos; została zresetowana.</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation>Niezatwierdzone zmiany</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation>Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura tabeli nie zostanie ustalona.
+Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury?</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation>Okno tabeli &quot;%1&quot; ma niezatwierdzone modyfikacje struktury i danych.</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation>Okno tabeli &quot;%1&quot; ma niezatwierdzone dane.</translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation>Okno tabeli &quot;%1&quot; ma niezatwierdzone modyfikacje struktury.</translation>
+    </message>
+    <message>
         <source>Could not restore window, because database %1 could not be resolved.</source>
         <translation type="obsolete">Nie można przywrócić okna, ponieważ nie znaleziono bazy danych %1.</translation>
     </message>
@@ -6002,180 +6146,172 @@ Czy chcesz kontynuować?</translation>
         <translation type="obsolete">Nie można przywrócić okna, ponieważ tabela %1 już nie jestnieje w bazie danych %2.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation>Nowa tabela %1</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
         <source>Commited changes for table &apos;%1&apos; successfly.</source>
-        <translation>Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos;.</translation>
+        <translation type="vanished">Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
         <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
-        <translation>Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos; (nazwanej wcześniej &apos;%2&apos;).</translation>
+        <translation type="vanished">Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos; (nazwanej wcześniej &apos;%2&apos;).</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation>Nie udało się zatwierdzić struktury tabeli. Treść błędu: %1</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation>Wyzeruj autoinkrementację</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Czy na pewno chcesz wyzerować wartość autoinkrementacji dla tabeli &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>Wystąpił błąd podczas próby wyzerowania wartości autoinkrementacji dla tabeli &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>Wartość autoinkrementacji dla tabeli &apos;%1&apos; została pomyślnie wyzerowana.</translation>
+        <translation type="vanished">Wartość autoinkrementacji dla tabeli &apos;%1&apos; została pomyślnie wyzerowana.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation>Pusta nazwa</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation>Pusta nazwa dla tabeli jest dozwolona w SQLite, ale nie jest zalecana.
 Czy na pewno chcesz utworzyć tabelę o pustej nazwie?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation>Nie można utworzyć tabeli bez przynajmniej jednej kolumny.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation>Nie można utworzyć tabeli %1, jeśli nie ma zdefiniowanego klucza głównego. Albo udznacz %2, albo zdefiniuj klucz główny.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation>Nie można użyć autoinkrementacji dla klucza głównego, kiedy klauzula %1 jest użyta. Albo odnacz %2, albo autonkrementację w kluczu głównym.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation>Czy na pewno chcesz usunąć ograniczenie tabeli &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation>Usuń ograniczenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Nie można wyeksportować, ponieważ żadna wtyczka eksportu nie została załadowana.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>Nie można zaimportować, ponieważ żadna wtyczka importu nie została załadowana.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
         <source>Uncommited changes</source>
-        <translation>Niezatwierdzone dane</translation>
+        <translation type="vanished">Niezatwierdzone dane</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura tabeli nie zostanie ustalona.
+        <translation type="vanished">Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura tabeli nie zostanie ustalona.
 Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation>Wróć do karty struktury</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation>Zatwierdź modyfikacje i przeglądaj dane.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation>Wartości unikalne</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation>Kolumny</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation>Warunek indeksu częściowego:</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation>Zdarzenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation>Warunek</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Szczegóły</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>Okno tabeli &quot;%1&quot; ma niezatwierdzone modyfikacje struktury i danych.</translation>
+        <translation type="vanished">Okno tabeli &quot;%1&quot; ma niezatwierdzone modyfikacje struktury i danych.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
         <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation>Okno tabeli &quot;%1&quot; ma niezatwierdzone dane.</translation>
+        <translation type="vanished">Okno tabeli &quot;%1&quot; ma niezatwierdzone dane.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>Okno tabeli &quot;%1&quot; ma niezatwierdzone modyfikacje struktury.</translation>
+        <translation type="vanished">Okno tabeli &quot;%1&quot; ma niezatwierdzone modyfikacje struktury.</translation>
     </message>
 </context>
 <context>
@@ -6190,6 +6326,16 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur
         <source>Triggering columns:</source>
         <translation>Kolumny wyzwalające:</translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation>Zaznacz wszystko</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation>Odznacz wszystko</translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6281,13 +6427,13 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur
         <translation>Wprowadź poprawny kod wyzwalacza.</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation>Wystąpił błąd podczas wykonywania zapytań SQL:
@@ -6336,7 +6482,7 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation>Dane</translation>
     </message>
@@ -6390,220 +6536,250 @@ Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktur
         <translation>Nowy widok %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation>Odśwież widok</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation>Zatwierdź zmiany w widoku</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation>Wycofaj zmiany w widoku</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation>Jawne nazwy kolumn</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation>Generuj automatycznie nazwy kolumn wyjściowych bazując na kolumnach wynikowych widoku.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation>Dodaj kolumnę</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation>Edytuj kolumnę</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation>Usuń kolumnę</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation>Przesuń kolumnę w górę</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation>Przesuń kolumnę w dół</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation>Odśwież listę wyzwalaczy</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation>Utwórz nowy wyzwalacz</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation>Edytuj wybrany wyzwalacz</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation>Usuń wybrany wyzwalacz</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
+        <location filename="../windows/viewwindow.cpp" line="361"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
         <translation>Okno widoku &quot;%1&quot; ma niezatwierdzone modyfikacje struktury i danych.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="361"/>
-        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <location filename="../windows/viewwindow.cpp" line="363"/>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
         <translation>Okno widoku &quot;%1&quot; ma niezatwierdzone dane.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="363"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
         <translation>Okno widoku &quot;%1&quot; ma niezatwierdzone modyfikacje struktury.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
+        <translation>Niezatwierdzone zmiany</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation>Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura widoku nie zostanie ustalona.
+Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury?</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
+        <translation>Pomyślnie zatwierdzono zmiany dla widoku &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation>Pomyślnie zatwierdzono zmiany dla tabeli &apos;%1&apos; (nazwanej wcześniej &apos;%2&apos;).</translation>
+    </message>
+    <message>
+        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
+        <translation type="vanished">Okno widoku &quot;%1&quot; ma niezatwierdzone modyfikacje struktury i danych.</translation>
+    </message>
+    <message>
+        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <translation type="vanished">Okno widoku &quot;%1&quot; ma niezatwierdzone dane.</translation>
+    </message>
+    <message>
+        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <translation type="vanished">Okno widoku &quot;%1&quot; ma niezatwierdzone modyfikacje struktury.</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
         <source>Could not load data for view %1. Error details: %2</source>
         <translation>Nie udało się załadować danych dla widoku %1. Szczegóły błędu: %2</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
         <source>Uncommited changes</source>
-        <translation>Niezatwierdzone dane</translation>
+        <translation type="vanished">Niezatwierdzone dane</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura widoku nie zostanie ustalona.
+        <translation type="vanished">Zmiany w strukturze nie zostały zatwierdzone. Nie można przeglądać, ani edytować danych, dopóki struktura widoku nie zostanie ustalona.
 Czy chcesz zatwierdzić strukturę, czy jednak chcesz wrócić do karty struktury?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Go back to structure tab</source>
         <translation>Wróć do karty struktury</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Commit modifications and browse data.</source>
         <translation>Zatwierdź modyfikacje i przeglądaj dane.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
         <source>Commited changes for view &apos;%1&apos; successfly.</source>
-        <translation>Pomyślnie zatwierdzono zmiany dla widoku &apos;%1&apos;.</translation>
+        <translation type="vanished">Pomyślnie zatwierdzono zmiany dla widoku &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
         <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
-        <translation>Pomyślnie zatwierdzono zmiany dla widoku &apos;%1&apos; (nazwanego wcześniej &apos;%2&apos;).</translation>
+        <translation type="vanished">Pomyślnie zatwierdzono zmiany dla widoku &apos;%1&apos; (nazwanego wcześniej &apos;%2&apos;).</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation>Nie udało się zatwierdzić widoku. Treść błędu: %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation>Nadpisz kolumny</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation>Aktualnie zdefiniowane kolumny zostaną nadpisane. Czy chcesz kontynuować?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation>Nie udało się ustalić kolumn zwracanych z widoku. Zapytanie jest prawdopodobnie niekompletne lub zawiera błędy.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation>Zamiast</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation>Warunek</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Szczegóły</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation>Nie udało się przetworzyć poprawnie widoku %1. Nie można otworzyć okna widoku.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation>Pusta nazwa</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation>Pusta nazwa dla widoku jest dozwolona w SQLite, ale nie jest zalecana.
 Czy na pewno chcesz utworzyć widok o pustej nazwie?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation>Zapytanie SELECT nie mogło być poprawnie przeanalizowane. Proszę poprawić zapytanie i spróbować ponownie.
 Szczegóły: %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation>Widok nie mógł być zmodyfikowany w związku z wewnętrznym błędem SQLiteStudio. Proszę to zgłosić!</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation>Kod widok nie mógł być poprawnie przeanalizowany. To jest błąd SQLiteStudio Proszę to zgłosić!</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
@@ -6611,7 +6787,7 @@ Would you like to proceed?</source>
 Czy chcesz kontynuować?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation>Modyfikacja widoku</translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts
index 0130532..4d51bcb 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_pt_BR.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_BR">
+<TS version="2.1" language="pt_BR">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -429,7 +429,7 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
-        <source>Collations editor window has uncommited modifications.</source>
+        <source>Collations editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -903,7 +903,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,215 +993,215 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
-        <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1277,242 +1277,262 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
-        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
-        <source>Uncommited data outline color</source>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
-        <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2003,22 +2023,17 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
-        <source>Generate automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2029,7 +2044,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2039,28 +2054,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
-        <source>Generate name basing on file path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2070,28 +2080,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
-        <source>Enter a database file path.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
-        <source>This database is already on the list under name: %1</source>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
-        <source>Select a database type.</source>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
+        <source>Enter a database file path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
-        <source>Auto-generated</source>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
+        <source>This database is already on the list under name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
-        <source>Type the name</source>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
+        <source>Select a database type.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2379,7 +2384,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2400,127 +2405,127 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
-        <source>Cannot import, because no import plugin is loaded.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
-        <source>Cannot export, because no export plugin is loaded.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
-        <source>Integrity check (%1)</source>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
+        <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
-        <source>Reset autoincrement</source>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
+        <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
-        <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
+        <source>Integrity check (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="1499"/>
-        <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
+        <source>Reset autoincrement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
-        <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
+        <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2784,77 +2789,77 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
-        <source>Editor window &quot;%1&quot; has uncommited data.</source>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3311,7 +3316,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
-        <source>Functions editor window has uncommited modifications.</source>
+        <source>Functions editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3911,7 +3916,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <name>MdiWindow</name>
     <message>
         <location filename="../mdiwindow.cpp" line="199"/>
-        <source>Uncommited changes</source>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4844,7 +4849,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <name>QuitConfirmDialog</name>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
-        <source>Uncommited changes</source>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4942,179 +4947,179 @@ find next</source>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5146,12 +5151,7 @@ find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
-        <source>This cell is not editable, because: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5159,18 +5159,32 @@ find next</source>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
-        <source>Cannot edit this cell. Details: %2</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <source>The row is marked for deletion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <source>The row is marked for deletion.</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5178,69 +5192,69 @@ find next</source>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
-        <source>Uncommited data</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
+        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
-        <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
+        <source>Could not begin transaction on the database. Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
-        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
+        <source>An error occurred while rolling back the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
-        <source>Could not begin transaction on the database. Details: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
+        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
-        <source>An error occurred while commiting the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
-        <source>An error occurred while rolling back the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
-        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
-        <source>An error occurred while commiting the data: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5248,117 +5262,117 @@ find next</source>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5366,12 +5380,12 @@ find next</source>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
-        <source>Error while commiting new row: %1</source>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5634,7 +5648,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5659,409 +5673,409 @@ NULL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
-        <source>Commited changes for table &apos;%1&apos; successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
-        <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
-        <source>Uncommited changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
-Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
-        <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TriggerColumnsDialog</name>
@@ -6075,6 +6089,16 @@ Do you want to commit the structure, or do you want to go back to the structure
         <source>Triggering columns:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6166,13 +6190,13 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation type="unfinished"></translation>
@@ -6220,7 +6244,7 @@ Do you want to commit the structure, or do you want to go back to the structure
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6262,224 +6286,224 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../windows/viewwindow.cpp" line="361"/>
-        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.cpp" line="363"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
-        <source>Could not load data for view %1. Error details: %2</source>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
-        <source>Uncommited changes</source>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Go back to structure tab</source>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Commit modifications and browse data.</source>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
-        <source>Commited changes for view &apos;%1&apos; successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
+        <source>Could not load data for view %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
-        <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Commit modifications and browse data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm
index e07a8d5..7a4d27a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.qm
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts
index b2eba15..4b135af 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<TS version="2.1" language="ru_RU">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -431,8 +431,12 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
+        <source>Collations editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Collations editor window has uncommited modifications.</source>
-        <translation>В редакторе сравнений имеются неподтверждённые изменения.</translation>
+        <translation type="vanished">В редакторе сравнений имеются неподтверждённые изменения.</translation>
     </message>
 </context>
 <context>
@@ -680,17 +684,17 @@ but it&apos;s okay to use it.</source>
     <message>
         <location filename="../dialogs/columndialog.cpp" line="385"/>
         <source>Scale is not allowed for INTEGER PRIMARY KEY columns.</source>
-        <translation type="unfinished"></translation>
+        <translation>Указание размера данных недопустимо для столбцов с типом INTEGER PRIMARY KEY.</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.cpp" line="386"/>
         <source>Precision cannot be defined without the scale.</source>
-        <translation type="unfinished"></translation>
+        <translation>Точность не может быть задана без указания размера данных.</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.cpp" line="407"/>
         <source>Precision is not allowed for INTEGER PRIMARY KEY columns.</source>
-        <translation type="unfinished"></translation>
+        <translation>Указание точности недопустимо для столбцов с типом INTEGER PRIMARY KEY.</translation>
     </message>
 </context>
 <context>
@@ -905,7 +909,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation>Конфигурация</translation>
     </message>
@@ -967,27 +971,27 @@ but it&apos;s okay to use it.</source>
     <message>
         <location filename="../dialogs/configdialog.ui" line="351"/>
         <source>Database dialog window</source>
-        <translation type="unfinished"></translation>
+        <translation>Диалоговое окно добавления базы данных</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="357"/>
         <source>&lt;p&gt;When adding new database it is marked to be &quot;permanent&quot; (stored in configuration) by default. Checking this option makes every new database to NOT be &quot;permanent&quot; by default.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;По умолчанию при добавлении базы данных она отмечается как &quot;постоянная&quot; (т.е. сохраняется в конфигурацию). При установке данной опции все добавляемые базы данных по умолчанию НЕ будут отмечены как &quot;постоянные&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="360"/>
         <source>Do not mark database to be &quot;permanent&quot; by default</source>
-        <translation type="unfinished"></translation>
+        <translation>Не отмечать базу данных как &quot;постоянную&quot; по умолчанию</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="370"/>
         <source>&lt;p&gt;When this option is enabled, then files dropped from file manager onto database list will be automatically added to the list, bypassing standard database dialog. If for various reasons automatic process fails, then standard dialog will be presented to the user.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;При выборе данной опции все файлы, перетянутые в список баз данных из файлового менеджера, будут автоматически добавлены в список без отображения диалога добавления базы данных. Если по каким-либо причинам автоматическое добавление не получится, пользователю будет показан стандартный диалог добавления базы данных.&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="373"/>
         <source>Try to bypass dialog completly when dropping database file onto the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Не показывать диалог при перетягивании файла базы данных в список</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="418"/>
@@ -995,38 +999,51 @@ but it&apos;s okay to use it.</source>
         <translation>Просмотр и редактирование данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation>Количество строк данных на странице:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation>&lt;p&gt;При загрузке даных в табличный вид ширина столбцов автоматически подстраивается. Этот параметр ограничивает начальную ширину для подстройки, при этом пользователь может вручную изменить ширину столбца сверх данного лимита.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation>Ограничить начальную ширину столбца данных (в пикселях):</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&amp;lt;p&amp;gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&amp;lt;/p&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="vanished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&amp;lt;p&amp;gt;Если редактируется ячейка, содержащая NULL, и вводится пустая строка в качестве значения, то эта опция определяет, останется ли в качестве значения ячейки NULL (если опция активирована), или значение будет заменено на пустую строку (если эта опция деактивирована).&amp;lt;/p&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation>Сохранять значение NULL при вводе пустой тсроки</translation>
+    </message>
+    <message>
+        <source>General.KeepNullWhenEmptyValue</source>
+        <translation type="vanished">General.KeepNullWhenEmptyValue</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Если данная опция активирована и пользователь наводит указатель мыши на ячейку в любом режиме просмотра данных (результаты запроса, данные таблицы, данные представления), то будет отображена всплывающая подсказка с информацией о ячейке, в том числе информация о типе данных столбца, ограничениях, значение ROWID и прочее.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
-        <translation type="unfinished"></translation>
+        <translation>Показывать всплывающую подсказку с информацией о столбце и строке при просмотре данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation>Вставка новой строки в таблице данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation>Перед текущей выделенной строкой</translation>
     </message>
@@ -1035,179 +1052,178 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">General.InsertRowPlacement</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation>После текущей выделенной строки</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation>В конец области просмотра данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Если опция активирована, окна таблиц будут открываться на вкладке данных вместо вкладки со структурой.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Если опция активирована, вкладка &quot;Данные&quot; в окнах таблиц будет первой, а не второй по порядку.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Помещать вкладку данных в окнах таблиц первой</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Если опция активирована, окна представлений будут открываться на вкладке данных вместо вкладки со структурой.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Если опция активирована, вкладка &quot;Данные&quot; в окнах представлений будет первой, а не второй по порядку.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Помещать вкладку данных в окнах представлений первой</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation>Типы данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation>Доступные редакторы:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation>Выбранные редакторы для этого типа данных:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation>Редактирование схемы</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation>Количество сохраняемых в истории изменений DDL.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation>Размер истории DDL:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
         <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation>Не показывать диалог предпросмотра DDL при подтверждении изменений схемы</translation>
+        <translation type="vanished">Не показывать диалог предпросмотра DDL при подтверждении изменений схемы</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation>SQL запросы</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation>Количество сохраняемых в истории запросов.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation>Размер истории:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Если в окне редактора SQL введено более одного запроса, то (если данная опция активирована) будет выполнен лишь один запрос - тот, который находится под текстовым курсором. В противном случае будут исполнены все запросы. Вы можете ограничить выполняемые запросы, выделив их перед вызовом выполнения.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation>Выполнять только запрос под курсором</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation>Обновления</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation>Автоматически проверять обновления при запуске</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation>Сессия</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation>Восстановить предыдущую сессию (активные MDI окна) после запуска</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Окно статуса</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Если пользователь вручную закрыл окно статуса, включение данной опции гарантирует, что при появлении новых сообщений окно статуса будет автоматически открыто. Если опция отключена, окно статуса может быть заново открыто только пользователем вручную через меню &quot;Вид&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
-        <translation type="unfinished"></translation>
+        <translation>Всегда открывать окно статуса при появлении нового сообщения</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation>Фильтруйте горячие клавиши по имени или комбинации клавиш</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation>Действие</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation>Комбинация клавиш</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation>Для смены языка потребуется перезапустить приложение.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation>Компактный режим</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation>&lt;p&gt;В компактном режиме все поля и отступы в интерфейсе минимизированы для отображения большего количества данных. Интерфейс станет чуть менее эстетичным, однако это позволит уместить больше данных на экране.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation>Включить компактный режим</translation>
     </message>
@@ -1287,7 +1303,22 @@ but it&apos;s okay to use it.</source>
         <translation>Отображать в списке системные таблицы и индексы</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation>Окна таблиц</translation>
     </message>
@@ -1296,12 +1327,12 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">Если опция активирована, окно таблицы будет открыто на вкладке данных вместо вкладки структуры.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation>Открывать окна таблиц на вкладке данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation>Окна представлений</translation>
     </message>
@@ -1310,227 +1341,244 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">Если опция активирована, окно представления будет открыто на вкладке данных вместо вкладки структуры.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation>Открывать окна представлений на вкладке данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation>Области прикрепления вокруг главного окна</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation>Углы занимают правая и левая области</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation>Углы занимают верхняя и нижняя области</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation>Скрыть встроенные модули</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation>Текущий стиль:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation>Предпросмотр</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation>Активно</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation>Неактивно</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation>Активный модуль форматирования</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation>Шрифт редактора SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation>Шрифт списка баз данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation>Шрифт дополнительных меток в списке баз данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation>Шрифт просмотра данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation>Шрифт окна статуса</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation>Цвета редактора SQL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation>Фон текущей строки</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Строки SQL обрамляются в одинарные кавычки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation>Цвет строки</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;p&gt;Подстановочные параметры предназначены для значений, которые будут в дальнейшем указаны пользователем. Они определяются одним из следующих способов:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:имя_параметра&lt;/li&gt;&lt;li&gt;$имя_параметра&lt;/li&gt;&lt;li&gt;@имя_параметра&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation>Цвет подстановочных параметров</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation>Фон подсвечиваемых скобок</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation>&lt;p&gt;Данные типа BLOB — это бинарные данные, представляемые в виде шестнадцатеричных чисел, например:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation>Цвет данных типа BLOB</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation>Стандартный цвет</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation>Фон области нумерации строк</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation>Цвет ключевого слова</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation>Цвет числа</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation>Цвет комментария</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Распознаваемыми объектами являются имена талиц, индексов, триггеров и представлений, существующих в базе данных SQLite.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation>Цвет распознанных объектов</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation>Цвета в окне просмотра данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Все изменения данных будут обрамлены этим цветом, пока не будут записаны в базу данных.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;Все изменения данных будут обрамлены этим цветом, пока не будут записаны в базу данных.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
         <source>Uncommited data outline color</source>
-        <translation>Цвет обрамления неподтверждённых изменений</translation>
+        <translation type="vanished">Цвет обрамления неподтверждённых изменений</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
         <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;В случае ошибки при подтверждении изменений данных, этим цветом будут обрамлены проблемные ячейки.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;В случае ошибки при подтверждении изменений данных, этим цветом будут обрамлены проблемные ячейки.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation>Цвет обрамления ошибочных ячеек</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation>Цвет значений NULL</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation>Фон удалённых строк</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation>Цвета списка баз данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Дополнительные метки содержат информацию о версии SQLite, о количестве объектов в глубине дерева и т.д.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation>Цвет дополнительных меток</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation>Цвета в окне Статуса</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation>Цвет информационного сообщения</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation>Цвет предупреждения</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation>Цвет ошибки</translation>
     </message>
@@ -2022,22 +2070,21 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation>Драйвер базы данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
         <source>Generate automatically</source>
-        <translation>Сгенерировать автоматически</translation>
+        <translation type="vanished">Сгенерировать автоматически</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation>Постоянная (сохранить базу в конфигурационном файле)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation>Тест соединения</translation>
     </message>
@@ -2060,7 +2107,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
@@ -2070,16 +2117,15 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation>Имя (в списке)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
         <source>Generate name basing on file path</source>
-        <translation>Генерировать имя на основе пути к файлу</translation>
+        <translation type="vanished">Генерировать имя на основе пути к файлу</translation>
     </message>
     <message>
         <source>Permanent</source>
         <translation type="obsolete">Запомнить</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation>&lt;p&gt;Активируйте эту опцию для сохранения базы данных в конфигурационном файле и добавления её в список при каждом запуске SQLiteStudio.&lt;/p&gt;</translation>
@@ -2089,17 +2135,17 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="obsolete">Тест соединения с базой данных</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation>Указать существующий файл базы данных на локальном компьютере</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation>Введите уникальное имя базы данных.</translation>
     </message>
@@ -2109,33 +2155,36 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation>Данное имя уже используется. Пожалуйста, укажите уникальное имя.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Автоматическая генерация имени отключена, так как имя было задано вручную. Для автоматической генерации необходимо удалить содержимое из поля имени.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
         <source>Enter a database file path.</source>
         <translation>Введите путь к базе данных.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
         <source>This database is already on the list under name: %1</source>
         <translation>Указанная база данных уже находится в списке под именем %1</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
         <source>Select a database type.</source>
         <translation>Выберите тип базы данных.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
         <source>Auto-generated</source>
-        <translation>Автоматически сгенерировано</translation>
+        <translation type="vanished">Автоматически сгенерировано</translation>
     </message>
     <message>
         <source>The name will be auto-generated</source>
         <translation type="obsolete">Имя будет сгенерировано автоматически</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
         <source>Type the name</source>
-        <translation>Введите имя</translation>
+        <translation type="vanished">Введите имя</translation>
     </message>
 </context>
 <context>
@@ -2189,23 +2238,24 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="282"/>
         <source>Delete objects</source>
-        <translation type="unfinished">Удалить объекты</translation>
+        <translation>Удалить объекты</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="283"/>
         <source>Are you sure you want to delete following objects:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы действительно хотите удалить следующие объекты:
+%1</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="290"/>
         <source>Cannot start transaction. Details: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно начать транзакцию. Подробности: %1</translation>
     </message>
     <message>
         <location filename="../dbobjectdialogs.cpp" line="327"/>
         <source>Cannot commit transaction. Details: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно подтвердить транзакцию. Подробности: %1</translation>
     </message>
 </context>
 <context>
@@ -2422,7 +2472,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation>Удалить данные из таблицы</translation>
     </message>
@@ -2440,54 +2490,64 @@ Browsing other pages will be possible after the row counting is done.</source>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="339"/>
         <source>Generate query for table</source>
-        <translation type="unfinished"></translation>
+        <translation>Сгенерировать запрос для этой таблицы</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation>Создать группу</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation>Имя группы</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation>Элемент с именем %1 уже входит в группу %2.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation>Удалить группу</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation>Вы действительно хотите удалить группу %1? Все объекты из данной группы будут перемещены в родительскую группу.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы действительно хотите удалить базу данных &apos;%1&apos; из списка?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы действительно хотите удалить следующие базы данных из списка: %1</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить базу данных</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
+        <translation>Операция VACUUM (%1)</translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2499,14 +2559,14 @@ All objects from this group will be moved to parent group.</source>
         <translation type="obsolete">Вы действительно хотите удалить базу данных &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>Невозможно произвести импорт, т.к. не загружено ни одного модуля импорта.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Невозможно произвести экспорт, т.к. не загружено ни одного модуля экспорта.</translation>
     </message>
@@ -2519,67 +2579,65 @@ All objects from this group will be moved to parent group.</source>
         <translation type="obsolete">Выполнение команды VACUUM успешно завершено.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
         <source>Integrity check (%1)</source>
         <translation>Проверка целостности (%1)</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Reset autoincrement</source>
         <translation>Сброс счётчика автоинкремента</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Вы действительно хотите сбросить счётчик автоинкремента у таблицы &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>При попытке сброса счётчика автоинкремента у таблицы &apos;%1&apos; произошла ошибка: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>Сброс счётчика автоинкремента у таблицы &apos;%1&apos; успешно выполнен.</translation>
+        <translation type="vanished">Сброс счётчика автоинкремента у таблицы &apos;%1&apos; успешно выполнен.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
         <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
-        <translation>Вы действительно хотите удалить все данные из таблицы &apos;%1&apos;?</translation>
+        <translation type="vanished">Вы действительно хотите удалить все данные из таблицы &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation>При попытке удаления данных из таблицы &apos;%1&apos; произошла ошибка: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation>Из таблицы &apos;%1&apos; были удалены все данные.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation>Будут удалены следующие объекты: %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation>Из списка будут удалены следующие базы данных: %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation>Оставшиеся после удаления группы объекты будут перемещены туда, где ранее располагалась группа.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation>%11&lt;br&gt;&lt;br&gt;Вы действительно хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation>Удалить объекты</translation>
     </message>
@@ -2705,7 +2763,7 @@ All objects from this group will be moved to parent group.</source>
     <message>
         <location filename="../dbtree/dbtreemodel.cpp" line="1162"/>
         <source>Could not add dropped database file &apos;%1&apos; automatically. Manual setup is necessary.</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно автоматически добавить перетянутый файл базы данных &apos;%1&apos;. Необходима ручная настройка.</translation>
     </message>
     <message>
         <location filename="../dbtree/dbtreemodel.cpp" line="1209"/>
@@ -2852,78 +2910,82 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
         <translation>Создать представление из запроса</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation>Предыдущая база данных</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation>Следующая база данных</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation>Открыть следующую вкладку</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation>Открыть предыдущую вкладку</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation>Фокус на результатах внизу</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation>Фокус на редакторе SQL сверху</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation>Текущая база данных (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation>Запрос выполнен за %1 секунд. Затронуто строк: %2</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation>Запрос выполнен за %1 секунд.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation>Очистка истории запросов</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation>Вы действительно хотите удалить всю историю выполнения SQL запросов? Операцию невозможно отменить.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Невозможно произвести экспорт, т.к. не загружено ни одного модуля экспорта.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation>В редакторе SQL не выбрана база данных. Невозможно создать представление в неизвестной базе данных.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Editor window &quot;%1&quot; has uncommited data.</source>
-        <translation>В окне редактора &quot;%1&quot; имеются неподтверждённые данные.</translation>
+        <translation type="vanished">В окне редактора &quot;%1&quot; имеются неподтверждённые данные.</translation>
     </message>
 </context>
 <context>
@@ -3379,8 +3441,12 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
+        <source>Functions editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Functions editor window has uncommited modifications.</source>
-        <translation>В окне редактора функций имеются неподтверждённые изменения.</translation>
+        <translation type="vanished">В окне редактора функций имеются неподтверждённые изменения.</translation>
     </message>
 </context>
 <context>
@@ -3532,27 +3598,27 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <message>
         <location filename="../dialogs/indexdialog.ui" line="98"/>
         <source>Delete selected indexed expression</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранное индексируемое выражение</translation>
     </message>
     <message>
         <location filename="../dialogs/indexdialog.ui" line="108"/>
         <source>Moves selected index column up in the order, making it more significant in the index.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместить индексируемый столбец выше по списку, увеличивая его значимость в индексе.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexdialog.ui" line="118"/>
         <source>Moves selected index column down in the order, making it less significant in the index.</source>
-        <translation type="unfinished"></translation>
+        <translation>Переместить индексируемый столбец ниже по списку, снижая его значимость в индексе.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexdialog.ui" line="149"/>
         <source>Edit selected indexed expression</source>
-        <translation type="unfinished"></translation>
+        <translation>Редактировать выбранное индексируемое выражение</translation>
     </message>
     <message>
         <location filename="../dialogs/indexdialog.ui" line="169"/>
         <source>Add indexed expression</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить индексируемое выражение</translation>
     </message>
     <message>
         <location filename="../dialogs/indexdialog.ui" line="180"/>
@@ -3572,7 +3638,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <message>
         <location filename="../dialogs/indexdialog.cpp" line="206"/>
         <source>Unique index cannot have indexed expressions. Either remove expressions from list below, or uncheck this option.</source>
-        <translation type="unfinished"></translation>
+        <translation>Уникальный индекс не может содержать индексируемые выражения. Либо удалите выражения из списка ниже, либо отключите эту опцию.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexdialog.cpp" line="207"/>
@@ -3626,42 +3692,42 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <message>
         <location filename="../dialogs/indexexprcolumndialog.ui" line="14"/>
         <source>Indexed expression</source>
-        <translation type="unfinished"></translation>
+        <translation>Индексируемое выражение</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.ui" line="20"/>
         <source>Expression to index</source>
-        <translation type="unfinished"></translation>
+        <translation>Выражение для добавления в индекс</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.cpp" line="60"/>
         <source>This expression is already indexed by the index.</source>
-        <translation type="unfinished"></translation>
+        <translation>Такое выражение уже присутствует в индексе.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.cpp" line="66"/>
         <source>Column should be indexed directly, not by expression. Either extend this expression to contain something more than just column name, or abort and select this column in index dialog directly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Столбец необходимо индексировать напрямую, а не выражением. Либо добавьте в выражение что-либо кроме имени столбца, либо отмените изменения и отметьте столбец непосредственно в окне индекса.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.cpp" line="76"/>
         <source>Column &apos;%1&apos; does not belong to the table covered by this index. Indexed expressions can refer only to columns from the indexed table.</source>
-        <translation type="unfinished"></translation>
+        <translation>Столбец &apos;%1&apos; не принадлежит к индексируемой таблице. Индексируемые выражения могут ссылаться только на столбцы индексируемой таблицы.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.cpp" line="84"/>
         <source>It&apos;s forbidden to use &apos;SELECT&apos; statements in indexed expressions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Запрещено использовать конструкции SELECT в индексируемых выражениях.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.cpp" line="105"/>
         <source>Enter an indexed expression.</source>
-        <translation type="unfinished"></translation>
+        <translation>Введите индексируемое выражение.</translation>
     </message>
     <message>
         <location filename="../dialogs/indexexprcolumndialog.cpp" line="119"/>
         <source>Invalid expression.</source>
-        <translation type="unfinished"></translation>
+        <translation>Некорректное выражение.</translation>
     </message>
 </context>
 <context>
@@ -3979,9 +4045,13 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
 <context>
     <name>MdiWindow</name>
     <message>
-        <location filename="../mdiwindow.cpp" line="199"/>
         <source>Uncommited changes</source>
-        <translation>Неподтверждённые изменения</translation>
+        <translation type="vanished">Неподтверждённые изменения</translation>
+    </message>
+    <message>
+        <location filename="../mdiwindow.cpp" line="199"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdiwindow.cpp" line="204"/>
@@ -4720,7 +4790,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     <message>
         <location filename="../sqleditor.h" line="43"/>
         <source>Toggle comment</source>
-        <translation type="unfinished"></translation>
+        <translation>Комментировать/раскомментировать</translation>
     </message>
     <message>
         <location filename="../uiutils.cpp" line="32"/>
@@ -4912,9 +4982,13 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
 <context>
     <name>QuitConfirmDialog</name>
     <message>
-        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
         <source>Uncommited changes</source>
-        <translation>Неподтверждённые изменения</translation>
+        <translation type="vanished">Неподтверждённые изменения</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="20"/>
@@ -5013,179 +5087,179 @@ find next</source>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation>Выделить всё</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation>Повторить</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation>Завершить</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation>Форматировать SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation>Сохранить SQL в файл</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation>Выбрать файл для сохранения SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation>Загрузить SQL из файла</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation>Удалить строчку</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation>Переместить блок вниз</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation>Переместить блок вверх</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation>Копировать блок вниз</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation>Копировать блок вверх</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation>Найти далее</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation>Найти предыдущее</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation>Заменить</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
-        <translation type="unfinished"></translation>
+        <translation>Комментировать/раскомментировать</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation>SQL-код сохранён в файле %1</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation>Дополнение синтаксиса может быть использовано только после назначения корректной базы данных редактору SQL.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation>Размер содержимого редактора SQL слишком велико, поэтому обнаружение ошибок и подсветка существующих объектов временно отключена.</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation>Сохранить в файл</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation>Невозможно открыть файл &apos;%1&apos; для записи: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation>Скрипты SQL (*.sql);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation>Невозможно открыть файл &apos;%1&apos; для чтения: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation>Достигнут конец документа. Нажмите Найти снова для перезапуска поиска.</translation>
     </message>
@@ -5217,12 +5291,11 @@ find next</source>
         <translation>Ограничения:</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
         <source>This cell is not editable, because: %1</source>
-        <translation>Эта ячейка нередактируема, причина: %1</translation>
+        <translation type="vanished">Эта ячейка нередактируема, причина: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation>Невозможно загрузить данные ячейки, которая ссылается на уже закрытую базу данных.</translation>
     </message>
@@ -5230,88 +5303,122 @@ find next</source>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
         <source>Cannot edit this cell. Details: %2</source>
-        <translation>Невозможно редактировать данную ячейку. Подробности: %2</translation>
+        <translation type="vanished">Невозможно редактировать данную ячейку. Подробности: %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
         <source>The row is marked for deletion.</source>
         <translation>Строка помечена для удаления.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
-        <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished">Невозможно редактировать данную ячейку. Подробности: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
+        <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
+        <translation>Внешний ключ для столбца %2 имеет более чем %1 возможных значений. Это слишком много для отображения в выпадающем списке. Вам необходимо ввести значение вручную.</translation>
+    </message>
 </context>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation>Одновременно может быть выполнен только один запрос.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
         <source>Uncommited data</source>
-        <translation>Неподтверждённые данные</translation>
+        <translation type="vanished">Неподтверждённые данные</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
         <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
-        <translation>Имеются неподтверждённые изменения данных. Вы действительно хотите продолжить? Все неподтверждённые изменения будут утеряны.</translation>
+        <translation type="vanished">Имеются неподтверждённые изменения данных. Вы действительно хотите продолжить? Все неподтверждённые изменения будут утеряны.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
         <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation>Невозможно подтвердить данные для ячейки, которая ссылается на уже закрытую базу данных.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
         <source>Could not begin transaction on the database. Details: %1</source>
         <translation>Невозможно начать транзакцию в базе данных. Подробности: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
         <source>An error occurred while commiting the transaction: %1</source>
-        <translation>При завершении транзакции возникла ошибка: %1</translation>
+        <translation type="vanished">При завершении транзакции возникла ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
         <source>An error occurred while rolling back the transaction: %1</source>
         <translation>При отмене транзакции возникла ошибка: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
         <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation>Попытка подтверждения данных для нередактируемой ячейки (которая тем не менее была изменена и ожидает подтверждения). Это программная ошибка. Пожалуйста, отправьте о ней отчёт.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
         <source>An error occurred while commiting the data: %1</source>
-        <translation>При подтверждении данных произошла ошибка: %1</translation>
+        <translation type="vanished">При подтверждении данных произошла ошибка: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation>Ошибка при выполнении SQL запроса к базе данных &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation>Ошибка при загрузке результатов запроса: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation>Вставить несколько строк</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation>Количество вставляемых строк:</translation>
     </message>
@@ -5319,117 +5426,117 @@ find next</source>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
-        <translation type="unfinished"></translation>
+        <translation>Перейти к связанной строке в...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation>Копировать как...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation>Вставить как...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation>Установить значения на NULL</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation>Стереть содержимое</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation>Править содержимое в редакторе</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation>Подтвердить</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation>Откатить</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation>Подтвердить выбранные ячейки</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation>Откатить выбранные ячейки</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation>Определить столбцы для сортировки</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation>Сбросить указанную сортировку</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation>Вставить строку</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation>Вставить несколько строк</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation>Удалить выбранную строку</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Сгенерировать запрос для выбранных ячеек</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation>Не выбраны элементы для вставки в них содержимого буфера обмена.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Перейти к связанной строке в таблице &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>таблица &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Связанная строка (%1)</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation>Править содержимое</translation>
     </message>
@@ -5437,12 +5544,16 @@ find next</source>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
         <source>Error while commiting new row: %1</source>
-        <translation>Ошибка при подтверждении новой строки: %1</translation>
+        <translation type="vanished">Ошибка при подтверждении новой строки: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation>Ошибка при удалении строки из таблицы %1: %2</translation>
     </message>
@@ -5651,39 +5762,42 @@ but it&apos;s okay to use them anyway.</source>
         <source>Primary
 Key</source>
         <comment>table structure columns</comment>
-        <translation type="unfinished"></translation>
+        <translation>Первичный
+ключ</translation>
     </message>
     <message>
         <location filename="../windows/tablestructuremodel.cpp" line="307"/>
         <source>Foreign
 Key</source>
         <comment>table structure columns</comment>
-        <translation type="unfinished"></translation>
+        <translation>Внешний
+ключ</translation>
     </message>
     <message>
         <location filename="../windows/tablestructuremodel.cpp" line="309"/>
         <source>Unique</source>
         <comment>table structure columns</comment>
-        <translation type="unfinished">Уникальность</translation>
+        <translation>Уникальность</translation>
     </message>
     <message>
         <location filename="../windows/tablestructuremodel.cpp" line="311"/>
         <source>Check</source>
         <comment>table structure columns</comment>
-        <translation type="unfinished">Проверка</translation>
+        <translation>Проверка</translation>
     </message>
     <message>
         <location filename="../windows/tablestructuremodel.cpp" line="313"/>
         <source>Not
 NULL</source>
         <comment>table structure columns</comment>
-        <translation type="unfinished"></translation>
+        <translation>Не
+NULL</translation>
     </message>
     <message>
         <location filename="../windows/tablestructuremodel.cpp" line="315"/>
         <source>Collate</source>
         <comment>table structure columns</comment>
-        <translation type="unfinished">Сравнение</translation>
+        <translation>Сравнение</translation>
     </message>
     <message>
         <location filename="../windows/tablestructuremodel.cpp" line="317"/>
@@ -5706,7 +5820,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation>Данные</translation>
     </message>
@@ -5731,194 +5845,194 @@ NULL</source>
         <translation>DDL</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation>Экспортировать таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation>Импортировать данные в таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation>Заполнить таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation>Обновить структуру</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation>Подтвердить изменения структуры</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation>Откатить изменения структуры</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation>Добавить столбец</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation>Редактировать столбец</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation>Удалить столбец</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation>Переместить столбец вверх</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation>Переместить столбец вниз</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation>Создать подобную таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation>Сбросить счётчик автоинкремента</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation>Добавить ограничение на таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation>Редактировать ограничение на таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation>Удалить ограничение на таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation>Переместить ограничение на таблицу вверх</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation>Переместить ограничение на таблицу вниз</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation>Добавить первичный ключ таблицы</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation>Добавить внешний ключ таблицы</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation>Добавить табличное ограничение на уникальность</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation>Добавить проверочное ограничение на таблицу</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation>Обновить список индексов</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation>Создать индекс</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation>Редактировать индекс</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation>Удалить индекс</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation>Обновить список триггеров</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation>Создать триггер</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation>Редактировать триггер</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation>Удалить триггер</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation>Вы действительно хотите удалить столбец &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
@@ -5926,42 +6040,83 @@ Would you like to proceed?</source>
 Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation>Изменение таблицы</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation>Невозможно загрузить данные таблицы %1. Подробности ошибки: %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation>Не удалось корректно обработать таблицу %1. Невозможно открыть окно таблицы.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation>Невозможно восстановить окно %1, так как в сессии для этого окна не была сохранена база данных или таблица.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation>Невозможно восстановить окно &apos;%1&apos;, так как в сессии для этого окна не была сохранена база данных или таблица.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation>Невозможно восстановить окно &apos;%1&apos;, так как невозможно определить базу данных %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation>Невозможно восстановить окно &apos;%1&apos;, так как таблица %2 не существует в базе данных %3.</translation>
     </message>
     <message>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Could not restore window, because database %1 could not be resolved.</source>
         <translation type="obsolete">Невозможно восстановить окно, так как невозможно определить базу данных %1</translation>
     </message>
@@ -5970,180 +6125,172 @@ Would you like to proceed?</source>
         <translation type="obsolete">Невозможно восстановить окно, так как таблица %1 не существует в базе данных %2.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation>Новая таблица %1</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
         <source>Commited changes for table &apos;%1&apos; successfly.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Изменения в таблицу &apos;%1&apos; внесены успешно.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
         <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Изменения в таблицу &apos;%1&apos; (предыдущее название &apos;%2&apos;) внесены успешно.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation>Невозможно подтвердить структуру таблицы. Сообщение об ошибке: %1</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation>Сброс счётчика автоинкремента</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Вы действительно хотите сбросить счётчик автоинкремента у таблицы &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>При попытке сброса счётчика автоинкремента у таблицы &apos;%1&apos; произошла ошибка: %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>Сброс счётчика автоинкремента у таблицы &apos;%1&apos; успешно выполнен.</translation>
+        <translation type="vanished">Сброс счётчика автоинкремента у таблицы &apos;%1&apos; успешно выполнен.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation>Пустое имя</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation>SQLite позволяет таблице иметь пустое имя, хотя это не рекомендуется.
 Вы действительно хотите создать таблицу с пустым именем?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation>Невозможно создать таблицу без хотя бы одного столбца.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation>Невозможно создать таблицу %1, если не определён первичный ключ. Отключите %2, либо определите первичный ключ.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation>Невозможно использовать автоинкремент первичного ключа при использовании оператора %1. Отключите либо %2, либо автоинкремент первичного ключа.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation>Вы действительно хотите удалить ограничение на таблицу &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation>Удалить ограничение</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Невозможно произвести экспорт, т.к. не загружено ни одного модуля экспорта.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>Невозможно произвести импорт, т.к. не загружено ни одного модуля импорта.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
         <source>Uncommited changes</source>
-        <translation>Неподтверждённые изменения</translation>
+        <translation type="vanished">Неподтверждённые изменения</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура таблицы не подтверждена.
+        <translation type="vanished">Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура таблицы не подтверждена.
 Подтвердить структуру таблицы или вернуться на вкладку структуры?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation>Вернуться на вкладку структуры</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation>Подтвердить изменения и перейти к данным.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation>Уникальность</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation>Столбцы</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation>Условие для частичного индекса</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation>Событие</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation>Условие</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>В окне таблицы &quot;%1&quot; имеются неподтверждённые изменения структуры и данных.</translation>
+        <translation type="vanished">В окне таблицы &quot;%1&quot; имеются неподтверждённые изменения структуры и данных.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
         <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation>В окне таблицы &quot;%1&quot; имеются неподтверждённые изменения данных.</translation>
+        <translation type="vanished">В окне таблицы &quot;%1&quot; имеются неподтверждённые изменения данных.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>В окне таблицы &quot;%1&quot; имеются неподтверждённые изменения структуры.</translation>
+        <translation type="vanished">В окне таблицы &quot;%1&quot; имеются неподтверждённые изменения структуры.</translation>
     </message>
 </context>
 <context>
@@ -6158,6 +6305,16 @@ Do you want to commit the structure, or do you want to go back to the structure
         <source>Triggering columns:</source>
         <translation>Столбцы, вызывающие триггер:</translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished">Снять выделение</translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6249,13 +6406,13 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation>Введите корректный код триггера.</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation>При выполнении конструкций SQL произошла ошибка:
@@ -6300,11 +6457,11 @@ Do you want to commit the structure, or do you want to go back to the structure
     <message>
         <location filename="../windows/viewwindow.ui" line="113"/>
         <source>Output column names</source>
-        <translation type="unfinished"></translation>
+        <translation>Отображаемые имена столбцов</translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation>Данные</translation>
     </message>
@@ -6358,220 +6515,249 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation>Новое представление %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation>Обновить представление</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation>Подтвердить изменения представления</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation>Откатить изменения представления</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
-        <translation type="unfinished"></translation>
+        <translation>Явные имена столбцов</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
-        <translation type="unfinished"></translation>
+        <translation>Сгенерировать отображаемые имена столбцов на основе результирующих столбцов представления.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
-        <translation type="unfinished">Добавить столбец</translation>
+        <translation>Добавить столбец</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
-        <translation type="unfinished">Редактировать столбец</translation>
+        <translation>Редактировать столбец</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
-        <translation type="unfinished">Удалить столбец</translation>
+        <translation>Удалить столбец</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
-        <translation type="unfinished">Переместить столбец вверх</translation>
+        <translation>Переместить столбец вверх</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
-        <translation type="unfinished">Переместить столбец вниз</translation>
+        <translation>Переместить столбец вниз</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation>Обновить список триггеров</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation>Создать новый триггер</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation>Редактировать выбранный триггер</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation>Удалить выбранный триггер</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
+        <location filename="../windows/viewwindow.cpp" line="361"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="363"/>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>В окне представления &quot;%1&quot; имеются неподтверждённые изменения структуры и данных.</translation>
+        <translation type="vanished">В окне представления &quot;%1&quot; имеются неподтверждённые изменения структуры и данных.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="361"/>
         <source>View window &quot;%1&quot; has uncommited data.</source>
-        <translation>В окне представления &quot;%1&quot; имеются неподтверждённые изменения данных.</translation>
+        <translation type="vanished">В окне представления &quot;%1&quot; имеются неподтверждённые изменения данных.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="363"/>
         <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>В окне представления &quot;%1&quot; имеются неподтверждённые изменения структуры.</translation>
+        <translation type="vanished">В окне представления &quot;%1&quot; имеются неподтверждённые изменения структуры.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
         <source>Could not load data for view %1. Error details: %2</source>
         <translation>Невозможно загрузить данные представления %1. Подробности ошибки: %2</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
         <source>Uncommited changes</source>
-        <translation>Неподтверждённые изменения</translation>
+        <translation type="vanished">Неподтверждённые изменения</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура представления не подтверждена.
+        <translation type="vanished">Имеются неподтверждённые изменения структуры. Невозможно просматривать или редактировать данные, пока структура представления не подтверждена.
 Подтвердить структуру представления или вернуться на вкладку структуры?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Go back to structure tab</source>
         <translation>Вернуться на вкладку структуры</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Commit modifications and browse data.</source>
         <translation>Подтвердить изменения и перейти к данным.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
         <source>Commited changes for view &apos;%1&apos; successfly.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Изменения в представление &apos;%1&apos; внесены успешно.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
         <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Изменения в представление &apos;%1&apos; (предыдущее название &apos;%2&apos;) внесены успешно.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation>Невозможно подтвердить изменения представления. Сообщение об ошибке: %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезапись столбцов</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Заданные столбцы будут перезаписаны. Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно определить столбцы, возвращаемые представлением. Вероятно запрос неполон или содержит ошибки.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation>Вместо</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation>Условие</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation>Не удалось корректно обработать представление %1. Невозможно открыть окно представления.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation>Пустое имя</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation>SQLite позволяет представлению иметь пустое имя, хотя это не рекомендуется.
 Вы действительно хотите создать представление с пустым именем?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation>Невозможно проанализировать структуру конструкции SELECT. Пожалуйста, исправьте запрос и повторите попытку.
 Подробности: %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation>Невозможно изменить представление из-за внутренней ошибки SQLiteStudio. Пожалуйста, сообщите о ней!</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation>Невозможно корректно проанализировать структуру представления для выполнения. Это ошибка SQLiteStudio. Пожалуйста, сообщите о ней.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
@@ -6579,7 +6765,7 @@ Would you like to proceed?</source>
 Вы хотите продолжить?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation>Изменение представления</translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm
index ac0f46e..6490cf2 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.qm
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts
index e6625c1..8703dc7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_sk.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sk_SK">
+<TS version="2.1" language="sk_SK">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -431,8 +431,12 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
+        <source>Collations editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Collations editor window has uncommited modifications.</source>
-        <translation>Okno editora porovnávaní obsahuje nepotvrdené zmeny.</translation>
+        <translation type="vanished">Okno editora porovnávaní obsahuje nepotvrdené zmeny.</translation>
     </message>
 </context>
 <context>
@@ -509,12 +513,12 @@
     <message>
         <location filename="../dialogs/columndialog.ui" line="35"/>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozsah</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="55"/>
         <source>Precision</source>
-        <translation type="unfinished"></translation>
+        <translation>Presnosť</translation>
     </message>
     <message>
         <location filename="../dialogs/columndialog.ui" line="62"/>
@@ -905,7 +909,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation>Konfigurácia</translation>
     </message>
@@ -967,17 +971,17 @@ but it&apos;s okay to use it.</source>
     <message>
         <location filename="../dialogs/configdialog.ui" line="351"/>
         <source>Database dialog window</source>
-        <translation type="unfinished"></translation>
+        <translation>Databázové dialógové okno</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="357"/>
         <source>&lt;p&gt;When adding new database it is marked to be &quot;permanent&quot; (stored in configuration) by default. Checking this option makes every new database to NOT be &quot;permanent&quot; by default.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Označením tejto možnosti sa vypne voľba &quot;Zapamätať si databázu&quot; v okne pridávania novej databázy&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="360"/>
         <source>Do not mark database to be &quot;permanent&quot; by default</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepamätať si databázu</translation>
     </message>
     <message>
         <location filename="../dialogs/configdialog.ui" line="370"/>
@@ -995,215 +999,234 @@ but it&apos;s okay to use it.</source>
         <translation>Prezeranie a úprava dát</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation>Počet data riadkov na stranu:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation>Datové typy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation>Dostupné editory:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation>Úprava schémy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation>Počet DDL zmien uchovávaných v histórii.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation>Veľkosť DDL histórie:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
         <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation>Nezobrazovať náhľad DDL pri potvrdzovaní zmien v schéme</translation>
+        <translation type="vanished">Nezobrazovať náhľad DDL pri potvrdzovaní zmien v schéme</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation>SQL dotazy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation>Počet dotazov uchovávaných v histórii.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation>Veľkosť SQL histórie:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ak je v SQL editore viacej ako jeden dotaz, potom(ak je táto voľba zapnutá) bude vykonaný iba jeden dotaz - ten, na ktorom je kurzor. Ináč budú vykonané všetky dotazy. Vždy si viete vybrať ktoré dotazy budú vykonané a to ich výberom\označením.&lt;/p&gt; </translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation>Vykonať len dotaz, na ktorom stojí kurzor</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation>Aktualizácie</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation>Kontrolovať aktualizácie pri štarte</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation>Sedenie</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation>Obnoviť posledné sedenie (aktívne okná) pri štarte</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation>Filtrovať podľa názvu alebo klávesovej skratky</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation>Akcia</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation>Klávesová skratka</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation>Jazyk</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation>Je potrebné reštartovať aplikáciu aby sa zmena jazyka prejavila.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1279,7 +1302,7 @@ but it&apos;s okay to use it.</source>
         <translation>Zobraziť systémové tabuľky a indexy v zozname</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation>Okná tabuľky</translation>
     </message>
@@ -1288,12 +1311,12 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">Ak je táto možnosť zaškrtnutá, tak sa v okne zobrazia dáta a nie štruktúra tabuľky.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation>Zobraziť dáta po otvorení tabuľky</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation>Okná pohľadov</translation>
     </message>
@@ -1302,227 +1325,244 @@ but it&apos;s okay to use it.</source>
         <translation type="obsolete">Ak je táto možnosť zaškrtnutá, tak sa v okne zobrazia dáta a nie SQL dotaz.</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation>Zobraziť dáta po otvorení pohľadu</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation>Nezobrazovať interné pluginy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation>Aktuálny štýl:</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation>Náhľad</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation>Zapnutý</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation>Vypnutý</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation>Aktívny formátovací plugin</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation>Písmo SQL editora</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation>Font zoznamu databáz</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation>Font doplnkového popisku</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation>Font dát</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation>Font status okna</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation>Farby SQL editora</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation>Farba BLOB hodnoty</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation>Farby dát</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Všetky zmeny dát budú ohraničené touto farbou, dokiaľ nebudú potvrdené.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;Všetky zmeny dát budú ohraničené touto farbou, dokiaľ nebudú potvrdené.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
         <source>Uncommited data outline color</source>
-        <translation>Farba rámčeka nepotvrdených dát</translation>
+        <translation type="vanished">Farba rámčeka nepotvrdených dát</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
         <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;V prípade chyby pri potvrdzovaní zmien dát, budú problematické bunky ohraničené touto farbou.&lt;/p&gt;</translation>
+        <translation type="vanished">&lt;p&gt;V prípade chyby pri potvrdzovaní zmien dát, budú problematické bunky ohraničené touto farbou.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation>Farba rámčeka s chybou potvrdenia dát</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation>Farba NULL hodnoty</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation>Pozadie vymazaného riadka</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation>Farby zoznamu databáz</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation>Farba doplnkového popisku</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation>Farby status okna</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation>Farba informačnej správy</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation>Farba upozornenia</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation>Farba chybovej správy</translation>
     </message>
@@ -2014,22 +2054,21 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
         <translation>Databázový ovládač</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
         <source>Generate automatically</source>
-        <translation>Generovať automaticky</translation>
+        <translation type="vanished">Generovať automaticky</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation>Voľby</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation>Zapamätať si databázu</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation>Test spojenia</translation>
     </message>
@@ -2052,7 +2091,7 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation>Súbor</translation>
     </message>
@@ -2062,16 +2101,15 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
         <translation>Názov (v zozname)</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
         <source>Generate name basing on file path</source>
-        <translation>Generovať názov na základe cesty k súboru</translation>
+        <translation type="vanished">Generovať názov na základe cesty k súboru</translation>
     </message>
     <message>
         <source>Permanent</source>
         <translation type="obsolete">Uložiť natrvalo</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation>&lt;p&gt;Databáza sa uloží do konfiguračného súboru a bude obnovená pri každom spustení SQLiteStudia.&lt;/p&gt;</translation>
@@ -2081,17 +2119,17 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
         <translation type="obsolete">Otestovať spojenie s databázou</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation>Hľadať databázový súbor na lokálnom počítači</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation>Prehľadávať</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation>Zadajte názov databázy.</translation>
     </message>
@@ -2101,33 +2139,36 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
         <translation>Tento názov už existuje. Prosím zadajte iný názov.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
         <source>Enter a database file path.</source>
         <translation>Zadajte cestu k databázovému súboru.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
         <source>This database is already on the list under name: %1</source>
         <translation>Táto databáza už je v zozname pod názvom: %1</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
         <source>Select a database type.</source>
         <translation>Vyberte typ databázy.</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
         <source>Auto-generated</source>
-        <translation>Automaticky vygenerovaný</translation>
+        <translation type="vanished">Automaticky vygenerovaný</translation>
     </message>
     <message>
         <source>The name will be auto-generated</source>
         <translation type="obsolete">Názov bude vygenerovaný automaticky</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
         <source>Type the name</source>
-        <translation>Zadajte meno</translation>
+        <translation type="vanished">Zadajte meno</translation>
     </message>
 </context>
 <context>
@@ -2415,7 +2456,7 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation>Vymazať dáta z tabuľky</translation>
     </message>
@@ -2436,55 +2477,65 @@ Prezeranie ďalších strán bude možné až po dokončení spočítavania.</tr
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation>Vytvoriť skupinu</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation>Názov skupiny</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation>Položka s názvom %1 už existuje v skupine %2.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation>Vymazať skupinu</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation>Ste si istý, že chcete vymazať skupinu %1?
 Všetky objekty z tejto skupiny budú presunuté do nadradenej skupiny.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Delete database</source>
         <translation type="obsolete">Odstrániť databázu</translation>
     </message>
@@ -2493,14 +2544,14 @@ Všetky objekty z tejto skupiny budú presunuté do nadradenej skupiny.</transla
         <translation type="obsolete">Ste si istý, že chcete odstrániť databázu &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>Nemôžem importovať, lebo nebol načítaný žiaden plugin na import.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Nemôžem exportovať, lebo nebol načítaný žiaden plugin na export.</translation>
     </message>
@@ -2513,67 +2564,61 @@ Všetky objekty z tejto skupiny budú presunuté do nadradenej skupiny.</transla
         <translation type="obsolete">VACUUM úspešne skončilo.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
         <source>Integrity check (%1)</source>
         <translation>Kontrola integrity (%1)</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Reset autoincrement</source>
         <translation>Resetovať autoinkrement</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Ste si istý, že chcete zresetovať hodnotu autoinkrementu pre tabuľku %1 ?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>Vyskytla sa chyba pri pokuse o zresetovanie hodnoty autoinkrementu pre tebuľku &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
         <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
-        <translation>Ste si istý, že chcete vymazať všetky dáta z tabuľky &apos;%1&apos;?</translation>
+        <translation type="vanished">Ste si istý, že chcete vymazať všetky dáta z tabuľky &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation>Vyskytla sa chyba pri pokuse vymazať dáta z tabuľky &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation>Všetky dáta z tabuľky &apos;%1&apos; boli vymazané.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation>Nasledujúce objekty budú odstránené: %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation>Nasledujúce databázy budú odstránené zo zoznamu: %1.</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation>%1&lt;br&gt;&lt;br&gt;Ste si istý, že chcete pokračovať?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation>Odstránenie objektov</translation>
     </message>
@@ -2842,78 +2887,82 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
         <translation>Vytvoriť pohľad z dotazu</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation>Predchádzajúca databáza</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation>Nasledujúca databáza</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation>Zobraziť nasledujúcu záložku</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation>Zobraziť predchádzajúcu záložku</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation>Aktívna databáza (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation>Dotaz trval %1 sekúnd. Počet dotknutých riadkov: %2</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation>Dotaz trval %1 sekúnd.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation>Vymazať históriu dotazov</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation>Ste si istý, že chete vymazať celú históriu SQL dotazov? Túto operáciu nieje možné vrátiť späť.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>Nemôžem exportovať, lebo nebol načítaný žiaden plugin na export.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation>Nebola vybraná žiadna databáza v SQL editore. Nemôžem vytvoriť view pre neznámu databázu.</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Editor window &quot;%1&quot; has uncommited data.</source>
-        <translation>Okno editora &quot;%1&quot; obsahuje nepotrdené dáta.</translation>
+        <translation type="vanished">Okno editora &quot;%1&quot; obsahuje nepotrdené dáta.</translation>
     </message>
 </context>
 <context>
@@ -3369,7 +3418,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
-        <source>Functions editor window has uncommited modifications.</source>
+        <source>Functions editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3968,9 +4017,13 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
 <context>
     <name>MdiWindow</name>
     <message>
-        <location filename="../mdiwindow.cpp" line="199"/>
         <source>Uncommited changes</source>
-        <translation>Nepotvrdené zmeny</translation>
+        <translation type="vanished">Nepotvrdené zmeny</translation>
+    </message>
+    <message>
+        <location filename="../mdiwindow.cpp" line="199"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdiwindow.cpp" line="204"/>
@@ -4901,9 +4954,13 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
 <context>
     <name>QuitConfirmDialog</name>
     <message>
-        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
         <source>Uncommited changes</source>
-        <translation>Nepotvrdené zmeny</translation>
+        <translation type="vanished">Nepotvrdené zmeny</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="20"/>
@@ -5001,179 +5058,179 @@ nájsť ďalší</translation>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation>Vystrihnúť</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation>Kopírovať</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation>Vložiť</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation>Vymazať</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation>Vybrať všetko</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation>Formátovať SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation>Uložiť SQL do súboru</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation>Načítať SQL zo súboru</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation>Vymazať riadok</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation>Nájsť</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation>Nájsť ďalší</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation>Nájsť predchádzajúci</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation>Nahradiť</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation>Uložiť do súboru</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation>Nemôžem otvoriť súbor &apos;%1&apos; pre zápis: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation>Nemôžem otvoriť súbor &apos;%1&apos; na čítanie: %2</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation>Dosiahnutý koniec súboru. Kliknite na tlačidlo Nájsť pre hľadanie od začiatku súboru.</translation>
     </message>
@@ -5205,12 +5262,11 @@ nájsť ďalší</translation>
         <translation>Obmedzenia:</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
         <source>This cell is not editable, because: %1</source>
-        <translation>Táto bunka nieje editovateľná, pretože: %1</translation>
+        <translation type="vanished">Táto bunka nieje editovateľná, pretože: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5218,18 +5274,32 @@ nájsť ďalší</translation>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
-        <source>Cannot edit this cell. Details: %2</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <source>The row is marked for deletion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <source>The row is marked for deletion.</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5237,69 +5307,85 @@ nájsť ďalší</translation>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation>Nemôže byť spustených viacero dotazov súčasne.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
         <source>Uncommited data</source>
-        <translation>Nepotvrdené dáta</translation>
+        <translation type="vanished">Nepotvrdené dáta</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
         <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
-        <translation>Sú tu nepotvrdené zmeny. Chcete aj napriek tomu pokračovať? Všetky nepotvrdené zmeny budú stratené.</translation>
+        <translation type="vanished">Sú tu nepotvrdené zmeny. Chcete aj napriek tomu pokračovať? Všetky nepotvrdené zmeny budú stratené.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
         <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation>Nemôžem potrdiť dáta bunky, ktorá odkazuje na už uzatvorenú databázu.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
         <source>Could not begin transaction on the database. Details: %1</source>
         <translation>Nemôžem začať tranzakciu na databáze. Detaily: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
         <source>An error occurred while commiting the transaction: %1</source>
-        <translation>Vyskytla sa chyba počas potvrdzovania tranzakcie: %1</translation>
+        <translation type="vanished">Vyskytla sa chyba počas potvrdzovania tranzakcie: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
         <source>An error occurred while rolling back the transaction: %1</source>
         <translation>Vyskytla sa chyba počas vracania späť tranzakcie: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
         <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation>Nastal pokus o potvrdenie zmien v bunke, ktorú nieje možné upravovať (napriek tomu bola upravená a čaká na potvrdenie)! Toto je chyba. Prosím nahláste ju.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
         <source>An error occurred while commiting the data: %1</source>
-        <translation>Vyskytla sa chyba počas potvrdzovania dát: %1</translation>
+        <translation type="vanished">Vyskytla sa chyba počas potvrdzovania dát: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation>Vyskytla sa chyba počas vykonávania SQL dotazu na databáze &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation>Vyskytla sa chyba počas načítavania výsledkov dotazu: %1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation>Vložiť viacero riadkov</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation>Počet vkládaných riadkov:</translation>
     </message>
@@ -5307,117 +5393,117 @@ nájsť ďalší</translation>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation>Kopírovať</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation>Kopírovať ako...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation>Vložiť</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation>Vložiť ako...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation>Nastaviť null hodnoty</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation>Vymazať hodnoty</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation>Upraviť hodnotu v editory</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation>Potvrdiť</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation>Vrátiť späť</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation>Potvrdiť vybrané bunky</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation>Vrátiť späť vybrané bunky</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation>Vybrať stĺpce na zoradenie podľa</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation>Odstrániť užívateľské triedenie</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation>Vložiť riadok</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation>Vložiť viacero riadkov</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation>Vymazať viacero riadkov</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation>Neboli vybrané žiadne položky na vloženie obsahu schránky.</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation>Upraviť hodnotu</translation>
     </message>
@@ -5425,12 +5511,16 @@ nájsť ďalší</translation>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
         <source>Error while commiting new row: %1</source>
-        <translation>Vyskytla sa chyba počas potvrdzovania nového riadka: %1</translation>
+        <translation type="vanished">Vyskytla sa chyba počas potvrdzovania nového riadka: %1</translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation>Vyskytla sa chyba počas mazania riadka z tabuľky %1: %2</translation>
     </message>
@@ -5693,7 +5783,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation>Dáta</translation>
     </message>
@@ -5718,409 +5808,430 @@ NULL</source>
         <translation>DDL</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation>Exportovať tabuľku</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation>Importovať dáta do tabuľky</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation>Naplniť tabuľku</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation>Obnoviť štruktúru</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation>Potvrdiť zmeny štruktúr</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation>Vrátiť späť zmeny štruktúr</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation>Pridať stĺpec</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation>Upraviť stĺpec</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation>Vymazať stĺpec</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation>Posunúť stĺpec hore</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation>Posunúť stĺpec dole</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation>Vytvoriť rovnakú tabuľku</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation>Resetovať hodnotu autoinkrementu</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation>Pridať obmedzenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation>Upraviť obmedzenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation>Vymazať obmedzenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation>Posunúť obmedzenie hore</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation>Posunúť obmedzenie dole</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation>Pridať primárny kľúč</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation>Pridať cudzí kľúč</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation>Pridať jedinečné obmedzenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation>Obnoviť zoznam indexov</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation>Vytvoriť index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation>Upraviť index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation>Vymazať index</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation>Obnoviť zoznam spúšťačov</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation>Vytvoriť spúšťač</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation>Upraviť spúšťač</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation>Vymazať spúšťač</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation>Ste si istý, že chcete vymazať stĺpec &apos;%1&apos; ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
-        <source>Commited changes for table &apos;%1&apos; successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
-        <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation>Resetovať autoinkrement</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>Ste si istý, že chcete zresetovať hodnotu autoinkrementu pre tabuľku %1 ?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>Vyskytla sa chyba pri pokuse o zresetovanie hodnoty autoinkrementu pre tebuľku &apos;%1&apos;: %2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
-        <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation>Ste si istý, že chcete vymazať obmedzenie &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation>Vymazať obmedzenie</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished">Nemôžem exportovať, lebo nebol načítaný žiaden plugin na export.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished">Nemôžem importovať, lebo nebol načítaný žiaden plugin na import.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
         <source>Uncommited changes</source>
-        <translation>Nepotvrdené zmeny</translation>
+        <translation type="vanished">Nepotvrdené zmeny</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná.
+        <translation type="vanished">Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná.
 Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation>Choď späť na záložku štruktúr</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation>Potvrdiť zmeny a prezerať dáta.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation>Názov</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation>Jedinečný</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation>Stĺpce</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation>Názov</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation>Udalosť</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation>Podmienka</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Detaily</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>V okne tabuľky %1 sú nepotvrdené zmeny štruktúry a dáta.</translation>
+        <translation type="vanished">V okne tabuľky %1 sú nepotvrdené zmeny štruktúry a dáta.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
         <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation>V okne tabuľky %1 sú nepotvrdené dáta.</translation>
+        <translation type="vanished">V okne tabuľky %1 sú nepotvrdené dáta.</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
         <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>V okne tabuľky %1 sú nepotvrdené zmeny štruktúry.</translation>
+        <translation type="vanished">V okne tabuľky %1 sú nepotvrdené zmeny štruktúry.</translation>
     </message>
 </context>
 <context>
@@ -6135,6 +6246,16 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?</
         <source>Triggering columns:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished">Vybrať všetko</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished">Zrušiť výber</translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6226,13 +6347,13 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?</
         <translation>Zadajte validný kód spúšťača.</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation type="unfinished">Chyba</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation type="unfinished"></translation>
@@ -6280,7 +6401,7 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?</
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation>Dáta</translation>
     </message>
@@ -6322,226 +6443,247 @@ Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?</
         <translation>Nový pohľad %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation>Obnoviť pohľad</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation>Potvrdiť zmeny v pohľade</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation>Vrátiť späť zmeny v pohľade</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation type="unfinished">Pridať stĺpec</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation type="unfinished">Upraviť stĺpec</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation type="unfinished">Vymazať stĺpec</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation type="unfinished">Posunúť stĺpec hore</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation type="unfinished">Posunúť stĺpec dole</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation>Obnoviť zoznam spúšťačov</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation>Vytvoriť nový spúšťač</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation>Upraviť vybraný spúšťač</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation>Vymazať vybraný spúšťač</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
+        <location filename="../windows/viewwindow.cpp" line="361"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="363"/>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation>Okno pohľadu &quot;%1&quot; obsahuje nepotrdené zmeny štruktúr a dát.</translation>
+        <translation type="vanished">Okno pohľadu &quot;%1&quot; obsahuje nepotrdené zmeny štruktúr a dát.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="361"/>
         <source>View window &quot;%1&quot; has uncommited data.</source>
-        <translation>Okno pohľadu &quot;%1&quot; obsahuje nepotrdené dáta.</translation>
+        <translation type="vanished">Okno pohľadu &quot;%1&quot; obsahuje nepotrdené dáta.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="363"/>
         <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation>Okno pohľadu &quot;%1&quot; obsahuje nepotrdené zmeny štruktúr.</translation>
+        <translation type="vanished">Okno pohľadu &quot;%1&quot; obsahuje nepotrdené zmeny štruktúr.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
         <source>Could not load data for view %1. Error details: %2</source>
         <translation>Nemôžem načítať dáta z pohľadu %1. Detaily chyby: %2</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
         <source>Uncommited changes</source>
-        <translation>Nepotvrdené zmeny</translation>
+        <translation type="vanished">Nepotvrdené zmeny</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
         <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation>Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná.
+        <translation type="vanished">Sú tu nepotvrdené zmeny štruktúr. Nemôžte prezerať alebo editovať dáta dokiaľ nebude štruktúra tabuľky jasná.
 Chcete potvrdiť štruktúru alebo sa chcete vrátiť do záložky štruktúr?</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Go back to structure tab</source>
         <translation>Choď späť na záložku štruktúr</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
         <source>Commit modifications and browse data.</source>
         <translation>Potvrdiť zmeny a prezerať dáta.</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
-        <source>Commited changes for view &apos;%1&apos; successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
-        <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation>Nemôžem potvrdiť zmeny v pohľade. Chyba: %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation>Názov</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation>Podmienka</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation>Detaily</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation>SELECT nemôže byť analyzovaný. Prosím opravte dotaz a skúste to znovu.
 Detaily: %1</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm
index 47beaf2..3201eff 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.qm
diff --git a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts
index e6a2c1d..53cd968 100644
--- a/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts
+++ b/SQLiteStudio3/guiSQLiteStudio/translations/guiSQLiteStudio_zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_CN">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -433,8 +433,12 @@
     </message>
     <message>
         <location filename="../windows/collationseditor.cpp" line="388"/>
+        <source>Collations editor window has uncommitted modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Collations editor window has uncommited modifications.</source>
-        <translation>排序规则编辑器存在未提交的改动。</translation>
+        <translation type="vanished">排序规则编辑器存在未提交的改动。</translation>
     </message>
 </context>
 <context>
@@ -907,7 +911,7 @@ but it&apos;s okay to use it.</source>
     <name>ConfigDialog</name>
     <message>
         <location filename="../dialogs/configdialog.ui" line="14"/>
-        <location filename="../dialogs/configdialog.ui" line="1491"/>
+        <location filename="../dialogs/configdialog.ui" line="1517"/>
         <source>Configuration</source>
         <translation>配置</translation>
     </message>
@@ -997,215 +1001,219 @@ but it&apos;s okay to use it.</source>
         <translation>流量和编辑数据</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="485"/>
         <source>Number of data rows per page:</source>
         <translation>每页的行数：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="450"/>
-        <location filename="../dialogs/configdialog.ui" line="460"/>
+        <location filename="../dialogs/configdialog.ui" line="424"/>
+        <location filename="../dialogs/configdialog.ui" line="453"/>
         <source>&lt;p&gt;When the data is read into grid view columns width is automatically adjusted. This value limits the initial width for the adjustment, but user can still resize the column manually over this limit.&lt;/p&gt;</source>
         <translation>&lt;p&gt;在以列表方式显示数据时，列宽度会自动调整。该值控制初始列宽度，之后您可以手动调整列宽度，不受此限制。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="453"/>
+        <location filename="../dialogs/configdialog.ui" line="427"/>
         <source>Limit initial data column width to (in pixels):</source>
         <translation>限制宽度（单位：像素）：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="479"/>
+        <location filename="../dialogs/configdialog.ui" line="472"/>
         <source>&lt;p&gt;When this is enabled and user holds mouse pointer over a cell in any data view (query results, a table data, a view data) a tooltip will appear with details about the cell - it includes details like column data type, constraints, ROWID and others.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="482"/>
+        <location filename="../dialogs/configdialog.ui" line="475"/>
         <source>Show column and row details tooltip in data view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <location filename="../dialogs/configdialog.ui" line="492"/>
+        <source>&lt;p&gt;When editing a cell which used to have NULL value and entering empty string as new value, then this option determinates whether the new value should remain NULL (have this option enabled), or should it be overwritten with empty string value (have this option disabled).&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="521"/>
         <source>Inserting new row in data grid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="501"/>
+        <location filename="../dialogs/configdialog.ui" line="527"/>
         <source>Before currently selected row</source>
         <translation>在已选列之前</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="517"/>
+        <location filename="../dialogs/configdialog.ui" line="543"/>
         <source>After currently selected row</source>
         <translation>在已选列之后</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="530"/>
+        <location filename="../dialogs/configdialog.ui" line="556"/>
         <source>At the end of data view</source>
         <translation>在数据显示区域的末尾</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="552"/>
+        <location filename="../dialogs/configdialog.ui" line="578"/>
         <source>&lt;p&gt;When enabled, Table Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="565"/>
+        <location filename="../dialogs/configdialog.ui" line="591"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every Table Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="568"/>
+        <location filename="../dialogs/configdialog.ui" line="594"/>
         <source>Place data tab as first tab in a Table Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="587"/>
+        <location filename="../dialogs/configdialog.ui" line="613"/>
         <source>&lt;p&gt;When enabled, View Windows will show up with the data tab, instead of the structure tab.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="600"/>
+        <location filename="../dialogs/configdialog.ui" line="626"/>
         <source>&lt;p&gt;When enabled the &quot;Data&quot; tab will be placed as first tab in every View Window, instead of being at second place.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="603"/>
+        <location filename="../dialogs/configdialog.ui" line="629"/>
         <source>Place data tab as first tab in a View Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="647"/>
+        <location filename="../dialogs/configdialog.ui" line="673"/>
         <source>Data types</source>
         <translation>数据类型</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="685"/>
+        <location filename="../dialogs/configdialog.ui" line="711"/>
         <source>Available editors:</source>
         <translation>可用的编辑器：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="701"/>
+        <location filename="../dialogs/configdialog.ui" line="727"/>
         <source>Editors selected for this data type:</source>
         <translation>已选的该数据类型编辑器：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="737"/>
+        <location filename="../dialogs/configdialog.ui" line="763"/>
         <source>Schema editing</source>
         <translation>架构编辑</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="749"/>
+        <location filename="../dialogs/configdialog.ui" line="775"/>
         <source>Number of DDL changes kept in history.</source>
         <translation>数据库定义（DDL）的更改历史记录数量。</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="762"/>
+        <location filename="../dialogs/configdialog.ui" line="788"/>
         <source>DDL history size:</source>
         <translation>数据库定义（DDL）历史大小：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="769"/>
         <source>Don&apos;t show DDL preview dialog when commiting schema changes</source>
-        <translation>当提交schema变动时不显示数据库定义（DDL）预览对话框</translation>
+        <translation type="vanished">当提交schema变动时不显示数据库定义（DDL）预览对话框</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="782"/>
+        <location filename="../dialogs/configdialog.ui" line="808"/>
         <source>SQL queries</source>
         <translation>SQL查询</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="794"/>
-        <location filename="../dialogs/configdialog.ui" line="807"/>
+        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="833"/>
         <source>Number of queries kept in the history.</source>
         <translation>查询历史记录数量。</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="810"/>
+        <location filename="../dialogs/configdialog.ui" line="836"/>
         <source>History size:</source>
         <translation>历史大小：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="817"/>
+        <location filename="../dialogs/configdialog.ui" line="843"/>
         <source>&lt;p&gt;If there is more than one query in the SQL editor window, then (if this option is enabled) only a single query will be executed - the one under the keyboard insertion cursor. Otherwise all queries will be executed. You can always limit queries to be executed by selecting those queries before calling to execute.&lt;/p&gt;</source>
         <translation>&lt;p&gt;如果SQL编辑器中有多个语句，如果启用该选项，只执行光标下的语句；反之则执行全部语句。另外您可以选择需要执行的语句来执行&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="820"/>
+        <location filename="../dialogs/configdialog.ui" line="846"/>
         <source>Execute only the query under the cursor</source>
         <translation>只执行光标下的语句</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="833"/>
+        <location filename="../dialogs/configdialog.ui" line="859"/>
         <source>Updates</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="839"/>
+        <location filename="../dialogs/configdialog.ui" line="865"/>
         <source>Automatically check for updates at startup</source>
         <translation>在启动时自己检查更新</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="852"/>
+        <location filename="../dialogs/configdialog.ui" line="878"/>
         <source>Session</source>
         <translation>会话</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="858"/>
+        <location filename="../dialogs/configdialog.ui" line="884"/>
         <source>Restore last session (active MDI windows) after startup</source>
         <translation>启动后恢复上一次会话。</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="871"/>
+        <location filename="../dialogs/configdialog.ui" line="897"/>
         <source>Status Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="877"/>
+        <location filename="../dialogs/configdialog.ui" line="903"/>
         <source>&lt;p&gt;When user manually closes the Status panel, this option makes sure that if any new message is printed in the Status panel it will be reopened. If it&apos;s disabled, then Status panel can only be open manually by the user from the &quot;View&quot; menu.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="880"/>
+        <location filename="../dialogs/configdialog.ui" line="906"/>
         <source>Always open Status panel when new message is printed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="922"/>
+        <location filename="../dialogs/configdialog.ui" line="948"/>
         <source>Filter shortcuts by name or key combination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="963"/>
+        <location filename="../dialogs/configdialog.ui" line="989"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="968"/>
+        <location filename="../dialogs/configdialog.ui" line="994"/>
         <source>Key combination</source>
         <translation>按键编定</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1012"/>
-        <location filename="../dialogs/configdialog.ui" line="1481"/>
+        <location filename="../dialogs/configdialog.ui" line="1038"/>
+        <location filename="../dialogs/configdialog.ui" line="1507"/>
         <source>Language</source>
         <translation>语言</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1018"/>
+        <location filename="../dialogs/configdialog.ui" line="1044"/>
         <source>Changing language requires application restart to take effect.</source>
         <translation>更改语言后，重启程序生效。</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1035"/>
+        <location filename="../dialogs/configdialog.ui" line="1061"/>
         <source>Compact layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1041"/>
+        <location filename="../dialogs/configdialog.ui" line="1067"/>
         <source>&lt;p&gt;Compact layout reduces all margins and spacing on the UI to minimum, making space for displaying more data. It makes the interface a little bit less aesthetic, but allows to display more data at once.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1044"/>
+        <location filename="../dialogs/configdialog.ui" line="1070"/>
         <source>Use compact layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1281,242 +1289,262 @@ but it&apos;s okay to use it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="546"/>
+        <location filename="../dialogs/configdialog.ui" line="495"/>
+        <source>Keep NULL value when entering empty value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="505"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable this to always enforce DEFAULT value when committing a NULL value for a column that has DEFAULT value defined, even though the column is allowed to contain NULL values.&lt;/p&gt;&lt;p&gt;Disable this option to use DEFAULT value exclusively when NULL value is committed for column with NOT NULL constraint.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="508"/>
+        <source>Use DEFAULT value (if defined), when committing NULL value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="572"/>
         <source>Table windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="555"/>
+        <location filename="../dialogs/configdialog.ui" line="581"/>
         <source>Open Table Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="581"/>
+        <location filename="../dialogs/configdialog.ui" line="607"/>
         <source>View windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="590"/>
+        <location filename="../dialogs/configdialog.ui" line="616"/>
         <source>Open View Windows with the data tab for start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1060"/>
+        <location filename="../dialogs/configdialog.ui" line="795"/>
+        <source>Don&apos;t show DDL preview dialog when committing schema changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/configdialog.ui" line="1086"/>
         <source>Main window dock areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1066"/>
+        <location filename="../dialogs/configdialog.ui" line="1092"/>
         <source>Left and right areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1086"/>
+        <location filename="../dialogs/configdialog.ui" line="1112"/>
         <source>Top and bottom areas occupy corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1208"/>
+        <location filename="../dialogs/configdialog.ui" line="1234"/>
         <source>Hide built-in plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1237"/>
+        <location filename="../dialogs/configdialog.ui" line="1263"/>
         <source>Current style:</source>
         <translation>当前风格：</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1254"/>
+        <location filename="../dialogs/configdialog.ui" line="1280"/>
         <source>Preview</source>
         <translation>预览</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1264"/>
+        <location filename="../dialogs/configdialog.ui" line="1290"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1437"/>
+        <location filename="../dialogs/configdialog.ui" line="1463"/>
         <source>Disabled</source>
         <translation>已禁用</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1486"/>
+        <location filename="../dialogs/configdialog.ui" line="1512"/>
         <source>Active formatter plugin</source>
         <translation>启用格式化插件</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1524"/>
+        <location filename="../dialogs/configdialog.ui" line="1550"/>
         <source>SQL editor font</source>
         <translation>SQL编辑器字体</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1540"/>
+        <location filename="../dialogs/configdialog.ui" line="1566"/>
         <source>Database list font</source>
         <translation>数据库字体</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1556"/>
+        <location filename="../dialogs/configdialog.ui" line="1582"/>
         <source>Database list additional label font</source>
         <translation>数据库额外标签字体</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1572"/>
+        <location filename="../dialogs/configdialog.ui" line="1598"/>
         <source>Data view font</source>
         <translation>数据浏览字体</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1588"/>
+        <location filename="../dialogs/configdialog.ui" line="1614"/>
         <source>Status field font</source>
         <translation>状态栏字体</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1646"/>
+        <location filename="../dialogs/configdialog.ui" line="1672"/>
         <source>SQL editor colors</source>
         <translation>SQL编辑器颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1652"/>
+        <location filename="../dialogs/configdialog.ui" line="1678"/>
         <source>Current line background</source>
         <translation>当前行的背景色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1659"/>
+        <location filename="../dialogs/configdialog.ui" line="1685"/>
         <source>&lt;p&gt;SQL strings are enclosed with single quote characters.&lt;/p&gt;</source>
         <translation>&lt;p&gt;单引号内的SQL字符串&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1662"/>
+        <location filename="../dialogs/configdialog.ui" line="1688"/>
         <source>String foreground</source>
         <translation>字符串颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1765"/>
+        <location filename="../dialogs/configdialog.ui" line="1791"/>
         <source>&lt;p&gt;Bind parameters are placeholders for values yet to be provided by the user. They have one of the forms:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;:param_name&lt;/li&gt;&lt;li&gt;$param_name&lt;/li&gt;&lt;li&gt;@param_name&lt;/li&gt;&lt;li&gt;?&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1768"/>
+        <location filename="../dialogs/configdialog.ui" line="1794"/>
         <source>Bind parameter foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1791"/>
+        <location filename="../dialogs/configdialog.ui" line="1817"/>
         <source>Highlighted parenthesis background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1798"/>
+        <location filename="../dialogs/configdialog.ui" line="1824"/>
         <source>&lt;p&gt;BLOB values are binary values represented as hexadecimal numbers, like:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;X&apos;12B4&apos;&lt;/li&gt;&lt;li&gt;x&apos;46A2F4&apos;&lt;/li&gt;&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1801"/>
+        <location filename="../dialogs/configdialog.ui" line="1827"/>
         <source>BLOB value foreground</source>
         <translation>BLOB值的颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1808"/>
+        <location filename="../dialogs/configdialog.ui" line="1834"/>
         <source>Regular foreground</source>
         <translation type="unfinished">背景色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1815"/>
+        <location filename="../dialogs/configdialog.ui" line="1841"/>
         <source>Line numbers area background</source>
         <translation>行号的背景色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1838"/>
+        <location filename="../dialogs/configdialog.ui" line="1864"/>
         <source>Keyword foreground</source>
         <translation>关键字的颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1845"/>
+        <location filename="../dialogs/configdialog.ui" line="1871"/>
         <source>Number foreground</source>
         <translation>数字颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1852"/>
+        <location filename="../dialogs/configdialog.ui" line="1878"/>
         <source>Comment foreground</source>
         <translation>注释颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1891"/>
+        <location filename="../dialogs/configdialog.ui" line="1917"/>
         <source>&lt;p&gt;Valid objects are name of tables, indexes, triggers, or views that exist in the SQLite database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1894"/>
+        <location filename="../dialogs/configdialog.ui" line="1920"/>
         <source>Valid objects foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1920"/>
+        <location filename="../dialogs/configdialog.ui" line="1946"/>
         <source>Data view colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1926"/>
-        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re commited to the database.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1952"/>
+        <source>&lt;p&gt;Any data changes will be outlined with this color, until they&apos;re committed to the database.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1929"/>
-        <source>Uncommited data outline color</source>
+        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <source>Uncommitted data outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1952"/>
-        <source>&lt;p&gt;In case of error while commiting data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
+        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <source>&lt;p&gt;In case of error while committing data changes, the problematic cell will be outlined with this color.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1955"/>
+        <location filename="../dialogs/configdialog.ui" line="1981"/>
         <source>Commit error outline color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="1978"/>
+        <location filename="../dialogs/configdialog.ui" line="2004"/>
         <source>NULL value foreground</source>
         <translation>NULL值的颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2001"/>
+        <location filename="../dialogs/configdialog.ui" line="2027"/>
         <source>Deleted row background</source>
         <translation>已删除行的背景色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2027"/>
+        <location filename="../dialogs/configdialog.ui" line="2053"/>
         <source>Database list colors</source>
         <translation>数据库列表颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2033"/>
+        <location filename="../dialogs/configdialog.ui" line="2059"/>
         <source>&lt;p&gt;Additional labels are those which tell you SQLite version, number of objects deeper in the tree, etc.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2036"/>
+        <location filename="../dialogs/configdialog.ui" line="2062"/>
         <source>Additional labels foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2062"/>
+        <location filename="../dialogs/configdialog.ui" line="2088"/>
         <source>Status field colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2068"/>
+        <location filename="../dialogs/configdialog.ui" line="2094"/>
         <source>Information message foreground</source>
         <translation>信息颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2091"/>
+        <location filename="../dialogs/configdialog.ui" line="2117"/>
         <source>Warning message foreground</source>
         <translation>警告信息颜色</translation>
     </message>
     <message>
-        <location filename="../dialogs/configdialog.ui" line="2114"/>
+        <location filename="../dialogs/configdialog.ui" line="2140"/>
         <source>Error message foreground</source>
         <translation>错误信息颜色</translation>
     </message>
@@ -2007,22 +2035,17 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation>数据库驱动</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="95"/>
-        <source>Generate automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="108"/>
+        <location filename="../dialogs/dbdialog.ui" line="91"/>
         <source>Options</source>
         <translation>选项</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="117"/>
+        <location filename="../dialogs/dbdialog.ui" line="100"/>
         <source>Permanent (keep it in configuration)</source>
         <translation>记住该数据库</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="161"/>
+        <location filename="../dialogs/dbdialog.ui" line="144"/>
         <source>Test connection</source>
         <translation>测试连接</translation>
     </message>
@@ -2041,7 +2064,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dialogs/dbdialog.ui" line="42"/>
-        <location filename="../dialogs/dbdialog.cpp" line="156"/>
+        <location filename="../dialogs/dbdialog.cpp" line="154"/>
         <source>File</source>
         <translation>文件</translation>
     </message>
@@ -2051,28 +2074,23 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.ui" line="92"/>
-        <source>Generate name basing on file path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../dialogs/dbdialog.ui" line="114"/>
+        <location filename="../dialogs/dbdialog.ui" line="97"/>
         <source>&lt;p&gt;Enable this if you want the database to be stored in configuration file and restored every time SQLiteStudio is started.&lt;/p&gt;</source>
         <extracomment>aasfd</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="157"/>
+        <location filename="../dialogs/dbdialog.cpp" line="155"/>
         <source>Browse for existing database file on local computer</source>
         <translation>浏览计算上已存在的文件</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="290"/>
+        <location filename="../dialogs/dbdialog.cpp" line="288"/>
         <source>Browse</source>
         <translation>浏览</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="469"/>
+        <location filename="../dialogs/dbdialog.cpp" line="467"/>
         <source>Enter an unique database name.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2082,29 +2100,32 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="485"/>
+        <location filename="../dialogs/dbdialog.cpp" line="484"/>
+        <source>&lt;p&gt;Automatic name generation was disabled, becuase the name was edited manually. To restore automatic generation please erase contents of the name field.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogs/dbdialog.cpp" line="493"/>
         <source>Enter a database file path.</source>
         <translation>输入数据库文件位置。</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="492"/>
+        <location filename="../dialogs/dbdialog.cpp" line="502"/>
         <source>This database is already on the list under name: %1</source>
         <translation>该数据库已在列表中：%1</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="508"/>
+        <location filename="../dialogs/dbdialog.cpp" line="524"/>
         <source>Select a database type.</source>
         <translation>选择数据库类型。</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="573"/>
         <source>Auto-generated</source>
-        <translation>自动产生</translation>
+        <translation type="vanished">自动产生</translation>
     </message>
     <message>
-        <location filename="../dialogs/dbdialog.cpp" line="578"/>
         <source>Type the name</source>
-        <translation>输入名字</translation>
+        <translation type="vanished">输入名字</translation>
     </message>
 </context>
 <context>
@@ -2391,7 +2412,7 @@ Browsing other pages will be possible after the row counting is done.</source>
     </message>
     <message>
         <location filename="../dbtree/dbtree.cpp" line="144"/>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
         <source>Erase table data</source>
         <translation>擦除该表的数据</translation>
     </message>
@@ -2412,55 +2433,65 @@ Browsing other pages will be possible after the row counting is done.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Create group</source>
         <translation>创建分组</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1041"/>
+        <location filename="../dbtree/dbtree.cpp" line="1048"/>
         <source>Group name</source>
         <translation>分组名</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1044"/>
+        <location filename="../dbtree/dbtree.cpp" line="1051"/>
         <source>Entry with name %1 already exists in group %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1062"/>
+        <location filename="../dbtree/dbtree.cpp" line="1069"/>
         <source>Delete group</source>
         <translation>删除分组</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1063"/>
+        <location filename="../dbtree/dbtree.cpp" line="1070"/>
         <source>Are you sure you want to delete group %1?
 All objects from this group will be moved to parent group.</source>
         <translation>确认删除组 %1 吗?
 删除后该组下的全部内容将被移动到其所属的父分组中。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1126"/>
+        <location filename="../dbtree/dbtree.cpp" line="1133"/>
         <source>Are you sure you want to remove database &apos;%1&apos; from the list?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1134"/>
+        <location filename="../dbtree/dbtree.cpp" line="1141"/>
         <source>Are you sure you want to remove following databases from the list:
 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1136"/>
+        <location filename="../dbtree/dbtree.cpp" line="1143"/>
         <source>Remove database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1442"/>
+        <location filename="../dbtree/dbtree.cpp" line="1449"/>
         <source>Vacuum (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../dbtree/dbtree.cpp" line="1508"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dbtree/dbtree.cpp" line="1528"/>
+        <source>Are you sure you want to delete all data from table(s): %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Delete database</source>
         <translation type="obsolete">删除数据库</translation>
     </message>
@@ -2469,14 +2500,14 @@ All objects from this group will be moved to parent group.</source>
         <translation type="obsolete">您确定要删除数据库“%1”吗?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1173"/>
-        <location filename="../dbtree/dbtree.cpp" line="1366"/>
+        <location filename="../dbtree/dbtree.cpp" line="1180"/>
+        <location filename="../dbtree/dbtree.cpp" line="1373"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation>未能导入，因为没有导入插件被加载。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1193"/>
-        <location filename="../dbtree/dbtree.cpp" line="1341"/>
+        <location filename="../dbtree/dbtree.cpp" line="1200"/>
+        <location filename="../dbtree/dbtree.cpp" line="1348"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>未能导出，因为没有导出插件被加载。</translation>
     </message>
@@ -2489,67 +2520,65 @@ All objects from this group will be moved to parent group.</source>
         <translation type="obsolete">VACUUM 命令执行完成。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1456"/>
+        <location filename="../dbtree/dbtree.cpp" line="1463"/>
         <source>Integrity check (%1)</source>
         <translation>完整性检查（%1）</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Reset autoincrement</source>
         <translation>重置autoincrement</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1492"/>
+        <location filename="../dbtree/dbtree.cpp" line="1499"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation>您确定要重设“%1”的autoincrement吗?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1499"/>
+        <location filename="../dbtree/dbtree.cpp" line="1506"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation>在重设表“%1”的autoincrement时出现错误：%2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1501"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation>表“%1”的auincrement重设成功。</translation>
+        <translation type="vanished">表“%1”的auincrement重设成功。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1518"/>
         <source>Are you sure you want to delete all data from table &apos;%1&apos;?</source>
-        <translation>您确定要删除表“%1”中的全部数据吗?</translation>
+        <translation type="vanished">您确定要删除表“%1”中的全部数据吗?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1526"/>
+        <location filename="../dbtree/dbtree.cpp" line="1541"/>
         <source>An error occurred while trying to delete data from table &apos;%1&apos;: %2</source>
         <translation>删除表“%1”中的数据时出错：%2</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1530"/>
+        <location filename="../dbtree/dbtree.cpp" line="1545"/>
         <source>All data has been deleted for table &apos;%1&apos;.</source>
         <translation>表“%1”中的数据全部被删除。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1639"/>
+        <location filename="../dbtree/dbtree.cpp" line="1660"/>
         <source>Following objects will be deleted: %1.</source>
         <translation>以下内容将被删除：%1。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1642"/>
+        <location filename="../dbtree/dbtree.cpp" line="1663"/>
         <source>Following databases will be removed from list: %1.</source>
         <translation>以下数据库将从列表中移除：%1。</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1645"/>
+        <location filename="../dbtree/dbtree.cpp" line="1666"/>
         <source>Remainig objects from deleted group will be moved in place where the group used to be.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1647"/>
+        <location filename="../dbtree/dbtree.cpp" line="1668"/>
         <source>%1&lt;br&gt;&lt;br&gt;Are you sure you want to continue?</source>
         <translation>%1&lt;br&gt;&lt;br&gt;继续?</translation>
     </message>
     <message>
-        <location filename="../dbtree/dbtree.cpp" line="1649"/>
+        <location filename="../dbtree/dbtree.cpp" line="1670"/>
         <source>Delete objects</source>
         <translation>删除对象</translation>
     </message>
@@ -2813,78 +2842,82 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
         <translation>从query中创建视图</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="382"/>
+        <location filename="../windows/editorwindow.cpp" line="385"/>
         <source>Previous database</source>
         <translation>前一个数据库</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="383"/>
+        <location filename="../windows/editorwindow.cpp" line="386"/>
         <source>Next database</source>
         <translation>下一个数据库</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="386"/>
+        <location filename="../windows/editorwindow.cpp" line="389"/>
         <source>Show next tab</source>
         <comment>sql editor</comment>
         <translation>显示下一个标签</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="387"/>
+        <location filename="../windows/editorwindow.cpp" line="390"/>
         <source>Show previous tab</source>
         <comment>sql editor</comment>
         <translation>显示上一个标签</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="388"/>
+        <location filename="../windows/editorwindow.cpp" line="391"/>
         <source>Focus results below</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="389"/>
+        <location filename="../windows/editorwindow.cpp" line="392"/>
         <source>Focus SQL editor above</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="463"/>
+        <location filename="../windows/editorwindow.cpp" line="466"/>
         <source>Active database (%1/%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="503"/>
+        <location filename="../windows/editorwindow.cpp" line="507"/>
         <source>Query finished in %1 second(s). Rows affected: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="507"/>
+        <location filename="../windows/editorwindow.cpp" line="511"/>
         <source>Query finished in %1 second(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Clear execution history</source>
         <translation>清除执行历史</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="609"/>
+        <location filename="../windows/editorwindow.cpp" line="613"/>
         <source>Are you sure you want to erase the entire SQL execution history? This cannot be undone.</source>
         <translation>确定要删除全部的SQL执行历史吗?删除后不能恢复。</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="621"/>
+        <location filename="../windows/editorwindow.cpp" line="625"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation>未能导出，因为没有导出插件被加载。</translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="642"/>
+        <location filename="../windows/editorwindow.cpp" line="646"/>
         <source>No database selected in the SQL editor. Cannot create a view for unknown database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/editorwindow.cpp" line="672"/>
+        <location filename="../windows/editorwindow.cpp" line="676"/>
+        <source>Editor window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Editor window &quot;%1&quot; has uncommited data.</source>
-        <translation>编辑器“%1”里有未提交的数据库。</translation>
+        <translation type="vanished">编辑器“%1”里有未提交的数据库。</translation>
     </message>
 </context>
 <context>
@@ -3340,7 +3373,7 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
     </message>
     <message>
         <location filename="../windows/functionseditor.cpp" line="631"/>
-        <source>Functions editor window has uncommited modifications.</source>
+        <source>Functions editor window has uncommitted modifications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3939,9 +3972,13 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
 <context>
     <name>MdiWindow</name>
     <message>
-        <location filename="../mdiwindow.cpp" line="199"/>
         <source>Uncommited changes</source>
-        <translation>未提交的更改</translation>
+        <translation type="vanished">未提交的更改</translation>
+    </message>
+    <message>
+        <location filename="../mdiwindow.cpp" line="199"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mdiwindow.cpp" line="204"/>
@@ -4872,9 +4909,13 @@ Please enter new, unique name, or press &apos;%1&apos; to abort the operation:</
 <context>
     <name>QuitConfirmDialog</name>
     <message>
-        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
         <source>Uncommited changes</source>
-        <translation>未提交的更改</translation>
+        <translation type="vanished">未提交的更改</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/quitconfirmdialog.ui" line="14"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../dialogs/quitconfirmdialog.ui" line="20"/>
@@ -4971,179 +5012,179 @@ find next</source>
 <context>
     <name>SqlEditor</name>
     <message>
-        <location filename="../sqleditor.cpp" line="121"/>
+        <location filename="../sqleditor.cpp" line="122"/>
         <source>Cut</source>
         <comment>sql editor</comment>
         <translation>剪切</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="122"/>
+        <location filename="../sqleditor.cpp" line="123"/>
         <source>Copy</source>
         <comment>sql editor</comment>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="123"/>
+        <location filename="../sqleditor.cpp" line="124"/>
         <source>Paste</source>
         <comment>sql editor</comment>
         <translation>粘贴</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="124"/>
+        <location filename="../sqleditor.cpp" line="125"/>
         <source>Delete</source>
         <comment>sql editor</comment>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="125"/>
+        <location filename="../sqleditor.cpp" line="126"/>
         <source>Select all</source>
         <comment>sql editor</comment>
         <translation>全选</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="126"/>
+        <location filename="../sqleditor.cpp" line="127"/>
         <source>Undo</source>
         <comment>sql editor</comment>
         <translation>撤销</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="127"/>
+        <location filename="../sqleditor.cpp" line="128"/>
         <source>Redo</source>
         <comment>sql editor</comment>
         <translation>恢复</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="128"/>
+        <location filename="../sqleditor.cpp" line="129"/>
         <source>Complete</source>
         <comment>sql editor</comment>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="129"/>
+        <location filename="../sqleditor.cpp" line="130"/>
         <source>Format SQL</source>
         <comment>sql editor</comment>
         <translation>格式化SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="130"/>
+        <location filename="../sqleditor.cpp" line="131"/>
         <source>Save SQL to file</source>
         <comment>sql editor</comment>
         <translation>保存SQL到文件</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="131"/>
+        <location filename="../sqleditor.cpp" line="132"/>
         <source>Select file to save SQL</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="132"/>
+        <location filename="../sqleditor.cpp" line="133"/>
         <source>Load SQL from file</source>
         <comment>sql editor</comment>
         <translation>从文件加载SQL</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="133"/>
+        <location filename="../sqleditor.cpp" line="134"/>
         <source>Delete line</source>
         <comment>sql editor</comment>
         <translation>删除行</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="134"/>
+        <location filename="../sqleditor.cpp" line="135"/>
         <source>Move block down</source>
         <comment>sql editor</comment>
         <translation>整块下移</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="135"/>
+        <location filename="../sqleditor.cpp" line="136"/>
         <source>Move block up</source>
         <comment>sql editor</comment>
         <translation>整块上移</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="136"/>
+        <location filename="../sqleditor.cpp" line="137"/>
         <source>Copy block down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="137"/>
+        <location filename="../sqleditor.cpp" line="138"/>
         <source>Copy up down</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="138"/>
+        <location filename="../sqleditor.cpp" line="139"/>
         <source>Find</source>
         <comment>sql editor</comment>
         <translation>查找</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="139"/>
+        <location filename="../sqleditor.cpp" line="140"/>
         <source>Find next</source>
         <comment>sql editor</comment>
         <translation>查找下一个</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="140"/>
+        <location filename="../sqleditor.cpp" line="141"/>
         <source>Find previous</source>
         <comment>sql editor</comment>
         <translation>查找上一个</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="141"/>
+        <location filename="../sqleditor.cpp" line="142"/>
         <source>Replace</source>
         <comment>sql editor</comment>
         <translation>替换</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="142"/>
+        <location filename="../sqleditor.cpp" line="143"/>
         <source>Toggle comment</source>
         <comment>sql editor</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="256"/>
+        <location filename="../sqleditor.cpp" line="258"/>
         <source>Saved SQL contents to file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="450"/>
+        <location filename="../sqleditor.cpp" line="452"/>
         <source>Syntax completion can be used only when a valid database is set for the SQL editor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="838"/>
+        <location filename="../sqleditor.cpp" line="840"/>
         <source>Contents of the SQL editor are huge, so errors detecting and existing objects highlighting are temporarily disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1073"/>
+        <location filename="../sqleditor.cpp" line="1078"/>
         <source>Save to file</source>
         <translation>保存到文件</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="246"/>
+        <location filename="../sqleditor.cpp" line="248"/>
         <source>Could not open file &apos;%1&apos; for writing: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1085"/>
+        <location filename="../sqleditor.cpp" line="1090"/>
         <source>SQL scripts (*.sql);;All files (*)</source>
         <translation type="unfinished">SQL文件 (*.sql);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1086"/>
+        <location filename="../sqleditor.cpp" line="1091"/>
         <source>Open file</source>
         <translation>打开文件</translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1095"/>
+        <location filename="../sqleditor.cpp" line="1100"/>
         <source>Could not open file &apos;%1&apos; for reading: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sqleditor.cpp" line="1304"/>
+        <location filename="../sqleditor.cpp" line="1309"/>
         <source>Reached the end of document. Hit the find again to restart the search.</source>
         <translation>已搜索到文档底部。点击查找从头程序开始搜索。</translation>
     </message>
@@ -5175,12 +5216,7 @@ find next</source>
         <translation>约束：</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="402"/>
-        <source>This cell is not editable, because: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../datagrid/sqlqueryitem.cpp" line="419"/>
+        <location filename="../datagrid/sqlqueryitem.cpp" line="423"/>
         <source>Cannot load the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5188,18 +5224,32 @@ find next</source>
 <context>
     <name>SqlQueryItemDelegate</name>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="56"/>
-        <source>Cannot edit this cell. Details: %2</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <source>The row is marked for deletion.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="50"/>
-        <source>The row is marked for deletion.</source>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="53"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="59"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="341"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Cannot edit this cell. Details: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="65"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="361"/>
+        <source>Structure of this table has changed since last data was loaded. Reload the data to proceed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="204"/>
+        <source>Editing a huge contents in an inline cell editor is not a good idea. It can become slow and inconvenient. It&apos;s better to edit such big contents in a Form View, or in popup editor (available under rick-click menu).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="303"/>
+        <location filename="../datagrid/sqlqueryitemdelegate.cpp" line="353"/>
         <source>Foreign key for column %2 has more than %1 possible values. It&apos;s too much to display in drop down list. You need to edit value manually.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5207,69 +5257,69 @@ find next</source>
 <context>
     <name>SqlQueryModel</name>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="70"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="469"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="75"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="474"/>
         <source>Only one query can be executed simultaneously.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="103"/>
-        <source>Uncommited data</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="356"/>
+        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="104"/>
-        <source>There are uncommited data changes. Do you want to proceed anyway? All uncommited changes will be lost.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="364"/>
+        <source>Could not begin transaction on the database. Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="351"/>
-        <source>Cannot commit the data for a cell that refers to the already closed database.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="435"/>
+        <source>An error occurred while rolling back the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="359"/>
-        <source>Could not begin transaction on the database. Details: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="630"/>
+        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="405"/>
-        <source>An error occurred while commiting the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="108"/>
+        <source>Uncommitted data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="430"/>
-        <source>An error occurred while rolling back the transaction: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="109"/>
+        <source>There are uncommitted data changes. Do you want to proceed anyway? All uncommitted changes will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="625"/>
-        <source>Tried to commit a cell which is not editable (yet modified and waiting for commit)! This is a bug. Please report it.</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="410"/>
+        <source>An error occurred while committing the transaction: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="651"/>
-        <source>An error occurred while commiting the data: %1</source>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="656"/>
+        <source>An error occurred while committing the data: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1116"/>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1173"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1135"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1192"/>
         <source>Error while executing SQL query on database &apos;%1&apos;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1170"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1189"/>
         <source>Error while loading query results: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Insert multiple rows</source>
         <translation type="unfinished">插入多行</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlquerymodel.cpp" line="1564"/>
+        <location filename="../datagrid/sqlquerymodel.cpp" line="1598"/>
         <source>Number of rows to insert:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5277,117 +5327,117 @@ find next</source>
 <context>
     <name>SqlQueryView</name>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="55"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="56"/>
         <source>Go to referenced row in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="78"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="79"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
         <source>Copy as...</source>
         <translation>复制为...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="80"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="81"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
         <source>Paste as...</source>
         <translation>粘贴为...</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="82"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
         <source>Set NULL values</source>
         <translation>设置为NULL</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="83"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
         <source>Erase values</source>
         <translation>擦除</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="84"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
         <source>Edit value in editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="85"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
         <source>Commit</source>
         <translation>提交</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="86"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
         <source>Rollback</source>
         <translation>回滚</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="87"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
         <source>Commit selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="88"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="89"/>
         <source>Rollback selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="93"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
         <source>Define columns to sort by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="94"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
         <source>Remove custom sorting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="95"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
         <source>Insert row</source>
         <translation>插入行</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="96"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
         <source>Insert multiple rows</source>
         <translation>插入多行</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="97"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="98"/>
         <source>Delete selected row</source>
         <translation>删除已选行</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="155"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="156"/>
         <source>Generate query for selected cells</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="312"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="313"/>
         <source>No items selected to paste clipboard contents to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="370"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="371"/>
         <source>Go to referenced row in table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="382"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="383"/>
         <source>table &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="403"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="407"/>
         <source>Referenced row (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../datagrid/sqlqueryview.cpp" line="668"/>
+        <location filename="../datagrid/sqlqueryview.cpp" line="672"/>
         <source>Edit value</source>
         <translation>编辑值</translation>
     </message>
@@ -5395,12 +5445,16 @@ find next</source>
 <context>
     <name>SqlTableModel</name>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="75"/>
         <source>Error while commiting new row: %1</source>
-        <translation>写入新行时发生了错误：%1</translation>
+        <translation type="vanished">写入新行时发生了错误：%1</translation>
     </message>
     <message>
-        <location filename="../datagrid/sqltablemodel.cpp" line="133"/>
+        <location filename="../datagrid/sqltablemodel.cpp" line="82"/>
+        <source>Error while committing new row: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../datagrid/sqltablemodel.cpp" line="140"/>
         <source>Error while deleting row from table %1: %2</source>
         <translation>删除行时发生了错误 %1：%2</translation>
     </message>
@@ -5663,7 +5717,7 @@ NULL</source>
     </message>
     <message>
         <location filename="../windows/tablewindow.ui" line="190"/>
-        <location filename="../windows/tablewindow.cpp" line="1566"/>
+        <location filename="../windows/tablewindow.cpp" line="1574"/>
         <source>Data</source>
         <translation type="unfinished">数据</translation>
     </message>
@@ -5688,409 +5742,417 @@ NULL</source>
         <translation type="unfinished">DDL</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="200"/>
+        <location filename="../windows/tablewindow.cpp" line="202"/>
         <source>Export table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="201"/>
+        <location filename="../windows/tablewindow.cpp" line="203"/>
         <source>Import data to table</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="202"/>
+        <location filename="../windows/tablewindow.cpp" line="204"/>
         <source>Populate table</source>
         <comment>table window</comment>
         <translation type="unfinished">填充表</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="216"/>
+        <location filename="../windows/tablewindow.cpp" line="218"/>
         <source>Refresh structure</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="218"/>
+        <location filename="../windows/tablewindow.cpp" line="220"/>
         <source>Commit structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="219"/>
+        <location filename="../windows/tablewindow.cpp" line="221"/>
         <source>Rollback structure changes</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="220"/>
+        <location filename="../windows/tablewindow.cpp" line="222"/>
         <source>Add column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="221"/>
+        <location filename="../windows/tablewindow.cpp" line="223"/>
         <source>Edit column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="222"/>
-        <location filename="../windows/tablewindow.cpp" line="309"/>
+        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="311"/>
         <source>Delete column</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="223"/>
+        <location filename="../windows/tablewindow.cpp" line="225"/>
         <source>Move column up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="224"/>
+        <location filename="../windows/tablewindow.cpp" line="226"/>
         <source>Move column down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="230"/>
+        <location filename="../windows/tablewindow.cpp" line="232"/>
         <source>Create similar table</source>
         <comment>table window</comment>
         <translation type="unfinished">创建一个相似的表</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="231"/>
+        <location filename="../windows/tablewindow.cpp" line="233"/>
         <source>Reset autoincrement value</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="234"/>
+        <location filename="../windows/tablewindow.cpp" line="236"/>
         <source>Add table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="235"/>
+        <location filename="../windows/tablewindow.cpp" line="237"/>
         <source>Edit table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="236"/>
+        <location filename="../windows/tablewindow.cpp" line="238"/>
         <source>Delete table constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="237"/>
+        <location filename="../windows/tablewindow.cpp" line="239"/>
         <source>Move table constraint up</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="238"/>
+        <location filename="../windows/tablewindow.cpp" line="240"/>
         <source>Move table constraint down</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="240"/>
+        <location filename="../windows/tablewindow.cpp" line="242"/>
         <source>Add table primary key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="241"/>
+        <location filename="../windows/tablewindow.cpp" line="243"/>
         <source>Add table foreign key</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="242"/>
+        <location filename="../windows/tablewindow.cpp" line="244"/>
         <source>Add table unique constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="243"/>
+        <location filename="../windows/tablewindow.cpp" line="245"/>
         <source>Add table check constraint</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="261"/>
+        <location filename="../windows/tablewindow.cpp" line="263"/>
         <source>Refresh index list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="263"/>
+        <location filename="../windows/tablewindow.cpp" line="265"/>
         <source>Create index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="264"/>
+        <location filename="../windows/tablewindow.cpp" line="266"/>
         <source>Edit index</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="265"/>
+        <location filename="../windows/tablewindow.cpp" line="267"/>
         <source>Delete index</source>
         <comment>table window</comment>
         <translation type="unfinished">删除索引</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="271"/>
+        <location filename="../windows/tablewindow.cpp" line="273"/>
         <source>Refresh trigger list</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="273"/>
+        <location filename="../windows/tablewindow.cpp" line="275"/>
         <source>Create trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="274"/>
+        <location filename="../windows/tablewindow.cpp" line="276"/>
         <source>Edit trigger</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="275"/>
+        <location filename="../windows/tablewindow.cpp" line="277"/>
         <source>Delete trigger</source>
         <comment>table window</comment>
         <translation type="unfinished">删除触发器</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="308"/>
+        <location filename="../windows/tablewindow.cpp" line="310"/>
         <source>Are you sure you want to delete column &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="336"/>
+        <location filename="../windows/tablewindow.cpp" line="338"/>
         <source>Following problems will take place while modifying the table.
 Would you like to proceed?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="338"/>
+        <location filename="../windows/tablewindow.cpp" line="340"/>
         <source>Table modification</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="476"/>
+        <location filename="../windows/tablewindow.cpp" line="478"/>
         <source>Could not load data for table %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="595"/>
+        <location filename="../windows/tablewindow.cpp" line="597"/>
         <source>Could not process the %1 table correctly. Unable to open a table window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="650"/>
+        <location filename="../windows/tablewindow.cpp" line="652"/>
         <source>Could not restore window %1, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="656"/>
+        <location filename="../windows/tablewindow.cpp" line="658"/>
         <source>Could not restore window &apos;%1&apos;, because no database or table was stored in session for this window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="663"/>
+        <location filename="../windows/tablewindow.cpp" line="665"/>
         <source>Could not restore window &apos;%1&apos;, because database %2 could not be resolved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="672"/>
+        <location filename="../windows/tablewindow.cpp" line="674"/>
         <source>Could not restore window &apos;%1&apos;&apos;, because the table %2 doesn&apos;t exist in the database %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="697"/>
         <location filename="../windows/tablewindow.cpp" line="699"/>
+        <location filename="../windows/tablewindow.cpp" line="701"/>
         <source>New table %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="824"/>
-        <source>Commited changes for table &apos;%1&apos; successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="828"/>
+        <source>Committed changes for table &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="826"/>
-        <source>Commited changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <location filename="../windows/tablewindow.cpp" line="832"/>
+        <source>Committed changes for table &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="858"/>
+        <location filename="../windows/tablewindow.cpp" line="897"/>
+        <source>Autoincrement value for table &apos;%1&apos; has been reset successfully.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1270"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1271"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have table structure settled.
+Do you want to commit the structure, or do you want to go back to the structure tab?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1616"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications and data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1618"/>
+        <source>Table window &quot;%1&quot; has uncommitted data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="1620"/>
+        <source>Table window &quot;%1&quot; has uncommitted structure modifications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/tablewindow.cpp" line="866"/>
         <source>Could not commit table structure. Error message: %1</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Reset autoincrement</source>
         <translation type="unfinished">重置autoincrement</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="880"/>
+        <location filename="../windows/tablewindow.cpp" line="888"/>
         <source>Are you sure you want to reset autoincrement value for table &apos;%1&apos;?</source>
         <translation type="unfinished">您确定要重设“%1”的autoincrement吗?</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="887"/>
+        <location filename="../windows/tablewindow.cpp" line="895"/>
         <source>An error occurred while trying to reset autoincrement value for table &apos;%1&apos;: %2</source>
         <translation type="unfinished">在重设表“%1”的autoincrement时出现错误：%2</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="889"/>
         <source>Autoincrement value for table &apos;%1&apos; has been reset successfly.</source>
-        <translation type="unfinished">表“%1”的auincrement重设成功。</translation>
+        <translation type="obsolete">表“%1”的auincrement重设成功。</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="969"/>
+        <location filename="../windows/tablewindow.cpp" line="977"/>
         <source>A blank name for the table is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a table with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="978"/>
+        <location filename="../windows/tablewindow.cpp" line="986"/>
         <source>Cannot create a table without at least one column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1004"/>
+        <location filename="../windows/tablewindow.cpp" line="1012"/>
         <source>Cannot create table %1, if it has no primary key defined. Either uncheck the %2, or define a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1011"/>
+        <location filename="../windows/tablewindow.cpp" line="1019"/>
         <source>Cannot use autoincrement for primary key when %1 clause is used. Either uncheck the %2, or the autoincrement in a primary key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1161"/>
+        <location filename="../windows/tablewindow.cpp" line="1169"/>
         <source>Are you sure you want to delete table constraint &apos;%1&apos;?</source>
         <comment>table window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1162"/>
+        <location filename="../windows/tablewindow.cpp" line="1170"/>
         <source>Delete constraint</source>
         <comment>table window</comment>
         <translation type="unfinished">删除约束</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1216"/>
+        <location filename="../windows/tablewindow.cpp" line="1224"/>
         <source>Cannot export, because no export plugin is loaded.</source>
         <translation type="unfinished">未能导出，因为没有导出插件被加载。</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1229"/>
+        <location filename="../windows/tablewindow.cpp" line="1237"/>
         <source>Cannot import, because no import plugin is loaded.</source>
         <translation type="unfinished">未能导入，因为没有导入插件被加载。</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1262"/>
         <source>Uncommited changes</source>
-        <translation type="unfinished">未提交的更改</translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1263"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have table structure settled.
-Do you want to commit the structure, or do you want to go back to the structure tab?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">未提交的更改</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Go back to structure tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1266"/>
+        <location filename="../windows/tablewindow.cpp" line="1274"/>
         <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1447"/>
+        <location filename="../windows/tablewindow.cpp" line="1455"/>
         <source>Name</source>
         <comment>table window indexes</comment>
         <translation type="unfinished">名称</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1448"/>
+        <location filename="../windows/tablewindow.cpp" line="1456"/>
         <source>Unique</source>
         <comment>table window indexes</comment>
         <translation type="unfinished">唯一</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1449"/>
+        <location filename="../windows/tablewindow.cpp" line="1457"/>
         <source>Columns</source>
         <comment>table window indexes</comment>
         <translation type="unfinished">字段</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1450"/>
+        <location filename="../windows/tablewindow.cpp" line="1458"/>
         <source>Partial index condition</source>
         <comment>table window indexes</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1504"/>
+        <location filename="../windows/tablewindow.cpp" line="1512"/>
         <source>Name</source>
         <comment>table window triggers</comment>
         <translation type="unfinished">名称</translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1505"/>
+        <location filename="../windows/tablewindow.cpp" line="1513"/>
         <source>Event</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1506"/>
+        <location filename="../windows/tablewindow.cpp" line="1514"/>
         <source>Condition</source>
         <comment>table window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/tablewindow.cpp" line="1507"/>
+        <location filename="../windows/tablewindow.cpp" line="1515"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished">详情</translation>
     </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1608"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1610"/>
-        <source>Table window &quot;%1&quot; has uncommited data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../windows/tablewindow.cpp" line="1612"/>
-        <source>Table window &quot;%1&quot; has uncommited structure modifications.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TriggerColumnsDialog</name>
@@ -6104,6 +6166,16 @@ Do you want to commit the structure, or do you want to go back to the structure
         <source>Triggering columns:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="115"/>
+        <source>Select all</source>
+        <translation type="unfinished">全选</translation>
+    </message>
+    <message>
+        <location filename="../dialogs/triggercolumnsdialog.ui" line="128"/>
+        <source>Deselect all</source>
+        <translation type="unfinished">全不选</translation>
+    </message>
 </context>
 <context>
     <name>TriggerDialog</name>
@@ -6195,13 +6267,13 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>Error</source>
         <comment>trigger dialog</comment>
         <translation type="unfinished">错误</translation>
     </message>
     <message>
-        <location filename="../dialogs/triggerdialog.cpp" line="426"/>
+        <location filename="../dialogs/triggerdialog.cpp" line="428"/>
         <source>An error occurred while executing SQL statements:
 %1</source>
         <translation type="unfinished">在执行SQL语句“%1”时发生了错误。</translation>
@@ -6249,7 +6321,7 @@ Do you want to commit the structure, or do you want to go back to the structure
     </message>
     <message>
         <location filename="../windows/viewwindow.ui" line="156"/>
-        <location filename="../windows/viewwindow.cpp" line="835"/>
+        <location filename="../windows/viewwindow.cpp" line="837"/>
         <source>Data</source>
         <translation>数据</translation>
     </message>
@@ -6291,224 +6363,228 @@ Do you want to commit the structure, or do you want to go back to the structure
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="311"/>
+        <location filename="../windows/viewwindow.cpp" line="313"/>
         <source>Refresh the view</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="313"/>
+        <location filename="../windows/viewwindow.cpp" line="315"/>
         <source>Commit the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="314"/>
+        <location filename="../windows/viewwindow.cpp" line="316"/>
         <source>Rollback the view changes</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="318"/>
+        <location filename="../windows/viewwindow.cpp" line="320"/>
         <source>Explicit column names</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="324"/>
+        <location filename="../windows/viewwindow.cpp" line="326"/>
         <source>Generate output column names automatically basing on result columns of the view.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="325"/>
+        <location filename="../windows/viewwindow.cpp" line="327"/>
         <source>Add column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="326"/>
+        <location filename="../windows/viewwindow.cpp" line="328"/>
         <source>Edit column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="327"/>
+        <location filename="../windows/viewwindow.cpp" line="329"/>
         <source>Delete column</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="328"/>
+        <location filename="../windows/viewwindow.cpp" line="330"/>
         <source>Move column up</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="329"/>
+        <location filename="../windows/viewwindow.cpp" line="331"/>
         <source>Move column down</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="334"/>
+        <location filename="../windows/viewwindow.cpp" line="336"/>
         <source>Refresh trigger list</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="336"/>
+        <location filename="../windows/viewwindow.cpp" line="338"/>
         <source>Create new trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="337"/>
+        <location filename="../windows/viewwindow.cpp" line="339"/>
         <source>Edit selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="338"/>
+        <location filename="../windows/viewwindow.cpp" line="340"/>
         <source>Delete selected trigger</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="359"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications and data.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../windows/viewwindow.cpp" line="361"/>
-        <source>View window &quot;%1&quot; has uncommited data.</source>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications and data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../windows/viewwindow.cpp" line="363"/>
-        <source>View window &quot;%1&quot; has uncommited structure modifications.</source>
+        <source>View window &quot;%1&quot; has uncommitted data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="560"/>
-        <source>Could not load data for view %1. Error details: %2</source>
+        <location filename="../windows/viewwindow.cpp" line="365"/>
+        <source>View window &quot;%1&quot; has uncommitted structure modifications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="572"/>
-        <source>Uncommited changes</source>
-        <translation type="unfinished">未提交的更改</translation>
+        <location filename="../windows/viewwindow.cpp" line="574"/>
+        <source>Uncommitted changes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="573"/>
-        <source>There are uncommited structure modifications. You cannot browse or edit data until you have the view structure settled.
+        <location filename="../windows/viewwindow.cpp" line="575"/>
+        <source>There are uncommitted structure modifications. You cannot browse or edit data until you have the view structure settled.
 Do you want to commit the structure, or do you want to go back to the structure tab?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Go back to structure tab</source>
+        <location filename="../windows/viewwindow.cpp" line="629"/>
+        <source>Committed changes for view &apos;%1&apos; successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="576"/>
-        <source>Commit modifications and browse data.</source>
+        <location filename="../windows/viewwindow.cpp" line="631"/>
+        <source>Committed changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="627"/>
-        <source>Commited changes for view &apos;%1&apos; successfly.</source>
+        <location filename="../windows/viewwindow.cpp" line="562"/>
+        <source>Could not load data for view %1. Error details: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="629"/>
-        <source>Commited changes for view &apos;%1&apos; (named before &apos;%2&apos;) successfly.</source>
+        <source>Uncommited changes</source>
+        <translation type="obsolete">未提交的更改</translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Go back to structure tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../windows/viewwindow.cpp" line="578"/>
+        <source>Commit modifications and browse data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="640"/>
+        <location filename="../windows/viewwindow.cpp" line="642"/>
         <source>Could not commit view changes. Error message: %1</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Override columns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="782"/>
+        <location filename="../windows/viewwindow.cpp" line="784"/>
         <source>Currently defined columns will be overriden. Do you want to continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="805"/>
+        <location filename="../windows/viewwindow.cpp" line="807"/>
         <source>Could not determinate columns returned from the view. The query is problably incomplete or contains errors.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="866"/>
+        <location filename="../windows/viewwindow.cpp" line="868"/>
         <source>Name</source>
         <comment>view window triggers</comment>
         <translation type="unfinished">名称</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="867"/>
+        <location filename="../windows/viewwindow.cpp" line="869"/>
         <source>Instead of</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="868"/>
+        <location filename="../windows/viewwindow.cpp" line="870"/>
         <source>Condition</source>
         <comment>view window triggers</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="869"/>
+        <location filename="../windows/viewwindow.cpp" line="871"/>
         <source>Details</source>
         <comment>table window triggers</comment>
         <translation type="unfinished">详情</translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="909"/>
+        <location filename="../windows/viewwindow.cpp" line="911"/>
         <source>Could not process the %1 view correctly. Unable to open a view window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>Empty name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="956"/>
+        <location filename="../windows/viewwindow.cpp" line="958"/>
         <source>A blank name for the view is allowed in SQLite, but it is not recommended.
 Are you sure you want to create a view with blank name?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="968"/>
+        <location filename="../windows/viewwindow.cpp" line="970"/>
         <source>The SELECT statement could not be parsed. Please correct the query and retry.
 Details: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="976"/>
+        <location filename="../windows/viewwindow.cpp" line="978"/>
         <source>The view could not be modified due to internal SQLiteStudio error. Please report this!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1002"/>
+        <location filename="../windows/viewwindow.cpp" line="1004"/>
         <source>The view code could not be parsed properly for execution. This is a SQLiteStudio&apos;s bug. Please report it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1015"/>
+        <location filename="../windows/viewwindow.cpp" line="1017"/>
         <source>Following problems will take place while modifying the view.
 Would you like to proceed?</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../windows/viewwindow.cpp" line="1017"/>
+        <location filename="../windows/viewwindow.cpp" line="1019"/>
         <source>View modification</source>
         <comment>view window</comment>
         <translation type="unfinished"></translation>
diff --git a/SQLiteStudio3/guiSQLiteStudio/uiconfig.h b/SQLiteStudio3/guiSQLiteStudio/uiconfig.h
index 75ea87d..0f2d17c 100644
--- a/SQLiteStudio3/guiSQLiteStudio/uiconfig.h
+++ b/SQLiteStudio3/guiSQLiteStudio/uiconfig.h
@@ -44,8 +44,8 @@ CFG_CATEGORIES(Ui,
         CFG_ENTRY(QColor,       SqlEditorBlobFg,         Qt::darkCyan)

         CFG_ENTRY(QColor,       SqlEditorCommentFg,      Qt::darkGray)

         CFG_ENTRY(QColor,       SqlEditorNumberFg,       Qt::darkBlue)

-        CFG_ENTRY(QColor,       DataUncommitedError,     Qt::red)

-        CFG_ENTRY(QColor,       DataUncommited,          Qt::blue)

+        CFG_ENTRY(QColor,       DataUncommittedError,     Qt::red)

+        CFG_ENTRY(QColor,       DataUncommitted,          Qt::blue)

         CFG_ENTRY(QColor,       DataNullFg,              Qt::gray)

         CFG_ENTRY(QColor,       DataDeletedBg,           Qt::gray)

         CFG_ENTRY(QColor,       DbTreeLabelsFg,          Qt::blue)

@@ -101,6 +101,8 @@ CFG_CATEGORIES(Ui,
         CFG_ENTRY(bool,                  CompactLayout,              true)

         CFG_ENTRY(int,                   InsertRowPlacement,         Cfg::BEFORE_CURRENT)

         CFG_ENTRY(bool,                  ShowDataViewTooltips,       true)

+        CFG_ENTRY(bool,                  KeepNullWhenEmptyValue,     true)

+        CFG_ENTRY(bool,                  UseDefaultValueForNull,     false)

     )

 )

 

diff --git a/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp b/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp
index a2ce9f8..6448259 100644
--- a/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/uidebug.cpp
@@ -40,6 +40,11 @@ void uiMessageHandler(QtMsgType type, const QMessageLogContext &context, const Q
         case QtFatalMsg:
             msgHandlerThreadProxy->fatal(fatMsg.arg(time, msg));
             abort();
+#if QT_VERSION >= 0x050300
+        case QtInfoMsg:
+            msgHandlerThreadProxy->fatal(fatMsg.arg(time, msg));
+            break;
+#endif
     }
 }
 
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp
index c92f6f4..7632c8f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp
@@ -144,12 +144,12 @@ void BugReportHistoryWindow::deleteSelected()
     CFG->deleteReport(id);
 }
 
-bool BugReportHistoryWindow::isUncommited() const
+bool BugReportHistoryWindow::isUncommitted() const
 {
     return false;
 }
 
-QString BugReportHistoryWindow::getQuitUncommitedConfirmMessage() const
+QString BugReportHistoryWindow::getQuitUncommittedConfirmMessage() const
 {
     return QString();
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h
index e582a48..42e518a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h
@@ -33,8 +33,8 @@ class GUI_API_EXPORT BugReportHistoryWindow : public MdiChild
         ~BugReportHistoryWindow();
 
         bool restoreSessionNextTime();
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
 
     protected:
         QVariant saveSession();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp
index 1d0594d..286924b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp
@@ -378,12 +378,12 @@ void CollationsEditor::changeFont(const QVariant& font)
 }
 
 
-bool CollationsEditor::isUncommited() const
+bool CollationsEditor::isUncommitted() const
 {
     return model->isModified();
 }
 
-QString CollationsEditor::getQuitUncommitedConfirmMessage() const
+QString CollationsEditor::getQuitUncommittedConfirmMessage() const
 {
-    return tr("Collations editor window has uncommited modifications.");
+    return tr("Collations editor window has uncommitted modifications.");
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h
index 62cb281..a75e66b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h
@@ -40,8 +40,8 @@ class GUI_API_EXPORT CollationsEditor : public MdiChild
         ~CollationsEditor();
 
         bool restoreSessionNextTime();
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
 
     protected:
         QVariant saveSession();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
index 3aeccfb..15b49e5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
@@ -139,12 +139,12 @@ QToolBar* DdlHistoryWindow::getToolBar(int toolbar) const
 }
 
 
-bool DdlHistoryWindow::isUncommited() const
+bool DdlHistoryWindow::isUncommitted() const
 {
     return false;
 }
 
-QString DdlHistoryWindow::getQuitUncommitedConfirmMessage() const
+QString DdlHistoryWindow::getQuitUncommittedConfirmMessage() const
 {
     return QString();
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h
index 16a07ce..1a04831 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h
@@ -24,8 +24,8 @@ class GUI_API_EXPORT DdlHistoryWindow : public MdiChild
         ~DdlHistoryWindow();
 
         bool restoreSessionNextTime();
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
 
     protected:
         void changeEvent(QEvent *e);
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
index 30fe07b..56ab6fe 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
@@ -375,6 +375,9 @@ void EditorWindow::createActions()
     attachActionInMenu(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE), ui->sqlEdit->getAction(SqlEditor::SAVE_AS_SQL_FILE), ui->toolBar);
     ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::OPEN_SQL_FILE));
     ui->toolBar->addSeparator();
+    ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::FIND));
+    ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::REPLACE));
+    ui->toolBar->addSeparator();
     actionMap[CURRENT_DB] = ui->toolBar->addWidget(dbCombo);
     ui->toolBar->addSeparator();
     ui->toolBar->addAction(staticActions[RESULTS_IN_TAB]);
@@ -424,7 +427,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary)
     int pos = cursor.position();
     int queryStartPos;
     QString contents = ui->sqlEdit->toPlainText();
-    QString query = getQueryWithPosition(contents, pos, dialect, &queryStartPos);
+    QString query = getQueryWithPosition(contents, pos, &queryStartPos);
     TokenList tokens = Lexer::tokenize(query, dialect);
     tokens.trim();
     tokens.trimRight(Token::OPERATOR, ";");
@@ -435,7 +438,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary)
         pos = contents.lastIndexOf(";", pos - 1);
         if (pos > -1)
         {
-            query = getQueryWithPosition(contents, pos, dialect, &queryStartPos);
+            query = getQueryWithPosition(contents, pos, &queryStartPos);
             tokens = Lexer::tokenize(query, dialect);
             tokens.trim();
             tokens.trimRight(Token::OPERATOR, ";");
@@ -470,6 +473,7 @@ void EditorWindow::execQuery(bool explain)
     resultsModel->setDb(getCurrentDb());
     resultsModel->setExplainMode(explain);
     resultsModel->setQuery(sql);
+    resultsModel->setQueryCountLimitForSmartMode(queryLimitForSmartExecution);
     ui->dataView->refreshData();
     updateState();
 
@@ -623,7 +627,7 @@ void EditorWindow::exportResults()
     }
 
     QString query = lastSuccessfulQuery.isEmpty() ?  getQueryToExecute() : lastSuccessfulQuery;
-    QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false);
+    QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false, true);
     if (queries.size() == 0)
     {
         qWarning() << "No queries after split in EditorWindow::exportResults()";
@@ -662,12 +666,12 @@ int qHash(EditorWindow::ActionGroup actionGroup)
 }
 
 
-bool EditorWindow::isUncommited() const
+bool EditorWindow::isUncommitted() const
 {
-    return ui->dataView->isUncommited();
+    return ui->dataView->isUncommitted();
 }
 
-QString EditorWindow::getQuitUncommitedConfirmMessage() const
+QString EditorWindow::getQuitUncommittedConfirmMessage() const
 {
-    return tr("Editor window \"%1\" has uncommited data.").arg(getMdiWindow()->windowTitle());
+    return tr("Editor window \"%1\" has uncommitted data.").arg(getMdiWindow()->windowTitle());
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
index d952b1b..12486a8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
@@ -93,8 +93,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         void execute();
         QToolBar* getToolBar(int toolbar) const;
         SqlEditor* getEditor() const;
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
 
     protected:
         void changeEvent(QEvent *e);
@@ -115,6 +115,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
         void selectCurrentQuery(bool fallBackToPreviousIfNecessary = false);
         void updateShortcutTips();
 
+        static const int queryLimitForSmartExecution = 100;
+
         static ResultsDisplayMode resultsDisplayMode;
         static QHash<Action,QAction*> staticActions;
         static QHash<ActionGroup,QActionGroup*> staticActionGroups;
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp
index 29163e3..1bfd1f7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp
@@ -621,12 +621,12 @@ QVariant FunctionsEditor::saveSession()
 }
 
 
-bool FunctionsEditor::isUncommited() const
+bool FunctionsEditor::isUncommitted() const
 {
     return model->isModified();
 }
 
-QString FunctionsEditor::getQuitUncommitedConfirmMessage() const
+QString FunctionsEditor::getQuitUncommittedConfirmMessage() const
 {
-    return tr("Functions editor window has uncommited modifications.");
+    return tr("Functions editor window has uncommitted modifications.");
 }
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h
index 0fa496e..72455d3 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h
@@ -48,8 +48,8 @@ class GUI_API_EXPORT FunctionsEditor : public MdiChild
         ~FunctionsEditor();
 
         bool restoreSessionNextTime();
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
 
     protected:
         QVariant saveSession();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
index fd344e8..286aad7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
@@ -176,9 +176,10 @@ void TableWindow::init()
     connect(CFG_UI.General.DataTabAsFirstInTables, SIGNAL(changed(const QVariant&)), this, SLOT(updateTabsOrder()));
     connect(ui->structureView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(structureViewDoubleClicked(const QModelIndex&)));
     connect(ui->tableConstraintsView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(constraintsViewDoubleClicked(const QModelIndex&)));
+    connect(CFG_UI.Fonts.DataView, SIGNAL(changed(QVariant)), this, SLOT(updateFont()));
 
     structureExecutor = new ChainExecutor(this);
-    connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited()));
+    connect(structureExecutor, SIGNAL(success(SqlQueryPtr)), this, SLOT(changesSuccessfullyCommitted()));
     connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString)));
 
     THEME_TUNER->manageCompactLayout({
@@ -191,6 +192,7 @@ void TableWindow::init()
                                          ui->ddlTab
                                      });
 
+    updateFont();
     setupCoverWidget();
     updateAfterInit();
 }
@@ -797,7 +799,7 @@ void TableWindow::commitStructure(bool skipWarning)
     executeStructureChanges();
 }
 
-void TableWindow::changesSuccessfullyCommited()
+void TableWindow::changesSuccessfullyCommitted()
 {
     modifyingThisTable = false;
 
@@ -820,10 +822,17 @@ void TableWindow::changesSuccessfullyCommited()
     updateNewTableState();
     updateWindowTitle();
 
+    NotifyManager* notifyManager = NotifyManager::getInstance();
     if (oldTable.compare(table, Qt::CaseInsensitive) == 0 || oldTable.isEmpty())
-        notifyInfo(tr("Commited changes for table '%1' successfly.").arg(table));
+    {
+        notifyInfo(tr("Committed changes for table '%1' successfully.").arg(table));
+    }
     else
-        notifyInfo(tr("Commited changes for table '%1' (named before '%2') successfly.").arg(table, oldTable));
+    {
+        notifyInfo(tr("Committed changes for table '%1' (named before '%2') successfully.").arg(table, oldTable));
+        notifyManager->renamed(db, database, oldTable, table);
+    }
+    notifyManager->modified(db, database, table);
 
     DBTREE->refreshSchema(db);
 
@@ -835,7 +844,6 @@ void TableWindow::changesSuccessfullyCommited()
             tableModifier->getModifiedTriggers(),
             tableModifier->getModifiedViews()
         };
-        NotifyManager* notifyManager = NotifyManager::getInstance();
         foreach (const QStringList& objList, modifiedObjects)
         {
             foreach (const QString& obj, objList)
@@ -886,7 +894,7 @@ void TableWindow::resetAutoincrement()
     if (res->isError())
         notifyError(tr("An error occurred while trying to reset autoincrement value for table '%1': %2").arg(table, res->getErrorText()));
     else
-        notifyInfo(tr("Autoincrement value for table '%1' has been reset successfly.").arg(table));
+        notifyInfo(tr("Autoincrement value for table '%1' has been reset successfully.").arg(table));
 }
 
 void TableWindow::addColumn()
@@ -1259,8 +1267,8 @@ void TableWindow::tabChanged(int newTab)
     {
         if (isModified())
         {
-            int res = QMessageBox::question(this, tr("Uncommited changes"),
-                                            tr("There are uncommited structure modifications. You cannot browse or edit data until you have "
+            int res = QMessageBox::question(this, tr("Uncommitted changes"),
+                                            tr("There are uncommitted structure modifications. You cannot browse or edit data until you have "
                                                "table structure settled.\n"
                                                "Do you want to commit the structure, or do you want to go back to the structure tab?"),
                                             tr("Go back to structure tab"), tr("Commit modifications and browse data."));
@@ -1596,23 +1604,23 @@ bool TableWindow::handleInitialFocus()
     return false;
 }
 
-bool TableWindow::isUncommited() const
+bool TableWindow::isUncommitted() const
 {
-    return ui->dataView->isUncommited() || isModified();
+    return ui->dataView->isUncommitted() || isModified();
 }
 
-QString TableWindow::getQuitUncommitedConfirmMessage() const
+QString TableWindow::getQuitUncommittedConfirmMessage() const
 {
     QString title = getMdiWindow()->windowTitle();
-    if (ui->dataView->isUncommited() && isModified())
-        return tr("Table window \"%1\" has uncommited structure modifications and data.").arg(title);
-    else if (ui->dataView->isUncommited())
-        return tr("Table window \"%1\" has uncommited data.").arg(title);
+    if (ui->dataView->isUncommitted() && isModified())
+        return tr("Table window \"%1\" has uncommitted structure modifications and data.").arg(title);
+    else if (ui->dataView->isUncommitted())
+        return tr("Table window \"%1\" has uncommitted data.").arg(title);
     else if (isModified())
-        return tr("Table window \"%1\" has uncommited structure modifications.").arg(title);
+        return tr("Table window \"%1\" has uncommitted structure modifications.").arg(title);
     else
     {
-        qCritical() << "Unhandled message case in TableWindow::getQuitUncommitedConfirmMessage().";
+        qCritical() << "Unhandled message case in TableWindow::getQuitUncommittedConfirmMessage().";
         return QString();
     }
 }
@@ -1630,3 +1638,18 @@ Db* TableWindow::getAssociatedDb() const
 {
     return db;
 }
+
+void TableWindow::updateFont()
+{
+    QFont f = CFG_UI.Fonts.DataView.get();
+    QFontMetrics fm(f);
+
+    QTableView* views[] = {ui->structureView, ui->tableConstraintsView, ui->indexList, ui->triggerList};
+    for (QTableView* view : views)
+    {
+        view->setFont(f);
+        view->horizontalHeader()->setFont(f);
+        view->verticalHeader()->setFont(f);
+        view->verticalHeader()->setDefaultSectionSize(fm.height() + 4);
+    }
+}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
index d8738f1..f44af4f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
@@ -118,8 +118,8 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         QString getTable() const;
         Db* getDb() const;
         bool handleInitialFocus();
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
         void useCurrentTableAsBaseForNew();
         Db* getAssociatedDb() const;
 
@@ -193,7 +193,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         void checkIfTriggerDeleted(const QString& object);
         void refreshStructure();
         void commitStructure(bool skipWarning = false);
-        void changesSuccessfullyCommited();
+        void changesSuccessfullyCommitted();
         void changesFailedToCommit(int errorCode, const QString& errorText);
         void rollbackStructure();
         void resetAutoincrement();
@@ -237,6 +237,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         void nextTab();
         void prevTab();
         void updateTabsOrder();
+        void updateFont();
 
     public slots:
         void updateIndexes();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
index 07c927c..be805af 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
@@ -237,9 +237,10 @@ void ViewWindow::init()
     connect(ui->outputColumnsTable->model(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)), this, SLOT(updateQueryToolbarStatus()));
     connect(ui->outputColumnsTable, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(updateQueryToolbarStatus()));
     connect(CFG_UI.General.DataTabAsFirstInViews, SIGNAL(changed(const QVariant&)), this, SLOT(updateTabsOrder()));
+    connect(CFG_UI.Fonts.DataView, SIGNAL(changed(QVariant)), this, SLOT(updateFont()));
 
     structureExecutor = new ChainExecutor(this);
-    connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited()));
+    connect(structureExecutor, SIGNAL(success(SqlQueryPtr)), this, SLOT(changesSuccessfullyCommitted()));
     connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString)));
 
     setupCoverWidget();
@@ -253,6 +254,7 @@ void ViewWindow::init()
 
     updateTabsOrder();
 
+    updateFont();
     refreshTriggers();
     updateQueryToolbarStatus();
     updateTriggersState();
@@ -347,23 +349,23 @@ void ViewWindow::setSelect(const QString &selectSql)
     ui->queryEdit->setPlainText(selectSql);
 }
 
-bool ViewWindow::isUncommited() const
+bool ViewWindow::isUncommitted() const
 {
-    return ui->dataView->isUncommited() || isModified();
+    return ui->dataView->isUncommitted() || isModified();
 }
 
-QString ViewWindow::getQuitUncommitedConfirmMessage() const
+QString ViewWindow::getQuitUncommittedConfirmMessage() const
 {
     QString title = getMdiWindow()->windowTitle();
-    if (ui->dataView->isUncommited() && isModified())
-        return tr("View window \"%1\" has uncommited structure modifications and data.").arg(title);
-    else if (ui->dataView->isUncommited())
-        return tr("View window \"%1\" has uncommited data.").arg(title);
+    if (ui->dataView->isUncommitted() && isModified())
+        return tr("View window \"%1\" has uncommitted structure modifications and data.").arg(title);
+    else if (ui->dataView->isUncommitted())
+        return tr("View window \"%1\" has uncommitted data.").arg(title);
     else if (isModified())
-        return tr("View window \"%1\" has uncommited structure modifications.").arg(title);
+        return tr("View window \"%1\" has uncommitted structure modifications.").arg(title);
     else
     {
-        qCritical() << "Unhandled message case in ViewWindow::getQuitUncommitedConfirmMessage().";
+        qCritical() << "Unhandled message case in ViewWindow::getQuitUncommittedConfirmMessage().";
         return QString();
     }
 }
@@ -569,8 +571,8 @@ void ViewWindow::tabChanged(int tabIdx)
     {
             if (isModified())
             {
-                int res = QMessageBox::question(this, tr("Uncommited changes"),
-                                                tr("There are uncommited structure modifications. You cannot browse or edit data until you have "
+                int res = QMessageBox::question(this, tr("Uncommitted changes"),
+                                                tr("There are uncommitted structure modifications. You cannot browse or edit data until you have "
                                                    "the view structure settled.\n"
                                                    "Do you want to commit the structure, or do you want to go back to the structure tab?"),
                                                 tr("Go back to structure tab"), tr("Commit modifications and browse data."));
@@ -604,7 +606,7 @@ void ViewWindow::updateQueryToolbarStatus()
     actionMap[REFRESH_QUERY]->setEnabled(existingView);
 }
 
-void ViewWindow::changesSuccessfullyCommited()
+void ViewWindow::changesSuccessfullyCommitted()
 {
     QStringList sqls = structureExecutor->getQueries();
     CFG->addDdlHistory(sqls.join("\n"), db->getName(), db->getPath());
@@ -624,9 +626,9 @@ void ViewWindow::changesSuccessfullyCommited()
     updateWindowTitle();
 
     if (oldView.compare(view, Qt::CaseInsensitive) == 0)
-        notifyInfo(tr("Commited changes for view '%1' successfly.").arg(view));
+        notifyInfo(tr("Committed changes for view '%1' successfully.").arg(view));
     else
-        notifyInfo(tr("Commited changes for view '%1' (named before '%2') successfly.").arg(view, oldView));
+        notifyInfo(tr("Committed changes for view '%1' (named before '%2') successfully.").arg(view, oldView));
 
     DBTREE->refreshSchema(db);
 }
@@ -1044,3 +1046,18 @@ void ViewWindow::executeStructureChanges()
     structureExecutor->exec();
     widgetCover->show();
 }
+
+void ViewWindow::updateFont()
+{
+    QFont f = CFG_UI.Fonts.DataView.get();
+    QFontMetrics fm(f);
+
+    QTableView* views[] = {ui->triggersList};
+    for (QTableView* view : views)
+    {
+        view->setFont(f);
+        view->horizontalHeader()->setFont(f);
+        view->verticalHeader()->setFont(f);
+        view->verticalHeader()->setDefaultSectionSize(fm.height() + 4);
+    }
+}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
index 65c3260..6144ad8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
@@ -73,8 +73,8 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
         QString getDatabase() const;
         QString getView() const;
         void setSelect(const QString& selectSql);
-        bool isUncommited() const;
-        QString getQuitUncommitedConfirmMessage() const;
+        bool isUncommitted() const;
+        QString getQuitUncommittedConfirmMessage() const;
         Db* getAssociatedDb() const;
 
         static void staticInit();
@@ -147,7 +147,7 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
         void executionFailed(const QString& errorMessage);
         void tabChanged(int tabIdx);
         void updateQueryToolbarStatus();
-        void changesSuccessfullyCommited();
+        void changesSuccessfullyCommitted();
         void changesFailedToCommit(int errorCode, const QString& errorText);
         void updateTriggersState();
         void nextTab();
@@ -165,6 +165,7 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
         void updateDbRelatedUiElements();
         void updateTabsOrder();
         void triggerViewDoubleClicked(const QModelIndex& idx);
+        void updateFont();
 
     public slots:
         void refreshTriggers();