#9552 preferences rework in eclipse and standalone versions

Former-commit-id: 5c1dbd65

#9552 preferences rework in eclipse and standalone versions
Former-commit-id: 5c1dbd65
96d9ce50 · LonwoLonwo · 7fdb6bbd · 96d9ce50 · 96d9ce50 · 96d9ce50
51 changed file
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
@@ -108,7 +108,6 @@ page.org.jkiss.dbeaver.preferences.main.dataformat.name = Data Formats
 page.org.jkiss.dbeaver.preferences.main.connections.name = Connections
 page.org.jkiss.dbeaver.preferences.main.transactions.name = Transactions
 page.org.jkiss.dbeaver.preferences.main.meta.name = Metadata
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name = Database Editor
 page.org.jkiss.dbeaver.preferences.main.qm.name = Query Manager
 page.org.jkiss.dbeaver.preferences.connectionTypes.name = Connection Types
 page.org.jkiss.dbeaver.project.settings.networkProfiles.name = Network Profiles
@@ -140,19 +139,21 @@ wizard.org.jkiss.dbeaver.core.wizard.import.scripts.description = SQL Scripts
 wizard.org.jkiss.dbeaver.core.wizard.new.connection.name = Database Connection
 wizard.org.jkiss.dbeaver.core.wizard.new.connection.description = Database connection
-keyword.org.jkiss.dbeaver.core.keyword.pref.db.general.label = update check language notification task bar
+keyword.org.jkiss.dbeaver.core.keyword.pref.db.general.label = update check language notification task bar timeout
-keyword.org.jkiss.dbeaver.core.keyword.pref.db.dataformat.label = format date timestamp number string locale language
+keyword.org.jkiss.dbeaver.core.keyword.pref.db.dataformat.label = format date timestamp number string locale language numeric native scientific notation profile country time
-keyword.org.jkiss.dbeaver.core.keyword.pref.db.qm.label = query log statement ddl
+keyword.org.jkiss.dbeaver.core.keyword.pref.db.qm.label = query log statement ddl scripts functions metadata entries log storage sessions transactions object types
-keyword.org.jkiss.dbeaver.core.keyword.pref.editor.binary.label = binary hex blob
+keyword.org.jkiss.dbeaver.core.keyword.pref.editor.binary.label = binary hex blob style font char size width
-keyword.org.jkiss.dbeaver.core.keyword.pref.editor.data.label = data edit fetch size limit references scroll segment filters order sql
+keyword.org.jkiss.dbeaver.core.keyword.pref.editor.data.label = data edit fetch size limit references scroll segment filters order sql resultset refresh results timeout query subselect cursors key columns navigator errors
-keyword.org.jkiss.dbeaver.core.keyword.pref.editor.content.label = lob blob clob
+keyword.org.jkiss.dbeaver.core.keyword.pref.editor.content.label = lob blob clob object binary commit long encoding formatter hex base64 dialog memory separate editor
-keyword.org.jkiss.dbeaver.core.keyword.pref.editor.erd.label = erd diagram
+keyword.org.jkiss.dbeaver.core.keyword.pref.editor.erd.label = erd diagram colorize print margin grid visibility partitions views
-keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding
+keyword.org.jkiss.dbeaver.core.keyword.pref.editor.sql.label = sql script commit separate connection query word occurrence save tab folding results occurrences restore
 keyword.org.jkiss.dbeaver.core.keyword.pref.editor.entity.label = object entity editor column sql preview refresh
-keyword.org.jkiss.dbeaver.core.keyword.pref.ui.general.label = update http proxy
+keyword.org.jkiss.dbeaver.core.keyword.pref.ui.general.label = update http proxy driver
 keyword.org.jkiss.dbeaver.core.keyword.connection = database connection connect
-keyword.org.jkiss.dbeaver.core.keyword.pref.resultset.grid.label = grid spreadsheet data view settings
+keyword.org.jkiss.dbeaver.core.keyword.database.connection.label =  drivers security errors timeout transaction maven oracle postgresql execution meta metadata commit auto-commit notifications password bouncycastle http encription
-keyword.org.jkiss.dbeaver.core.keyword.pref.resultset.plain.text.label = plain text data view settings
+keyword.org.jkiss.dbeaver.core.keyword.pref.resultset.grid.label = grid spreadsheet data view settings icon attribute double-click batch rows filters
+keyword.org.jkiss.dbeaver.core.keyword.pref.resultset.plain.text.label = plain text data view settings value format delimiter spaces tab column
+keyword.org.jkiss.dbeaver.core.keyword.user.interface.label = confirmations error logs navigator query history
 maven.respository.central = Central Repository

--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_de.properties
@@ -94,7 +94,6 @@ page.org.jkiss.dbeaver.preferences.connectionTypes.name             = Verbindung
 page.org.jkiss.dbeaver.preferences.editors.name                     = Editoren
 page.org.jkiss.dbeaver.preferences.main.connections.name            = Verbindungen
 page.org.jkiss.dbeaver.preferences.main.dataformat.name             = Datenformat
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name           = Datenbankeditor
 page.org.jkiss.dbeaver.preferences.main.errorHandle.name            = Fehler-Handler
 page.org.jkiss.dbeaver.preferences.main.meta.name                   = Metadaten
 page.org.jkiss.dbeaver.preferences.main.qm.name                     = Abfragemanager

--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_fr.properties
@@ -124,7 +124,6 @@ page.org.jkiss.dbeaver.preferences.main.resultset.presentation.name = Pr\u00E9se
 page.org.jkiss.dbeaver.preferences.main.dataformat.name = Formats de donn\u00E9es
 page.org.jkiss.dbeaver.preferences.main.connections.name = Connexions
 page.org.jkiss.dbeaver.preferences.main.meta.name = M\u00E9tadonn\u00E9es
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name = Editeur de bases de donn\u00E9es
 page.org.jkiss.dbeaver.preferences.main.qm.name = Gestionnaire de requ\u00EAtes
 page.org.jkiss.dbeaver.preferences.connectionTypes.name = Types de connexions
 page.org.jkiss.dbeaver.preferences.projectSettings.name = Param\u00E8tres de DBeaver

--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ja.properties
@@ -102,7 +102,6 @@ page.org.jkiss.dbeaver.preferences.main.dataformat.name =\u30C7\u30FC\u30BF\u5F6
 page.org.jkiss.dbeaver.preferences.main.connections.name =\u63A5\u7D9A
 page.org.jkiss.dbeaver.preferences.main.transactions.name = \u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3
 page.org.jkiss.dbeaver.preferences.main.meta.name =\u30E1\u30BF\u30C7\u30FC\u30BF
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name =\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30A8\u30C7\u30A3\u30BF
 page.org.jkiss.dbeaver.preferences.main.qm.name =\u30AF\u30A8\u30EA\u30DE\u30CD\u30FC\u30B8\u30E3
 page.org.jkiss.dbeaver.preferences.connectionTypes.name =\u63A5\u7D9A\u30BF\u30A4\u30D7
 page.org.jkiss.dbeaver.project.settings.networkProfiles.name = \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB

--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ko.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ko.properties
@@ -99,7 +99,6 @@ page.org.jkiss.dbeaver.preferences.main.resultset.presentation.name = \uD45C\uD6
 page.org.jkiss.dbeaver.preferences.main.dataformat.name = \uB370\uC774\uD130 \uD3EC\uB9F7
 page.org.jkiss.dbeaver.preferences.main.connections.name = \uC5F0\uACB0
 page.org.jkiss.dbeaver.preferences.main.meta.name = \uBA54\uD0C0\uB370\uC774\uD130
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name = \uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uD3B8\uC9D1\uAE30
 page.org.jkiss.dbeaver.preferences.main.qm.name = \uCFFC\uB9AC \uAD00\uB9AC\uC790
 page.org.jkiss.dbeaver.preferences.connectionTypes.name = \uC5F0\uACB0 \uC720\uD615

--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_pt_BR.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_pt_BR.properties
@@ -106,7 +106,6 @@ page.org.jkiss.dbeaver.preferences.connectionTypes.name             = Tipos de c
 page.org.jkiss.dbeaver.preferences.editors.name                     = Editor
 page.org.jkiss.dbeaver.preferences.main.connections.name            = Conex\u00E3o
 page.org.jkiss.dbeaver.preferences.main.dataformat.name             = Formato de dados
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name           = Editor de banco de dados
 page.org.jkiss.dbeaver.preferences.main.errorHandle.name            = Erros e Timeouts
 page.org.jkiss.dbeaver.preferences.main.meta.name                   = Metadatdoa
 page.org.jkiss.dbeaver.preferences.main.qm.name                     = Ger\u00EAncia

--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_ru.properties
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle_zh.properties
@@ -96,7 +96,6 @@ page.org.jkiss.dbeaver.preferences.connectionTypes.name             = \u8FDE\u63
 page.org.jkiss.dbeaver.preferences.editors.name                     = \u7F16\u8F91\u5668
 page.org.jkiss.dbeaver.preferences.main.connections.name            = \u8FDE\u63A5
 page.org.jkiss.dbeaver.preferences.main.dataformat.name             = \u6570\u636E\u683C\u5F0F
-page.org.jkiss.dbeaver.preferences.main.entityeditor.name           = \u6570\u636E\u7F16\u8F91\u5668
 page.org.jkiss.dbeaver.preferences.main.errorHandle.name            = \u9519\u8BEF\u5904\u7406
 page.org.jkiss.dbeaver.preferences.main.meta.name                   = \u5143\u6570\u636E
 page.org.jkiss.dbeaver.preferences.main.qm.name                     = \u67E5\u8BE2\u7BA1\u7406\u5668

--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -997,14 +997,14 @@
            </enabledWhen>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.editors" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" id="org.jkiss.dbeaver.preferences.main.entityeditor" name="%page.org.jkiss.dbeaver.preferences.main.entityeditor.name">
+        <!--<page category="org.jkiss.dbeaver.preferences.editors" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" id="org.jkiss.dbeaver.preferences.main.entityeditor" name="%page.org.jkiss.dbeaver.preferences.main.entityeditor.name">
            <enabledWhen>
                <or>
                    <instanceof value="org.jkiss.dbeaver.model.navigator.DBNDataSource"/>
                    <adapt type="org.jkiss.dbeaver.model.DBPDataSourceContainer"/>
                </or>
            </enabledWhen>
-        </page>
+        </page>-->
        <page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.resultset" class="org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetMain" name="%page.org.jkiss.dbeaver.preferences.main.resultset.name">
            <enabledWhen><reference definitionId="org.jkiss.dbeaver.core.preferences.datasource"/></enabledWhen>
@@ -1205,6 +1205,9 @@
        <keyword id="org.jkiss.dbeaver.core.keyword.connection" label="%keyword.org.jkiss.dbeaver.core.keyword.connection"/>
        <keyword id="org.jkiss.dbeaver.core.keyword.pref.resultset.grid" label="%keyword.org.jkiss.dbeaver.core.keyword.pref.resultset.grid.label"/>
        <keyword id="org.jkiss.dbeaver.core.keyword.pref.resultset.plain.text" label="%keyword.org.jkiss.dbeaver.core.keyword.pref.resultset.plain.text.label"/>
+        <keyword id="org.jkiss.dbeaver.core.keyword.database.connection" label="%keyword.org.jkiss.dbeaver.core.keyword.database.connection.label"/>
+        <keyword id="org.jkiss.dbeaver.core.keyword.user.interface" label="%keyword.org.jkiss.dbeaver.core.keyword.user.interface.label"/>
    </extension>
    <!-- DBeaver extensions -->

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java
@@ -317,6 +317,8 @@ public class CoreMessages extends NLS {
 	public static String pref_page_ui_general_group_general;
 	public static String pref_page_ui_general_group_language;
 	public static String pref_page_ui_general_group_editors;
+	public static String pref_page_eclipse_ui_general_group_general;
+	public static String pref_page_eclipse_ui_general_group_label;
 	public static String runtime_jobs_connect_name;
 	public static String runtime_jobs_connect_status_connected;
@@ -383,8 +385,6 @@ public class CoreMessages extends NLS {
 	public static String pref_page_database_general_server_side_object_filters;
 	public static String pref_page_database_general_server_side_object_filters_tip;
 	public static String pref_page_database_general_group_query_metadata;
-	public static String pref_page_database_general_use_column_names;
-	public static String pref_page_database_general_use_column_names_tip;
 	// EntityEditor
 	public static String pref_page_ui_general_keep_database_editors_tip;
 	public static String pref_page_ui_general_refresh_editor_on_open_tip;

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties
@@ -327,12 +327,15 @@ pref_page_query_manager_log_file_hint = Changes will take effect only after prog
 pref_page_ui_general_checkbox_automatic_updates = Automatic updates check
 pref_page_ui_general_combo_language = Language
 pref_page_ui_general_combo_language_tip = Application language - used for user interface localization
-pref_page_ui_general_group_editors = Editors
+pref_page_ui_general_group_editors = Object Editors
-pref_page_ui_general_group_general = General
+pref_page_eclipse_ui_general_group_general = General
 pref_page_ui_general_group_language = Language
 pref_page_ui_general_keep_database_editors = Reopen database editors after restart
 pref_page_ui_general_refresh_editor_on_open = Force object refresh on editor open
+pref_page_ui_general_group_general = General
+pref_page_eclipse_ui_general_group_label = Hello. It is DBeaver settings. DBeaver is free and open source\nuniversal database tool for developers and database administrators.
 runtime_jobs_connect_name = Connect to "{0}"
 runtime_jobs_connect_status_connected = Connected
 runtime_jobs_connect_status_error = Error connecting to datasource "{0}"
@@ -363,8 +366,7 @@ pref_page_database_general_checkbox_show_row_count_tip = Disable this option if
 pref_page_database_general_server_side_object_filters = Server side object filters
 pref_page_database_general_server_side_object_filters_tip = Supported only by some datasources.\nModify metadata queries so only necessary objects will be read from the database.\nOtherwise, filtering will be applied on the client side.\nDisable this option if you want to see linked objects (e.g. from foreign keys).
 pref_page_database_general_group_query_metadata = Query metadata
-pref_page_database_general_use_column_names = Use column names instead of column labels
-pref_page_database_general_use_column_names_tip = Ignore column labels in data viewer
 #EntityEditor
 pref_page_ui_general_keep_database_editors_tip = Remembers open editors (e.g. table editors) and reopens them after DBeaver restarts.
 pref_page_ui_general_refresh_editor_on_open_tip = Refreshes object from database every time you open this object's editor.\nYou may need this option if your database structure changes frequently (e.g. by SQL scripts). 

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_de.properties
@@ -596,11 +596,7 @@ pref_page_database_general_separate_meta_connection_tip = Das \u00D6ffnen einer
 pref_page_database_general_server_side_object_filters = Serverseitige Objektfilter
-pref_page_database_general_server_side_object_filters_tip = Modifizieren Sie die Metadatenabfragen, sodass nur notwendige Objekte aus der Datenbank gelesen werden (nur von einigen Datenquellen unterst\u00FCtzt).\r\nAndernfalls wird die Filterung auf der Clientseite angewendet.\r\nEs ist sinnvoll, diese Option zu deaktivieren, wenn Sie verkn\u00FCpfte Objekte sehen m\u00F6chten (z.B. von Fremdschl\u00FCsseln). 
+pref_page_database_general_server_side_object_filters_tip = Modifizieren Sie die Metadatenabfragen, sodass nur notwendige Objekte aus der Datenbank gelesen werden (nur von einigen Datenquellen unterst\u00FCtzt).\r\nAndernfalls wird die Filterung auf der Clientseite angewendet.\r\nEs ist sinnvoll, diese Option zu deaktivieren, wenn Sie verkn\u00FCpfte Objekte sehen m\u00F6chten (z.B. von Fremdschl\u00FCsseln).
-pref_page_database_general_use_column_names = Verwenden Sie Spaltennamen anstelle von Spaltenbezeichnungen
-pref_page_database_general_use_column_names_tip = Ignorieren von Spaltenbeschriftungen im Datenviewer
 pref_page_database_label_client_application_name = Name der Client-Anwendung
@@ -693,7 +689,7 @@ pref_page_ui_general_combo_language_tip = Anwendungssprache - wird f\u00FCr die
 pref_page_ui_general_group_debug_logs = Debug-Protokolle
-pref_page_ui_general_group_editors = Editoren
+pref_page_ui_general_group_editors = Objekteditoren
 pref_page_ui_general_group_general = Allgemein

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_fr.properties
@@ -580,8 +580,6 @@ pref_page_database_general_checkbox_show_row_count_tip = D\u00E9sactivez cette o
 pref_page_database_general_server_side_object_filters = Filtrage des objets c\u00F4t\u00E9 serveur
 pref_page_database_general_server_side_object_filters_tip = Modifie les requ\u00EAtes de m\u00E9tadonn\u00E9es pour que seuls les objets n\u00E9cessaires soient lus dans la base de donn\u00E9es (uniquement sur certaines sources de donn\u00E9es).\nSinon le filtrage sera fait c\u00F4t\u00E9 client.\nD\u00E9sactivez cette option si vous souhaitez voir les objets li\u00E9s (par ex. par des clefs \u00E9trang\u00E8res). 
 pref_page_database_general_group_query_metadata = Requ\u00EAter les m\u00E9tadonn\u00E9es
-pref_page_database_general_use_column_names = Utiliser les noms des colonnes au lieu de leur \u00E9tiquettes
-pref_page_database_general_use_column_names_tip = Ignorer les \u00E9tiquettes de colonnes dans la visionneuse de donn\u00E9es
 #DatabaseGeneral
 pref_page_ui_general_group_task_bar = Barre des t\u00E0ches

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ja.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ja.properties
@@ -338,8 +338,7 @@ pref_page_database_general_checkbox_show_row_count_tip =\u3053\u306E\u30AA\u30D7
 pref_page_database_general_server_side_object_filters =\u30B5\u30FC\u30D0\u30FC\u5074\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30D5\u30A3\u30EB\u30BF\u30FC
 pref_page_database_general_server_side_object_filters_tip =\u5FC5\u8981\u306A\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3060\u3051\u304C\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u8AAD\u307F\u8FBC\u307E\u308C\u308B\u3088\u3046\u306B\u30E1\u30BF\u30C7\u30FC\u30BF\u30AF\u30A8\u30EA\u3092\u5909\u66F4\u3057\u307E\u3059\uFF08\u3044\u304F\u3064\u304B\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u306B\u3088\u3063\u3066\u306E\u307F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u307E\u3059\uFF09\u3002\n\u305D\u306E\u4ED6\u306E\u30D5\u30A3\u30EB\u30BF\u30EA\u30F3\u30B0\u306F\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u5074\u3067\u9069\u7528\u3055\u308C\u307E\u3059\u3002\n\u30EA\u30F3\u30AF\u3055\u308C\u305F\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u8868\u793A\u3059\u308B\u5834\u5408\u306F\u3001 \uFF09\u3002
 pref_page_database_general_group_query_metadata =\u30AF\u30A8\u30EA\u30E1\u30BF\u30C7\u30FC\u30BF
-pref_page_database_general_use_column_names =\u5217\u30E9\u30D9\u30EB\u306E\u4EE3\u308F\u308A\u306B\u5217\u540D\u3092\u4F7F\u7528\u3059\u308B
-pref_page_database_general_use_column_names_tip =\u30C7\u30FC\u30BF\u30D3\u30E5\u30FC\u30A2\u3067\u5217\u30E9\u30D9\u30EB\u3092\u7121\u8996\u3059\u308B
 #EntityEditor
 pref_page_ui_general_keep_database_editors_tip =DBeaver\u306E\u518D\u8D77\u52D5\u5F8C\u306B\u958B\u3044\u3066\u3044\u308B\u30A8\u30C7\u30A3\u30BF\uFF08\u30C6\u30FC\u30D6\u30EB\u30A8\u30C7\u30A3\u30BF\u306A\u3069\uFF09\u3092\u958B\u3044\u3066\u518D\u5EA6\u958B\u304F\u3053\u3068\u3092\u601D\u3044\u51FA\u3057\u307E\u3059\u3002
 pref_page_ui_general_refresh_editor_on_open_tip =\u3053\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30A8\u30C7\u30A3\u30BF\u3092\u958B\u304F\u305F\u3073\u306B\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u3092\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u3057\u307E\u3059\u3002\n\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u69CB\u9020\u304C\u983B\u7E41\u306B\u5909\u66F4\u3055\u308C\u308B\u5834\u5408\uFF08SQL\u30B9\u30AF\u30EA\u30D7\u30C8\u306A\u3069\uFF09\u306B\u306F\u3001\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u5FC5\u8981\u306A\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_ru.properties
@@ -361,8 +361,7 @@ pref_page_database_general_checkbox_show_row_count_tip = It makes sense to disab
 pref_page_database_general_server_side_object_filters = \u0424\u0438\u043B\u044C\u0442\u0440\u044B \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 pref_page_database_general_server_side_object_filters_tip = Modify metadata queries so only necessary objects will be read from database (supported only by some datasources).\nOtherwise filtering will be applied on client side.\nIt makes sense to disable this option if you want to see linked object (e.g. from foreign keys). 
 pref_page_database_general_group_query_metadata = \u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435 \u0437\u0430\u043F\u0440\u043E\u0441\u0430
-pref_page_database_general_use_column_names = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0438\u043C\u0435\u043D\u0430 \u043A\u043E\u043B\u043E\u043D\u043E\u043A \u0432\u043C\u0435\u0441\u0442\u043E \u043C\u0435\u0442\u043E\u043A \u0441\u0442\u043E\u043B\u0431\u0446\u043E\u0432
-pref_page_database_general_use_column_names_tip = \u0418\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043C\u0435\u0442\u043A\u0438 \u043A\u043E\u043B\u043E\u043D\u043E\u043A \u0432 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
 #EntityEditor
 pref_page_ui_general_keep_database_editors_tip = \u0417\u0430\u043F\u043E\u043C\u0438\u043D\u0430\u0435\u0442 \u043E\u0442\u043A\u0440\u044B\u0442\u044B\u0435 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B \u0442\u0430\u0431\u043B\u0438\u0446) \u0438 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442 \u0438\u0445 \u043F\u043E\u0441\u043B\u0435 \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A\u0430 DBeaver.
 pref_page_ui_general_refresh_editor_on_open_tip = \u041E\u0431\u043D\u043E\u0432\u043B\u044F\u0435\u0442 \u043E\u0431\u044A\u0435\u043A\u0442 \u0438\u0437 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u0440\u0438 \u043A\u0430\u0436\u0434\u043E\u043C \u043E\u0442\u043A\u0440\u044B\u0442\u0438\u0438 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430 \u044D\u0442\u043E\u0433\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u0430.\n\u042D\u0442\u0430 \u043E\u043F\u0446\u0438\u044F \u043C\u043E\u0436\u0435\u0442 \u043F\u043E\u043D\u0430\u0434\u043E\u0431\u0438\u0442\u044C\u0441\u044F, \u0435\u0441\u043B\u0438 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0430 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445 \u0447\u0430\u0441\u0442\u043E \u043C\u0435\u043D\u044F\u0435\u0442\u0441\u044F (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0441\u043A\u0440\u0438\u043F\u0442\u0430\u043C\u0438 SQL).
@@ -372,7 +371,7 @@ pref_page_ui_general_show_preview_on_save = \u041F\u043E\u043A\u0430\u0437\u044B
 pref_page_ui_general_keep_database_editors = \u041F\u043E\u0432\u0442\u043E\u0440\u043D\u043E\u0435 \u043E\u0442\u043A\u0440\u044B\u0442\u0438\u0435 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u043E\u0432 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445 \u043F\u043E\u0441\u043B\u0435 \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A\u0430
 pref_page_ui_general_refresh_editor_on_open = \u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u0431\u044A\u0435\u043A\u0442\u0430 \u043F\u0440\u0438 \u043E\u0442\u043A\u0440\u044B\u0442\u0438\u0438 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430
-pref_page_ui_general_group_editors = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B
+pref_page_ui_general_group_editors = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432
 #DatabaseGeneral
 pref_page_ui_general_group_task_bar = \u041F\u0430\u043D\u0435\u043B\u044C \u0437\u0430\u0434\u0430\u0447
 pref_page_ui_general_label_enable_long_operations = \u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0435 \u043E \u0434\u043B\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F\u0445

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties
@@ -599,10 +599,6 @@ pref_page_database_general_server_side_object_filters = \u670D\u52A1\u5668\u7AEF
 pref_page_database_general_server_side_object_filters_tip = \u4FEE\u6539\u5143\u6570\u636E\u67E5\u8BE2\uFF0C\u56E0\u6B64\u53EA\u9700\u8981\u4ECE\u6570\u636E\u5E93\u4E2D\u8BFB\u53D6\u5FC5\u8981\u7684\u5BF9\u8C61(\u4EC5\u652F\u6301\u67D0\u4E9B\u6570\u636E\u6E90).\n\u5426\u5219\u5C06\u5728\u5BA2\u6237\u7AEF\u8FDB\u884C\u8FC7\u6EE4.\n\u5982\u679C\u60F3\u8981\u770B\u5230\u94FE\u63A5\u5BF9\u8C61(\u4F8B\u5982,\u6765\u81EA\u5916\u952E)\uFF0C\u53EF\u4EE5\u7981\u7528\u8BE5\u9009\u9879.
-pref_page_database_general_use_column_names = \u4F7F\u7528\u5217\u540D\u79F0\u800C\u4E0D\u662F\u5217\u6807\u7B7E
-pref_page_database_general_use_column_names_tip = \u5FFD\u7565\u6570\u636E\u67E5\u770B\u5668\u4E2D\u7684\u5217\u6807\u7B7E
 pref_page_database_label_client_application_name = \u5BA2\u6237\u7AEF\u540D\u79F0
 pref_page_database_label_disable_client_application_name = \u7981\u7528\u5BA2\u6237\u7AEF\u8EAB\u4EFD\u8BC6\u522B

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseEditors.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseEditors.java
@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.ui.preferences;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -47,6 +48,12 @@ public class PrefPageDatabaseEditors extends AbstractPrefPage implements IWorkbe
    //private Spinner toolbarDatabaseSelectorWidth;
    //private Spinner toolbarSchemaSelectorWidth;
+    private Button keepEditorsOnRestart;
+    private Button refreshEditorOnOpen;
+    private Button editorFullName;
+    private Button showTableGrid;
+    private Button showPreviewOnSave;
    public PrefPageDatabaseEditors()
    {
        super();
@@ -73,6 +80,17 @@ public class PrefPageDatabaseEditors extends AbstractPrefPage implements IWorkbe
            showEditToolbar = UIUtils.createCheckbox(toolbarsGroup, CoreMessages.pref_page_database_general_label_show_edit_toolbar, CoreMessages.pref_page_database_general_label_show_edit_toolbar_tip, false, 2);
            //toolbarDatabaseSelectorWidth = UIUtils.createLabelSpinner(toolbarsGroup, CoreMessages.pref_page_database_general_label_database_selector_width, CoreMessages.pref_page_database_general_label_database_selector_width_tip, 20, 10, 200);
            //toolbarSchemaSelectorWidth = UIUtils.createLabelSpinner(toolbarsGroup, CoreMessages.pref_page_database_general_label_schema_selector_width, CoreMessages.pref_page_database_general_label_schema_selector_width_tip, 20, 10, 200);
+            Group groupEditors = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_editors, 1, GridData.VERTICAL_ALIGN_BEGINNING, 0);
+            keepEditorsOnRestart = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_keep_database_editors, false);
+            keepEditorsOnRestart.setToolTipText(CoreMessages.pref_page_ui_general_keep_database_editors_tip);
+            refreshEditorOnOpen = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_refresh_editor_on_open, false);
+            refreshEditorOnOpen.setToolTipText(CoreMessages.pref_page_ui_general_refresh_editor_on_open_tip);
+            editorFullName = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_show_full_name_in_editor, false);
+            showTableGrid = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_show_table_grid, false);
+            showPreviewOnSave = UIUtils.createCheckbox(groupEditors, CoreMessages.pref_page_ui_general_show_preview_on_save, false);
        }
            performDefaults();
@@ -91,6 +109,11 @@ public class PrefPageDatabaseEditors extends AbstractPrefPage implements IWorkbe
        showEditToolbar.setSelection(store.getBoolean(DBeaverPreferences.TOOLBARS_SHOW_EDIT));
        //toolbarDatabaseSelectorWidth.setSelection(store.getInt(DBeaverPreferences.TOOLBARS_DATABASE_SELECTOR_WIDTH));
        //toolbarSchemaSelectorWidth.setSelection(store.getInt(DBeaverPreferences.TOOLBARS_SCHEMA_SELECTOR_WIDTH));
+        keepEditorsOnRestart.setSelection(store.getBoolean(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS));
+        refreshEditorOnOpen.setSelection(store.getBoolean(NavigatorPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN));
+        editorFullName.setSelection(store.getBoolean(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME));
+        showTableGrid.setSelection(store.getBoolean(NavigatorPreferences.NAVIGATOR_EDITOR_SHOW_TABLE_GRID));
+        showPreviewOnSave.setSelection(store.getBoolean(NavigatorPreferences.NAVIGATOR_SHOW_SQL_PREVIEW));
    }
    @Override
@@ -103,6 +126,11 @@ public class PrefPageDatabaseEditors extends AbstractPrefPage implements IWorkbe
        store.setValue(DBeaverPreferences.TOOLBARS_SHOW_EDIT, showEditToolbar.getSelection());
        //store.setValue(DBeaverPreferences.TOOLBARS_DATABASE_SELECTOR_WIDTH, toolbarDatabaseSelectorWidth.getSelection());
        //store.setValue(DBeaverPreferences.TOOLBARS_SCHEMA_SELECTOR_WIDTH, toolbarSchemaSelectorWidth.getSelection());
+        store.setValue(DBeaverPreferences.UI_KEEP_DATABASE_EDITORS, keepEditorsOnRestart.getSelection());
+        store.setValue(NavigatorPreferences.NAVIGATOR_REFRESH_EDITORS_ON_OPEN, refreshEditorOnOpen.getSelection());
+        store.setValue(DBeaverPreferences.NAVIGATOR_EDITOR_FULL_NAME, editorFullName.getSelection());
+        store.setValue(NavigatorPreferences.NAVIGATOR_EDITOR_SHOW_TABLE_GRID, showTableGrid.getSelection());
+        store.setValue(NavigatorPreferences.NAVIGATOR_SHOW_SQL_PREVIEW, showPreviewOnSave.getSelection());
        PrefUtils.savePreferenceStore(store);

--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageDatabaseGeneral.java
 /*
 * DBeaver - Universal Database Manager
 * Copyright (C) 2010-2020 DBeaver Corp and others
 * Copyright (C) 2011-2012 Eugene Fradkin (eugene.fradkin@gmail.com)
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.jkiss.dbeaver.ui.preferences;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.dialogs.ControlEnableState;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.IWorkbenchPropertyPage;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PreferenceLinkArea;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.ModelPreferences;
 import org.jkiss.dbeaver.core.CoreMessages;
-import org.jkiss.dbeaver.model.app.DBPPlatformLanguage;
+import org.jkiss.dbeaver.core.DBeaverCore;
-import org.jkiss.dbeaver.model.app.DBPPlatformLanguageManager;
+import org.jkiss.dbeaver.model.app.DBPPlatformLanguage;
-import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
+import org.jkiss.dbeaver.model.app.DBPPlatformLanguageManager;
-import org.jkiss.dbeaver.registry.language.PlatformLanguageDescriptor;
+import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
-import org.jkiss.dbeaver.registry.language.PlatformLanguageRegistry;
+import org.jkiss.dbeaver.registry.language.PlatformLanguageDescriptor;
-import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.registry.language.PlatformLanguageRegistry;
-import org.jkiss.dbeaver.ui.UIUtils;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
-import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLEditor;
+import org.jkiss.dbeaver.ui.UIUtils;
-import org.jkiss.dbeaver.ui.internal.UIMessages;
+import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLEditor;
-import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.dbeaver.ui.internal.UIMessages;
-import org.jkiss.dbeaver.utils.PrefUtils;
+import org.jkiss.dbeaver.utils.GeneralUtils;
-import org.jkiss.dbeaver.utils.RuntimeUtils;
+import org.jkiss.dbeaver.utils.PrefUtils;
-import org.jkiss.utils.CommonUtils;
+import org.jkiss.dbeaver.utils.RuntimeUtils;
+import org.jkiss.utils.CommonUtils;
-import java.util.List;
+import java.util.List;
-/**
- * PrefPageDatabaseGeneral
+/**
- */
+ * PrefPageDatabaseGeneral
-public class PrefPageDatabaseGeneral extends AbstractPrefPage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage
+ */
-{
+public class PrefPageDatabaseGeneral extends AbstractPrefPage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage
-    public static final String PAGE_ID = "org.jkiss.dbeaver.preferences.main.common"; //$NON-NLS-1$
+{
+    public static final String PAGE_ID = "org.jkiss.dbeaver.preferences.main.common"; //$NON-NLS-1$
-    private Button automaticUpdateCheck;
-    private Combo workspaceLanguage;
+    private Button automaticUpdateCheck;
+    private Combo workspaceLanguage;
-    private Button longOperationsCheck;
-    private Spinner longOperationsTimeout;
+    private Button longOperationsCheck;
+    private Spinner longOperationsTimeout;
-    private Button notificationsEnabled;
-    private Spinner notificationsCloseDelay;
+    private Button notificationsEnabled;
+    private Spinner notificationsCloseDelay;
-    public PrefPageDatabaseGeneral()
-    {
+    private boolean isStandalone = DBeaverCore.isStandalone();
-        super();
-        setPreferenceStore(new PreferenceStoreDelegate(DBWorkbench.getPlatform().getPreferenceStore()));
+    public PrefPageDatabaseGeneral()
-    }
+    {
+        super();
-    @Override
+        setPreferenceStore(new PreferenceStoreDelegate(DBWorkbench.getPlatform().getPreferenceStore()));
-    public void init(IWorkbench workbench)
+    }
-    {
+    @Override
-    }
+    public void init(IWorkbench workbench)
+    {
-    @Override
-    protected Control createContents(Composite parent)
+    }
-    {
-        Composite composite = UIUtils.createPlaceholder(parent, 1, 5);
+    @Override
+    protected Control createContents(Composite parent)
-        {
+    {
-            Group groupObjects = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_general, 2, GridData.VERTICAL_ALIGN_BEGINNING, 0);
+        Composite composite = UIUtils.createPlaceholder(parent, 1, 5);
-            automaticUpdateCheck = UIUtils.createCheckbox(groupObjects, CoreMessages.pref_page_ui_general_checkbox_automatic_updates, null, false, 2);
-            //automaticUpdateCheck.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
+        if (isStandalone) {
-        }
+            Group groupObjects = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_general, 2, GridData.VERTICAL_ALIGN_BEGINNING, 0);
-        {
+            automaticUpdateCheck = UIUtils.createCheckbox(groupObjects, CoreMessages.pref_page_ui_general_checkbox_automatic_updates, null, false, 2);
-            Group groupLanguage = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_language, 2, GridData.VERTICAL_ALIGN_BEGINNING, 0);
+            //automaticUpdateCheck.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, true, false, 2, 1));
+        }
-            workspaceLanguage = UIUtils.createLabelCombo(groupLanguage, CoreMessages.pref_page_ui_general_combo_language, CoreMessages.pref_page_ui_general_combo_language_tip, SWT.READ_ONLY | SWT.DROP_DOWN);
+        if (isStandalone) {
-            workspaceLanguage.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
+            Group groupLanguage = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_language, 2, GridData.VERTICAL_ALIGN_BEGINNING, 0);
-            List<PlatformLanguageDescriptor> languages = PlatformLanguageRegistry.getInstance().getLanguages();
-            DBPPlatformLanguage pLanguage = DBWorkbench.getPlatform().getLanguage();
+            workspaceLanguage = UIUtils.createLabelCombo(groupLanguage, CoreMessages.pref_page_ui_general_combo_language, CoreMessages.pref_page_ui_general_combo_language_tip, SWT.READ_ONLY | SWT.DROP_DOWN);
-            for (int i = 0; i < languages.size(); i++) {
+            workspaceLanguage.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-                PlatformLanguageDescriptor lang = languages.get(i);
+            List<PlatformLanguageDescriptor> languages = PlatformLanguageRegistry.getInstance().getLanguages();
-                workspaceLanguage.add(lang.getLabel());
+            DBPPlatformLanguage pLanguage = DBWorkbench.getPlatform().getLanguage();
-                if (CommonUtils.equalObjects(pLanguage, lang)) {
+            for (int i = 0; i < languages.size(); i++) {
-                    workspaceLanguage.select(i);
+                PlatformLanguageDescriptor lang = languages.get(i);
-                }
+                workspaceLanguage.add(lang.getLabel());
-            }
+                if (CommonUtils.equalObjects(pLanguage, lang)) {
-            if (workspaceLanguage.getSelectionIndex() < 0) {
+                    workspaceLanguage.select(i);
-                workspaceLanguage.select(0);
+                }
            }
+            if (workspaceLanguage.getSelectionIndex() < 0) {
-            Label tipLabel = UIUtils.createLabel(groupLanguage, CoreMessages.pref_page_ui_general_label_options_take_effect_after_restart);
+                workspaceLanguage.select(0);
-            tipLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING, GridData.VERTICAL_ALIGN_BEGINNING, false, false , 2, 1));
+            }
-        }
+            Label tipLabel = UIUtils.createLabel(groupLanguage, CoreMessages.pref_page_ui_general_label_options_take_effect_after_restart);
-        // Notifications settings
+            tipLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING, GridData.VERTICAL_ALIGN_BEGINNING, false, false , 2, 1));
-        {
+        }
-            Group notificationsGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_notifications, 2, GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING, 0);
+        // Notifications settings
-            notificationsEnabled = UIUtils.createCheckbox(notificationsGroup,
+        {
-                CoreMessages.pref_page_ui_general_label_enable_notifications,
+            Group notificationsGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_notifications, 2, GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING, 0);
-                CoreMessages.pref_page_ui_general_label_enable_notifications_tip, false, 2);
+            notificationsEnabled = UIUtils.createCheckbox(notificationsGroup,
-            notificationsCloseDelay = UIUtils.createLabelSpinner(notificationsGroup, CoreMessages.pref_page_ui_general_label_notifications_close_delay, 0, 0, Integer.MAX_VALUE);
+                CoreMessages.pref_page_ui_general_label_enable_notifications,
-        }
+                CoreMessages.pref_page_ui_general_label_enable_notifications_tip, false, 2);
-        // Agent settings
+            notificationsCloseDelay = UIUtils.createLabelSpinner(notificationsGroup, CoreMessages.pref_page_ui_general_label_notifications_close_delay, 0, 0, Integer.MAX_VALUE);
-        {
+        }
-            Group agentGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_task_bar, 2, GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING, 0);
+        // Agent settings
-            longOperationsCheck = UIUtils.createCheckbox(agentGroup,
+        {
-                    CoreMessages.pref_page_ui_general_label_enable_long_operations,
+            Group agentGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_ui_general_group_task_bar, 2, GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING, 0);
-                    CoreMessages.pref_page_ui_general_label_enable_long_operations_tip, false, 2);
+            longOperationsCheck = UIUtils.createCheckbox(agentGroup,
-            longOperationsTimeout = UIUtils.createLabelSpinner(agentGroup, CoreMessages.pref_page_ui_general_label_long_operation_timeout + UIMessages.label_sec, 0, 0, Integer.MAX_VALUE);
+                    CoreMessages.pref_page_ui_general_label_enable_long_operations,
+                    CoreMessages.pref_page_ui_general_label_enable_long_operations_tip, false, 2);
-            if (RuntimeUtils.isPlatformMacOS()) {
-                ControlEnableState.disable(agentGroup);
+            longOperationsTimeout = UIUtils.createLabelSpinner(agentGroup, CoreMessages.pref_page_ui_general_label_long_operation_timeout + UIMessages.label_sec, 0, 0, Integer.MAX_VALUE);
-            }
-        }
+            if (RuntimeUtils.isPlatformMacOS()) {
+                ControlEnableState.disable(agentGroup);
-        {
+            }
-            // Link to secure storage config
+        }
-            new PreferenceLinkArea(composite, SWT.NONE,
-                PrefPageEntityEditor.PAGE_ID,
+        {
-                "<a>''{0}''</a> " + CoreMessages.pref_page_ui_general_label_settings,
+            // Link to secure storage config
-                (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
+            new PreferenceLinkArea(composite, SWT.NONE,
+                PrefPageSQLEditor.PAGE_ID,
-            new PreferenceLinkArea(composite, SWT.NONE,
+                "<a>''{0}''</a> " + CoreMessages.pref_page_ui_general_label_settings,
-                PrefPageSQLEditor.PAGE_ID,
+                (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
-                "<a>''{0}''</a>" + CoreMessages.pref_page_ui_general_label_settings,
-                (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
+        }
-        }
+        performDefaults();
-        performDefaults();
+        return composite;
+    }
-        return composite;
-    }
+    @Override
+    protected void performDefaults()
-    @Override
+    {
-    protected void performDefaults()
+        DBPPreferenceStore store = DBWorkbench.getPlatform().getPreferenceStore();
-    {
-        DBPPreferenceStore store = DBWorkbench.getPlatform().getPreferenceStore();
+        if (isStandalone) {
+            automaticUpdateCheck.setSelection(store.getBoolean(DBeaverPreferences.UI_AUTO_UPDATE_CHECK));
-        automaticUpdateCheck.setSelection(store.getBoolean(DBeaverPreferences.UI_AUTO_UPDATE_CHECK));
+        }
        notificationsEnabled.setSelection(store.getBoolean(ModelPreferences.NOTIFICATIONS_ENABLED));
        notificationsCloseDelay.setSelection(store.getInt(ModelPreferences.NOTIFICATIONS_CLOSE_DELAY_TIMEOUT));
        longOperationsCheck.setSelection(store.getBoolean(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY));
        longOperationsTimeout.setSelection(store.getInt(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT));
    }
    @Override
    public boolean performOk()
    {
        DBPPreferenceStore store = DBWorkbench.getPlatform().getPreferenceStore();
-        store.setValue(DBeaverPreferences.UI_AUTO_UPDATE_CHECK, automaticUpdateCheck.getSelection());
+        if (isStandalone) {
+            store.setValue(DBeaverPreferences.UI_AUTO_UPDATE_CHECK, automaticUpdateCheck.getSelection());
+        }
-        store.setValue(ModelPreferences.NOTIFICATIONS_ENABLED, notificationsEnabled.getSelection());
-        store.setValue(ModelPreferences.NOTIFICATIONS_CLOSE_DELAY_TIMEOUT, notificationsCloseDelay.getSelection());
+        store.setValue(ModelPreferences.NOTIFICATIONS_ENABLED, notificationsEnabled.getSelection());
-        store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY, longOperationsCheck.getSelection());
+        store.setValue(ModelPreferences.NOTIFICATIONS_CLOSE_DELAY_TIMEOUT, notificationsCloseDelay.getSelection());
-        store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT, longOperationsTimeout.getSelection());
+        store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_NOTIFY, longOperationsCheck.getSelection());
-        PrefUtils.savePreferenceStore(store);
+        store.setValue(DBeaverPreferences.AGENT_LONG_OPERATION_TIMEOUT, longOperationsTimeout.getSelection());
-        if (workspaceLanguage.getSelectionIndex() >= 0) {
+        PrefUtils.savePreferenceStore(store);
-            PlatformLanguageDescriptor language = PlatformLanguageRegistry.getInstance().getLanguages().get(workspaceLanguage.getSelectionIndex());
-            try {
+        if (workspaceLanguage.getSelectionIndex() >= 0) {
-                DBPPlatformLanguage curLanguage = DBWorkbench.getPlatform().getLanguage();
+            PlatformLanguageDescriptor language = PlatformLanguageRegistry.getInstance().getLanguages().get(workspaceLanguage.getSelectionIndex());
-                if (curLanguage != language) {
+            try {
-                    ((DBPPlatformLanguageManager)DBWorkbench.getPlatform()).setPlatformLanguage(language);
+                DBPPlatformLanguage curLanguage = DBWorkbench.getPlatform().getLanguage();
+                if (curLanguage != language) {
-                    if (UIUtils.confirmAction(
+                    ((DBPPlatformLanguageManager)DBWorkbench.getPlatform()).setPlatformLanguage(language);
-                        getShell(),
-                        "Restart " + GeneralUtils.getProductName(),
+                    if (UIUtils.confirmAction(
-                        "You need to restart " + GeneralUtils.getProductName() + " to perform actual language change.\nDo you want to restart?"))
+                        getShell(),
-                    {
+                        "Restart " + GeneralUtils.getProductName(),
-                        UIUtils.asyncExec(() -> PlatformUI.getWorkbench().restart());
+                        "You need to restart " + GeneralUtils.getProductName() + " to perform actual language change.\nDo you want to restart?"))
-                    }
+                    {
-                }
+                        UIUtils.asyncExec(() -> PlatformUI.getWorkbench().restart());
-            } catch (DBException e) {
+                    }
-                DBWorkbench.getPlatformUI().showError("Change language", "Can't switch language to " + language, e);
+                }
-            }
+            } catch (DBException e) {
-        }
+                DBWorkbench.getPlatformUI().showError("Change language", "Can't switch language to " + language, e);
+            }
-        return true;
+        }
-    }
+        return true;
-    @Nullable
+    }
-    @Override
-    public IAdaptable getElement()
+    @Nullable
-    {
+    @Override
-        return null;
+    public IAdaptable getElement()
-    }
+    {
+        return null;
-    @Override
+    }
-    public void setElement(IAdaptable element)
-    {
+    @Override
-    }
+    public void setElement(IAdaptable element)
+    {
+    }
 }
\ No newline at end of file
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageEclipseGeneral.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageEclipseGeneral.java
+package org.jkiss.dbeaver.ui.preferences;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.eclipse.ui.dialogs.PreferenceLinkArea;
+import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
+import org.jkiss.dbeaver.core.CoreMessages;
+import org.jkiss.dbeaver.runtime.DBWorkbench;
+import org.jkiss.dbeaver.ui.UIUtils;
+import org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetMain;
+import org.jkiss.dbeaver.ui.editors.sql.preferences.PrefPageSQLEditor;
+public class PrefPageEclipseGeneral extends AbstractPrefPage implements IWorkbenchPreferencePage, IWorkbenchPropertyPage {
+    public static final String PAGE_ID = "org.jkiss.dbeaver.preferences.eclipse.main";
+    public PrefPageEclipseGeneral() {
+        super();
+        setPreferenceStore(new PreferenceStoreDelegate(DBWorkbench.getPlatform().getPreferenceStore()));
+    }
+    @Override
+    protected Control createContents(Composite parent) {
+        Composite composite = UIUtils.createPlaceholder(parent, 1, 5);
+        Group groupObjects = UIUtils.createControlGroup(composite, CoreMessages.pref_page_eclipse_ui_general_group_general, 1, GridData.VERTICAL_ALIGN_BEGINNING, 0);
+        Label descLabel = new Label(groupObjects, SWT.WRAP);
+        descLabel.setText(CoreMessages.pref_page_eclipse_ui_general_group_label);
+        performDefaults();
+        {
+            // Link to secure storage config
+            addLinkToSettings(composite, PrefPageResultSetMain.PAGE_ID);
+            addLinkToSettings(composite, PrefPageSQLEditor.PAGE_ID);
+            addLinkToSettings(composite, PrefPageDatabaseNavigator.PAGE_ID);
+            addLinkToSettings(composite, PrefPageErrorHandle.PAGE_ID);
+        }
+        return composite;
+    }
+    @Override
+    public void init(IWorkbench iWorkbench) {
+    }
+    @Override
+    public IAdaptable getElement() {
+        return null;
+    }
+    @Override
+    public void setElement(IAdaptable iAdaptable) {
+    }
+    private void addLinkToSettings(Composite composite, String pageID) {
+        new PreferenceLinkArea(composite, SWT.NONE,
+                pageID,
+                "<a>''{0}''</a> " + CoreMessages.pref_page_ui_general_label_settings,
+                (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
+    }
+}
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageMetaData.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageMetaData.java
 /*
 * DBeaver - Universal Database Manager
 * Copyright (C) 2010-2020 DBeaver Corp and others
 * Copyright (C) 2011-2012 Eugene Fradkin (eugene.fradkin@gmail.com)
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
 package org.jkiss.dbeaver.ui.preferences;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
 import org.jkiss.dbeaver.ModelPreferences;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.utils.PrefUtils;
 /**
 * PrefPageMetaData
 */
 public class PrefPageMetaData extends TargetPrefPage
 {
    public static final String PAGE_ID = "org.jkiss.dbeaver.preferences.main.meta"; //$NON-NLS-1$
    private Button readExpensiveCheck;
    private Button separateMetaConnectionCheck;
    private Button caseSensitiveNamesCheck;
    private Button serverSideFiltersCheck;
-    private Button ignoreColumnLabelCheck;
+    public PrefPageMetaData()
+    {
-    public PrefPageMetaData()
+        super();
-    {
+    }
-        super();
-    }
+    @Override
+    protected boolean hasDataSourceSpecificOptions(DBPDataSourceContainer dataSourceDescriptor)
-    @Override
+    {
-    protected boolean hasDataSourceSpecificOptions(DBPDataSourceContainer dataSourceDescriptor)
+        DBPPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
-    {
+        return
-        DBPPreferenceStore store = dataSourceDescriptor.getPreferenceStore();
+            store.contains(ModelPreferences.READ_EXPENSIVE_PROPERTIES) ||
-        return
+            store.contains(ModelPreferences.META_SEPARATE_CONNECTION) ||
-            store.contains(ModelPreferences.READ_EXPENSIVE_PROPERTIES) ||
+            store.contains(ModelPreferences.META_CASE_SENSITIVE) ||
-            store.contains(ModelPreferences.META_SEPARATE_CONNECTION) ||
+            store.contains(ModelPreferences.META_USE_SERVER_SIDE_FILTERS)
-            store.contains(ModelPreferences.META_CASE_SENSITIVE) ||
+            ;
-            store.contains(ModelPreferences.META_USE_SERVER_SIDE_FILTERS) ||
+    }
-            store.contains(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL)
+    @Override
-            ;
+    protected boolean supportsDataSourceSpecificOptions()
-    }
+    {
+        return true;
-    @Override
+    }
-    protected boolean supportsDataSourceSpecificOptions()
-    {
+    @Override
-        return true;
+    protected Control createPreferenceContent(Composite parent)
-    }
+    {
+        Composite composite = UIUtils.createPlaceholder(parent, 1, 5);
-    @Override
+        {
-    protected Control createPreferenceContent(Composite parent)
+            Group metadataGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_database_general_group_metadata, 1, GridData.HORIZONTAL_ALIGN_BEGINNING, 0);
-    {
-        Composite composite = UIUtils.createPlaceholder(parent, 1, 5);
+            separateMetaConnectionCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_separate_meta_connection, CoreMessages.pref_page_database_general_separate_meta_connection_tip, false, 1);
-        {
+            caseSensitiveNamesCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_checkbox_case_sensitive_names, CoreMessages.pref_page_database_general_checkbox_case_sensitive_names_tip, false, 1);
-            Group metadataGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_database_general_group_metadata, 1, GridData.HORIZONTAL_ALIGN_BEGINNING, 0);
+            readExpensiveCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_checkbox_show_row_count, CoreMessages.pref_page_database_general_checkbox_show_row_count_tip, false, 1);
+            serverSideFiltersCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_server_side_object_filters, CoreMessages.pref_page_database_general_server_side_object_filters_tip, false, 1);
-            separateMetaConnectionCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_separate_meta_connection, CoreMessages.pref_page_database_general_separate_meta_connection_tip, false, 1);
+        }
-            caseSensitiveNamesCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_checkbox_case_sensitive_names, CoreMessages.pref_page_database_general_checkbox_case_sensitive_names_tip, false, 1);
-            readExpensiveCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_checkbox_show_row_count, CoreMessages.pref_page_database_general_checkbox_show_row_count_tip, false, 1);
+        return composite;
-            serverSideFiltersCheck = UIUtils.createCheckbox(metadataGroup, CoreMessages.pref_page_database_general_server_side_object_filters, CoreMessages.pref_page_database_general_server_side_object_filters_tip, false, 1);
+    }
-        }
+    @Override
-        {
+    protected void loadPreferences(DBPPreferenceStore store)
-            Group queriesGroup = UIUtils.createControlGroup(composite, CoreMessages.pref_page_database_general_group_query_metadata, 1, GridData.HORIZONTAL_ALIGN_BEGINNING, 0);
+    {
+        try {
-            ignoreColumnLabelCheck = UIUtils.createCheckbox(queriesGroup, CoreMessages.pref_page_database_general_use_column_names, CoreMessages.pref_page_database_general_use_column_names_tip, false, 1);
+            readExpensiveCheck.setSelection(store.getBoolean(ModelPreferences.READ_EXPENSIVE_PROPERTIES));
-        }
+            separateMetaConnectionCheck.setSelection(store.getBoolean(ModelPreferences.META_SEPARATE_CONNECTION));
+            caseSensitiveNamesCheck.setSelection(store.getBoolean(ModelPreferences.META_CASE_SENSITIVE));
-        return composite;
+            serverSideFiltersCheck.setSelection(store.getBoolean(ModelPreferences.META_USE_SERVER_SIDE_FILTERS));
-    }
+        } catch (Exception e) {
-    @Override
+            log.warn(e);
-    protected void loadPreferences(DBPPreferenceStore store)
+        }
-    {
+    }
-        try {
-            readExpensiveCheck.setSelection(store.getBoolean(ModelPreferences.READ_EXPENSIVE_PROPERTIES));
+    @Override
-            separateMetaConnectionCheck.setSelection(store.getBoolean(ModelPreferences.META_SEPARATE_CONNECTION));
+    protected void savePreferences(DBPPreferenceStore store)
-            caseSensitiveNamesCheck.setSelection(store.getBoolean(ModelPreferences.META_CASE_SENSITIVE));
+    {
-            serverSideFiltersCheck.setSelection(store.getBoolean(ModelPreferences.META_USE_SERVER_SIDE_FILTERS));
+        try {
+            store.setValue(ModelPreferences.READ_EXPENSIVE_PROPERTIES, readExpensiveCheck.getSelection());
-            ignoreColumnLabelCheck.setSelection(store.getBoolean(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL));
+            store.setValue(ModelPreferences.META_SEPARATE_CONNECTION, separateMetaConnectionCheck.getSelection());
-        } catch (Exception e) {
+            store.setValue(ModelPreferences.META_CASE_SENSITIVE, caseSensitiveNamesCheck.getSelection());
-            log.warn(e);
+            store.setValue(ModelPreferences.META_USE_SERVER_SIDE_FILTERS, serverSideFiltersCheck.getSelection());
-        }
-    }
+        } catch (Exception e) {
+            log.warn(e);
-    @Override
+        }
-    protected void savePreferences(DBPPreferenceStore store)
+        PrefUtils.savePreferenceStore(store);
-    {
+    }
-        try {
-            store.setValue(ModelPreferences.READ_EXPENSIVE_PROPERTIES, readExpensiveCheck.getSelection());
+    @Override
-            store.setValue(ModelPreferences.META_SEPARATE_CONNECTION, separateMetaConnectionCheck.getSelection());
+    protected void clearPreferences(DBPPreferenceStore store)
-            store.setValue(ModelPreferences.META_CASE_SENSITIVE, caseSensitiveNamesCheck.getSelection());
+    {
-            store.setValue(ModelPreferences.META_USE_SERVER_SIDE_FILTERS, serverSideFiltersCheck.getSelection());
+        store.setToDefault(ModelPreferences.READ_EXPENSIVE_PROPERTIES);
+        store.setToDefault(ModelPreferences.META_SEPARATE_CONNECTION);
-            store.setValue(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL, ignoreColumnLabelCheck.getSelection());
+        store.setToDefault(ModelPreferences.META_CASE_SENSITIVE);
-        } catch (Exception e) {
+        store.setToDefault(ModelPreferences.META_USE_SERVER_SIDE_FILTERS);
-            log.warn(e);
-        }
+    }
-        PrefUtils.savePreferenceStore(store);
-    }
+    @Override
+    protected String getPropertyPageID()
-    @Override
+    {
-    protected void clearPreferences(DBPPreferenceStore store)
+        return PAGE_ID;
-    {
+    }
-        store.setToDefault(ModelPreferences.READ_EXPENSIVE_PROPERTIES);
-        store.setToDefault(ModelPreferences.META_SEPARATE_CONNECTION);
-        store.setToDefault(ModelPreferences.META_CASE_SENSITIVE);
-        store.setToDefault(ModelPreferences.META_USE_SERVER_SIDE_FILTERS);
-        store.setToDefault(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL);
-    }
-    @Override
-    protected String getPropertyPageID()
-    {
-        return PAGE_ID;
-    }
 }
\ No newline at end of file
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageQueryManager.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/preferences/PrefPageQueryManager.java
--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle.properties
@@ -8,18 +8,17 @@ productSubTitle = Universal Database Manager - Eclipse plugin
 menu.edit=Edit
 menu.navigate=Navigate
-pref.page.name.db.configuration=DBeaver
+pref.page.name.db.configuration=Database
 pref.page.name.data.formats=Data Formats
 pref.page.name.query.manager=Query Manager
-pref.page.name.db.editors=Editors
+pref.page.name.db.editors=Database Editors
-pref.page.name.entity.editor=Database Editor
 pref.page.name.binary.editor=Binary Editor
 pref.page.name.db.ui=Interface
 pref.page.name.drivers=Drivers
 pref.page.name.drivers.maven=Maven
 pref.page.name.connectionTypes=Connection Types
 pref.page.name.navigator=Navigator
-pref.page.name.editors=Editors
+pref.page.name.editors=Database Editors
 pref.page.name.resources=Resources
 pref.page.name.confirmations=Confirmations
 pref.page.name.errorHandle=Errors and Timeouts
@@ -30,5 +29,6 @@ pref.page.name.resultset.presentation=Presentation
 pref.page.name.resultset.grid=Grid
 pref.page.name.resultset.plain.text=Plain Text 
 pref.page.name.meta=Metadata
-pref.page.name.connections=Connections
+pref.page.name.connections=Database Connections
 pref.page.name.transactions= Transactions
+pref.page.name.user.interface = User Interface
--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_de.properties
@@ -9,15 +9,14 @@ menu.navigate = Navigieren
 pref.page.name.binary.editor          = Bin\u00E4reditor
 pref.page.name.confirmations          = Best\u00E4tigungen
 pref.page.name.connectionTypes        = Verbindungstypen
-pref.page.name.connections            = Verbindungen
+pref.page.name.connections            = Datenbankverbindungen
 pref.page.name.data.formats           = Datenformate
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database
-pref.page.name.db.editors             = Editoren
+pref.page.name.db.editors             = Datenbankeditoren
 pref.page.name.db.ui                  = Interface
 pref.page.name.drivers                = Treiber
 pref.page.name.drivers.maven          = Maven
-pref.page.name.editors                = Editoren
+pref.page.name.editors                = Datenbankeditoren
-pref.page.name.entity.editor          = Datenbankeditor
 pref.page.name.errorHandle            = Fehler-Handler
 pref.page.name.errorLogs              = Fehlerprotokolle
 pref.page.name.meta                   = Metadaten

--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_es.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_es.properties
@@ -12,8 +12,8 @@ pref.page.name.confirmations          = Confirmaciones
 pref.page.name.errorHandle            = Gesti\u00F3n de errores
 pref.page.name.connectionTypes        = Tipos de conexiones
 pref.page.name.data.formats           = Formatos de datos
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database
-pref.page.name.db.editors             = Editores
+pref.page.name.db.editors             = Editores de bases de datos
 pref.page.name.db.ui                  = Interface
 pref.page.name.drivers                = Drivers
 pref.page.name.meta                   = Metadatos
@@ -23,8 +23,7 @@ pref.page.name.resources              = Recursos
 pref.page.name.resultset              = Resultados
 pref.page.name.resultset.editors      = Editores LOB
 pref.page.name.resultset.presentation = Presentaci\u00F3n
-pref.page.name.connections            = Conexiones
+pref.page.name.connections            = Conexiones de base de datos
 pref.page.name.drivers.maven          = Maven
-pref.page.name.entity.editor          = Editor de bases de datos
 pref.page.name.resultset.grid = Tabla
 pref.page.name.resultset.plain.text = Llanura Texto
\ No newline at end of file
--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_fr.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_fr.properties
@@ -11,7 +11,7 @@ pref.page.name.confirmations          = Confirmations
 pref.page.name.errorHandle            = Gestion des erreurs
 pref.page.name.connectionTypes        = Types de connexions
 pref.page.name.data.formats           = Formats de donn\u00E9es
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database
 pref.page.name.db.editors             = Editeurs
 pref.page.name.db.ui                  = Interface
 pref.page.name.drivers                = Pilotes
@@ -21,7 +21,6 @@ pref.page.name.query.manager          = Gestionnaire de requ\u00EAtes
 pref.page.name.resources              = Ressources
 pref.page.name.resultset.editors      = Editors LOB
 pref.page.name.resultset.presentation = Pr\u00E9sentation
-pref.page.name.connections            = Connexions
+pref.page.name.connections            = Connexions base de donn\u00E9es
 pref.page.name.drivers.maven          = Maven
-pref.page.name.entity.editor          = Editeur de bases de donn\u00E9es
 pref.page.name.errorLogs              = Journaux d'erreurs
--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_ja.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_ja.properties
@@ -2,11 +2,10 @@
 menu.edit=\u7DE8\u96C6
 menu.navigate=\u30CA\u30D3\u30B2\u30FC\u30C8\u3059\u308B
-pref.page.name.db.configuration=DBeaver
+pref.page.name.db.configuration=Database
 pref.page.name.data.formats=\u30C7\u30FC\u30BF\u5F62\u5F0F
 pref.page.name.query.manager=\u30AF\u30A8\u30EA\u30DE\u30CD\u30FC\u30B8\u30E3
 pref.page.name.db.editors=\u30A8\u30C7\u30A3\u30BF
-pref.page.name.entity.editor=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30A8\u30C7\u30A3\u30BF
 pref.page.name.binary.editor=\u30D0\u30A4\u30CA\u30EA\u30A8\u30C7\u30A3\u30BF
 pref.page.name.db.ui=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 pref.page.name.drivers=\u30C9\u30E9\u30A4\u30D0

--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_ko.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_ko.properties
@@ -3,11 +3,10 @@
 menu.edit=\uD3B8\uC9D1
 menu.navigate=\uD0D0\uC0C9
-pref.page.name.db.configuration=DBeaver
+pref.page.name.db.configuration=Database
 pref.page.name.data.formats=\uB370\uC774\uD130 \uD3EC\uB9F7
 pref.page.name.query.manager=\uCFFC\uB9AC \uAD00\uB9AC\uC790
 pref.page.name.db.editors=\uD3B8\uC9D1\uAE30
-pref.page.name.entity.editor=\uB370\uC774\uD130\uBCA0\uC774\uC2A4 \uD3B8\uC9D1\uAE30
 pref.page.name.binary.editor=\uBC14\uC774\uB108\uB9AC \uD3B8\uC9D1\uAE30
 pref.page.name.db.ui=\uC778\uD130\uD398\uC774\uC2A4
 pref.page.name.drivers=\uB4DC\uB77C\uC774\uBC84

--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_pt_BR.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_pt_BR.properties
@@ -10,15 +10,14 @@ menu.navigate = Navega\u00E7\u00E3oo
 pref.page.name.binary.editor          = Editor bin\u00E1rio
 pref.page.name.confirmations          = Confirma\u00E7\u00F5es
 pref.page.name.connectionTypes        = Tipo de Conex\u00E3o
-pref.page.name.connections            = Conex\u00E3o
+pref.page.name.connections            = Conex\u00F5es de banco de dados
 pref.page.name.data.formats           = Formato de dados
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database
-pref.page.name.db.editors             = Editores
+pref.page.name.db.editors             = Editores de banco de dados
 pref.page.name.db.ui                  = Interface
 pref.page.name.drivers                = Drivers
 pref.page.name.drivers.maven          = Maven
-pref.page.name.editors                = Editor
+pref.page.name.editors                = Editores de banco de dados
-pref.page.name.entity.editor          = Editor de banco de dados
 pref.page.name.errorHandle            = Erros e tempo limite
 pref.page.name.errorLogs              = Error e Logs
 pref.page.name.meta                   = Metadado

--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_ru.properties
@@ -2,7 +2,7 @@
 menu.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
-pref.page.name.db.configuration=DBeaver
+pref.page.name.db.configuration=Database
 pref.page.name.data.formats=\u0424\u043E\u0440\u043C\u0430\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.query.manager=\u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
 pref.page.name.db.editors=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B
@@ -15,14 +15,13 @@ pref.page.name.resources=\u0420\u0435\u0441\u0443\u0440\u0441\u044B
 pref.page.name.confirmations=\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F
 pref.page.name.resultset=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0434\u0430\u043D\u043D\u044B\u0445
 pref.page.name.errorHandle=\u041E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0430 \u043E\u0448\u0438\u0431\u043E\u043A
-pref.page.name.entity.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432
 pref.page.name.drivers.maven=Maven
 pref.page.name.navigator=\u041D\u0430\u0432\u0438\u0433\u0430\u0442\u043E\u0440
-pref.page.name.editors=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B
+pref.page.name.editors=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B \u0411\u0414
 pref.page.name.errorLogs=\u0416\u0443\u0440\u043D\u0430\u043B \u043E\u0448\u0438\u0431\u043E\u043A
 pref.page.name.resultset.editors=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B LOB
 pref.page.name.resultset.presentation=\u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u0432\u0438\u0434
 pref.page.name.resultset.grid=\u0422\u0430\u0431\u043B\u0438\u0446\u0430
 pref.page.name.resultset.plain.text=\u041E\u0431\u044B\u0447\u043D\u044B\u0439 \u0442\u0435\u043A\u0441\u0442
 pref.page.name.meta=\u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435
-pref.page.name.connections=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
+pref.page.name.connections=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F \u0411\u0414
--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/OSGI-INF/l10n/bundle_zh.properties
@@ -7,7 +7,6 @@ pref.page.name.db.configuration=DBeaver
 pref.page.name.data.formats=\u6570\u636E\u683C\u5F0F
 pref.page.name.query.manager=\u67E5\u8BE2\u7BA1\u7406\u5668
 pref.page.name.db.editors=\u7F16\u8F91\u5668
-pref.page.name.entity.editor=\u6570\u636E\u5E93\u7F16\u8F91\u5668
 pref.page.name.binary.editor=\u4E8C\u8FDB\u5236\u7F16\u8F91\u5668
 pref.page.name.db.ui=\u63A5\u53E3
 pref.page.name.drivers=\u9A71\u52A8

--- a/plugins/org.jkiss.dbeaver.ui.app.eclipse/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.app.eclipse/plugin.xml
@@ -45,14 +45,15 @@
    </extension>
    <extension point="org.eclipse.ui.preferencePages">
-        <page id="org.jkiss.dbeaver.preferences.main" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral" name="%pref.page.name.db.configuration">
+        <page id="org.jkiss.dbeaver.preferences.eclipse.main" class="org.jkiss.dbeaver.ui.preferences.PrefPageEclipseGeneral" name="%pref.page.name.db.configuration">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.db.general"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.user.interface"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.errorHandle" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorHandle" name="%pref.page.name.errorHandle">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.main.errorHandle" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorHandle" name="%pref.page.name.errorHandle">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main.errorHandle" id="org.jkiss.dbeaver.preferences.main.errorLogs" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorLogs" name="%pref.page.name.errorLogs">
+        <page category="org.jkiss.dbeaver.preferences.main.common" id="org.jkiss.dbeaver.preferences.main.errorLogs" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorLogs" name="%pref.page.name.errorLogs">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
        <page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.resultset" class="org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetMain" name="%pref.page.name.resultset">
@@ -77,22 +78,23 @@
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.db.dataformat"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.connections" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnections" name="%pref.page.name.connections">
+        <page category="org.jkiss.dbeaver.preferences.eclipse.main" id="org.jkiss.dbeaver.preferences.main.connections" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnections" name="%pref.page.name.connections">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.database.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.transactions" class="org.jkiss.dbeaver.ui.preferences.PrefPageTransactions" name="%pref.page.name.transactions">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.main.transactions" class="org.jkiss.dbeaver.ui.preferences.PrefPageTransactions" name="%pref.page.name.transactions">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.meta" class="org.jkiss.dbeaver.ui.preferences.PrefPageMetaData" name="%pref.page.name.meta">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.main.meta" class="org.jkiss.dbeaver.ui.preferences.PrefPageMetaData" name="%pref.page.name.meta">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.misc.qm" class="org.jkiss.dbeaver.ui.preferences.PrefPageQueryManager" name="%pref.page.name.query.manager">
+        <page category="org.jkiss.dbeaver.preferences.main.common" id="org.jkiss.dbeaver.preferences.misc.qm" class="org.jkiss.dbeaver.ui.preferences.PrefPageQueryManager" name="%pref.page.name.query.manager">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.db.qm"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.drivers" class="org.jkiss.dbeaver.ui.preferences.PrefPageDrivers" name="%pref.page.name.drivers">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.drivers" class="org.jkiss.dbeaver.ui.preferences.PrefPageDrivers" name="%pref.page.name.drivers">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.ui.general"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
@@ -101,28 +103,32 @@
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.connectionTypes" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes" name="%pref.page.name.connectionTypes">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.connectionTypes" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes" name="%pref.page.name.connectionTypes">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.navigator" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseNavigator" name="%pref.page.name.navigator">
+        <page category="org.jkiss.dbeaver.preferences.main.common" id="org.jkiss.dbeaver.preferences.navigator" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseNavigator" name="%pref.page.name.navigator">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.editors" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseEditors" name="%pref.page.name.editors">
+        <page category="org.jkiss.dbeaver.preferences.eclipse.main" id="org.jkiss.dbeaver.preferences.editors" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseEditors" name="%pref.page.name.editors">
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.entity"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.confirmations" class="org.jkiss.dbeaver.ui.preferences.PrefPageConfirmations" name="%pref.page.name.confirmations">
+        <page category="org.jkiss.dbeaver.preferences.main.common" id="org.jkiss.dbeaver.preferences.main.confirmations" class="org.jkiss.dbeaver.ui.preferences.PrefPageConfirmations" name="%pref.page.name.confirmations">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.entityeditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" name="%pref.page.name.entity.editor">
+        <!--<page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.entityeditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" name="%pref.page.name.entity.editor">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.entity"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
-        </page>
+        </page>-->
        <page category="org.jkiss.dbeaver.preferences.main.resultset.editors" id="org.jkiss.dbeaver.ui.editors.binary.pref.HexPreferencesPage" class="org.jkiss.dbeaver.ui.editors.binary.pref.HexPreferencesPage" name="%pref.page.name.binary.editor">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.binary"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
+        <page category="org.jkiss.dbeaver.preferences.eclipse.main" id="org.jkiss.dbeaver.preferences.main.common" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral" name="%pref.page.name.user.interface">
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
+        </page>
    </extension>

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle.properties
@@ -3,7 +3,7 @@ Bundle-Name = DBeaver Standalone
 productName = DBeaver
 productTitle = DBeaver - Universal Database Manager
-productCopyright = \u00a9 2020 JKISS project
+productCopyright = \u00A9 2020 JKISS project
 productSubTitle = Universal Database Manager
 productWebsite = https://dbeaver.io/
 productEmail = serge@jkiss.org
@@ -21,17 +21,16 @@ menu.navigation = Navigation
 pref.page.name.binary.editor          = Binary Editor
 pref.page.name.confirmations          = Confirmations
 pref.page.name.connectionTypes        = Connection Types
-pref.page.name.connections            = Connections
+pref.page.name.connections            = Database Connections
 pref.page.name.transactions           = Transactions
 pref.page.name.data.formats           = Data Formats
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database User Interface
 pref.page.name.db.editors             = Editors
 pref.page.name.drivers                = Drivers
 pref.page.name.drivers.maven          = Maven
-pref.page.name.entity.editor          = Object Editor
 pref.page.name.meta                   = Metadata
 pref.page.name.navigator              = Navigator
-pref.page.name.editors                = Editors
+pref.page.name.editors                = Database Editors
 pref.page.name.query.manager          = Query Manager
 pref.page.name.resources              = Resources
 pref.page.name.errorHandle            = Errors and Timeouts
@@ -39,6 +38,7 @@ pref.page.name.errorLogs              = Error Logs
 pref.page.name.resultset              = Data Editor
 pref.page.name.resultset.editors      = LOB Editors
 pref.page.name.resultset.presentation = Presentation
+pref.page.name.user.interface = Database User Interface
 pref.page.name.resultset.grid = Grid
 pref.page.name.resultset.plain.text = Plain text

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_de.properties
@@ -61,13 +61,12 @@ pref.page.name.binary.editor          = Bin\u00E4reditor
 pref.page.name.colors.and.fonts       = Farben und Schriftart
 pref.page.name.confirmations          = Best\u00E4tigungen
 pref.page.name.connectionTypes        = Verbindungstypen
-pref.page.name.connections            = Verbindungen
+pref.page.name.connections            = Datenbankverbindungen
 pref.page.name.data.formats           = Datenformate
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database User Interface
-pref.page.name.db.editors             = Editoren
+pref.page.name.db.editors             = Datenbankeditor
 pref.page.name.drivers                = Treiber
 pref.page.name.drivers.maven          = Maven
-pref.page.name.entity.editor          = Datenbankeditor
 pref.page.name.errorHandle            = Fehler-Handler
 pref.page.name.errorLogs              = Fehlerprotokolle
 pref.page.name.meta                   = Metadaten

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_es.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_es.properties
@@ -16,12 +16,11 @@ menu.navigation = Navegaci\u00F3n
 pref.page.name.binary.editor          = Editor
 pref.page.name.confirmations          = Confirmaciones
 pref.page.name.connectionTypes        = Tipos de conexi\u00F3n
-pref.page.name.connections            = Conexiones
+pref.page.name.connections            = Conexiones de base de datos
 pref.page.name.data.formats           = Formatos de datos
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database User interface
-pref.page.name.db.editors             = Editores
+pref.page.name.db.editors             = Editores de base de datos
 pref.page.name.drivers                = Drivers
-pref.page.name.entity.editor          = Editor de base de datos
 pref.page.name.meta                   = Metadatos
 pref.page.name.navigator              = Navegaci\u00F3n
 pref.page.name.query.manager          = Gestor de consultas

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_fr.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_fr.properties
@@ -14,12 +14,11 @@ menu.navigation = Navigation
 pref.page.name.binary.editor          = Editeur
 pref.page.name.confirmations          = Confirmations
 pref.page.name.connectionTypes        = Types de connexions
-pref.page.name.connections            = Connexions
+pref.page.name.connections            = Connexions base de donn\u00E9es
 pref.page.name.data.formats           = Formats de donn\u00E9es
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database User Interface
-pref.page.name.db.editors             = Editeurs
+pref.page.name.db.editors             = Editeurs de bases de donn\u00E9es
 pref.page.name.drivers                = Pilotes
-pref.page.name.entity.editor          = Editeur de bases de donn\u00E9es
 pref.page.name.meta                   = Metadonn\u00E9es
 pref.page.name.navigator              = Navigation
 pref.page.name.query.manager          = Gestionnaire de requ\u00EAtes

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_it.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_it.properties
@@ -5,7 +5,7 @@ pref.page.name.binary.editor    = Editor Binario
 pref.page.name.colors.and.fonts = Colori e Font
 pref.page.name.confirmations    = Conferme
 pref.page.name.data.formats     = Formati dei Dati
-pref.page.name.db.configuration = DBeaver
+pref.page.name.db.configuration = Database User Interface
 pref.page.name.db.editors       = Editor
 pref.page.name.db.ui            = Interfaccia
 pref.page.name.drivers          = Drivers

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_ja.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_ja.properties
@@ -18,11 +18,10 @@ pref.page.name.connectionTypes        =\u63A5\u7D9A\u30BF\u30A4\u30D7
 pref.page.name.connections            =\u63A5\u7D9A
 pref.page.name.transactions           =\u30C8\u30E9\u30F3\u30B6\u30AF\u30B7\u30E7\u30F3
 pref.page.name.data.formats           =\u30C7\u30FC\u30BF\u5F62\u5F0F
-pref.page.name.db.configuration       =DBeaver
+pref.page.name.db.configuration       =Database User Interface
 pref.page.name.db.editors             =\u30A8\u30C7\u30A3\u30BF
 pref.page.name.drivers                =\u30C9\u30E9\u30A4\u30D0
 pref.page.name.drivers.maven          =Maven
-pref.page.name.entity.editor          =\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u30A8\u30C7\u30A3\u30BF
 pref.page.name.meta                   =\u30E1\u30BF\u30C7\u30FC\u30BF
 pref.page.name.navigator              =\u30CA\u30D3\u30B2\u30FC\u30BF
 pref.page.name.editors                =\u30A8\u30C7\u30A3\u30BF

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_ko.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_ko.properties
@@ -26,11 +26,10 @@ pref.page.name.confirmations          = \uD655\uC778
 pref.page.name.connectionTypes        = \uC5F0\uACB0 \uC720\uD615
 pref.page.name.connections            = \uC5F0\uACB0
 pref.page.name.data.formats           = \uB370\uC774\uD130\uD3EC\uB9F7
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database User Interface
 pref.page.name.db.editors             = \uD3B8\uC9D1\uAE30
 pref.page.name.drivers                = \uB4DC\uB77C\uC774\uBC84
 pref.page.name.drivers.maven          = \uBA54\uC774\uBE10
-pref.page.name.entity.editor          = \uC624\uBE0C\uC81D\uD2B8 \uD3B8\uC9D1\uAE30
 pref.page.name.meta                   = \uBA54\uD0C0\uB370\uC774\uD130
 pref.page.name.navigator              = \uD0D0\uC0C9
 pref.page.name.editors                = \uD3B8\uC9D1\uAE30

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_pt_BR.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_pt_BR.properties
@@ -71,14 +71,13 @@ menu.navigation=Navega\u00E7\u00E3o
 pref.page.name.binary.editor          = Editor Binario
 pref.page.name.confirmations          = Confirma\u00E7\u00F5es
 pref.page.name.connectionTypes        = Tipos de Conex\u00E3o
-pref.page.name.connections            = Conex\u00F5es
+pref.page.name.connections            = Conex\u00F5es de banco de dados
 pref.page.name.data.formats           = Formato de dados
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = Database User Interface
 pref.page.name.db.editors             = Editores
 pref.page.name.drivers                = Drivers
 pref.page.name.drivers.maven          = Maven
-pref.page.name.editors                = Editores
+pref.page.name.editors                = Editores de banco de dados
-pref.page.name.entity.editor          = Editor de objeto
 pref.page.name.errorHandle            = Erros e Tempo limite
 pref.page.name.errorLogs              = Erros e logs
 pref.page.name.meta                   = Metadados

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_ru.properties
@@ -9,15 +9,15 @@ pref.page.name.binary.editor          = \u0414\u0432\u043E\u0438\u0447\u043D\u04
 pref.page.name.colors.and.fonts       = \u0426\u0432\u0435\u0442\u0430 \u0438 \u0448\u0440\u0438\u0444\u0442\u044B
 pref.page.name.confirmations          = \u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F
 pref.page.name.connectionTypes        = \u0422\u0438\u043F\u044B \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0439
-pref.page.name.connections            = \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
+pref.page.name.connections            = \u0411\u0414 \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
 pref.page.name.data.formats           = \u0424\u043E\u0440\u043C\u0430\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
-pref.page.name.db.configuration       = DBeaver
+pref.page.name.db.configuration       = User \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441
 pref.page.name.db.editors             = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B
 pref.page.name.db.ui                  = \u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441
 pref.page.name.drivers                = \u0414\u0440\u0430\u0439\u0432\u0435\u0440\u044B
 pref.page.name.meta                   = \u041C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435
 pref.page.name.navigator              = \u041D\u0430\u0432\u0438\u0433\u0430\u0442\u043E\u0440
-pref.page.name.editors                = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B
+pref.page.name.editors                = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u044B \u0411\u0414
 pref.page.name.query.manager          = \u041C\u0435\u043D\u0435\u0434\u0436\u0435\u0440 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
 pref.page.name.resources              = \u0420\u0435\u0441\u0443\u0440\u0441\u044B
 pref.page.name.errorHandle            = \u041E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0430 \u043E\u0448\u0438\u0431\u043E\u043A
@@ -26,7 +26,6 @@ pref.page.name.resultset.editors      = \u0420\u0435\u0434\u0430\u043A\u0442\u04
 pref.page.name.resultset.presentation = \u041F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u0435
 pref.page.name.resultset.grid         = \u0422\u0430\u0431\u043B\u0438\u0446\u0430
 pref.page.name.resultset.plain.text   = \u041E\u0431\u044B\u0447\u043D\u044B\u0439 \u0442\u0435\u043A\u0441\u0442
-pref.page.name.entity.editor          = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432
 productName = DBeaver

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/OSGI-INF/l10n/bundle_zh.properties
@@ -20,11 +20,10 @@ pref.page.name.confirmations = \u786E\u8BA4
 pref.page.name.connectionTypes = \u8FDE\u63A5\u7C7B\u578B
 pref.page.name.connections = \u8FDE\u63A5
 pref.page.name.data.formats = \u6570\u636E\u683C\u5F0F
-pref.page.name.db.configuration = DBeaver
+pref.page.name.db.configuration = Database User Interface
 pref.page.name.db.editors = \u7F16\u8F91\u5668
 pref.page.name.drivers = \u9A71\u52A8
 pref.page.name.drivers.maven = Maven
-pref.page.name.entity.editor = \u6570\u636E\u5E93\u7F16\u8F91\u5668
 pref.page.name.meta = \u5143\u6570\u636E
 pref.page.name.navigator = \u5BFC\u822A\u5668
 pref.page.name.query.manager = \u67E5\u8BE2\u7BA1\u7406

--- a/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ui.app.standalone/plugin.xml
@@ -282,11 +282,12 @@
        <page id="org.jkiss.dbeaver.preferences.main" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral" name="%pref.page.name.db.configuration">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.db.general"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.user.interface"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.errorHandle" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorHandle" name="%pref.page.name.errorHandle">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.main.errorHandle" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorHandle" name="%pref.page.name.errorHandle">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main.errorHandle" id="org.jkiss.dbeaver.preferences.main.errorLogs" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorLogs" name="%pref.page.name.errorLogs">
+        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.errorLogs" class="org.jkiss.dbeaver.ui.preferences.PrefPageErrorLogs" name="%pref.page.name.errorLogs">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
        <page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.resultset" class="org.jkiss.dbeaver.ui.editors.data.preferences.PrefPageResultSetMain" name="%pref.page.name.resultset">
@@ -312,22 +313,23 @@
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.db.dataformat"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.connections" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnections" name="%pref.page.name.connections">
+        <page id="org.jkiss.dbeaver.preferences.main.connections" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnections" name="%pref.page.name.connections">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.database.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.transactions" class="org.jkiss.dbeaver.ui.preferences.PrefPageTransactions" name="%pref.page.name.transactions">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.main.transactions" class="org.jkiss.dbeaver.ui.preferences.PrefPageTransactions" name="%pref.page.name.transactions">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.main.meta" class="org.jkiss.dbeaver.ui.preferences.PrefPageMetaData" name="%pref.page.name.meta">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.main.meta" class="org.jkiss.dbeaver.ui.preferences.PrefPageMetaData" name="%pref.page.name.meta">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.misc.qm" class="org.jkiss.dbeaver.ui.preferences.PrefPageQueryManager" name="%pref.page.name.query.manager">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.db.qm"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.drivers" class="org.jkiss.dbeaver.ui.preferences.PrefPageDrivers" name="%pref.page.name.drivers">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.drivers" class="org.jkiss.dbeaver.ui.preferences.PrefPageDrivers" name="%pref.page.name.drivers">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.ui.general"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
@@ -336,20 +338,21 @@
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.connectionTypes" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes" name="%pref.page.name.connectionTypes">
+        <page category="org.jkiss.dbeaver.preferences.main.connections" id="org.jkiss.dbeaver.preferences.connectionTypes" class="org.jkiss.dbeaver.ui.preferences.PrefPageConnectionTypes" name="%pref.page.name.connectionTypes">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.connection"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.navigator" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseNavigator" name="%pref.page.name.navigator">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.main" id="org.jkiss.dbeaver.preferences.editors" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseEditors" name="%pref.page.name.editors">
+        <page id="org.jkiss.dbeaver.preferences.editors" class="org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseEditors" name="%pref.page.name.editors">
+            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.entity"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
        </page>
-        <page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.entityeditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" name="%pref.page.name.entity.editor">
+        <!--<page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.preferences.main.entityeditor" class="org.jkiss.dbeaver.ui.preferences.PrefPageEntityEditor" name="%pref.page.name.entity.editor">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.entity"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>
-        </page>
+        </page>-->
        <page category="org.jkiss.dbeaver.preferences.main.resultset.editors" id="org.jkiss.dbeaver.ui.editors.binary.pref.HexPreferencesPage" class="org.jkiss.dbeaver.ui.editors.binary.pref.HexPreferencesPage" name="%pref.page.name.binary.editor">
            <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.binary"/>
            <keywordReference id="org.jkiss.dbeaver.core.keyword.dbeaver"/>

--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.java
@@ -240,6 +240,8 @@ public class ResultSetMessages extends NLS {
 	public static String pref_page_results_group_advanced;
    public static String pref_page_sql_editor_group_misc;
+    public static String pref_page_database_general_use_column_names;
+    public static String pref_page_database_general_use_column_names_tip;
 	public static String value_format_selector_database_native;
 	public static String value_format_selector_display;

--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages.properties
@@ -221,6 +221,8 @@ pref_page_database_general_group_transactions = Transactions
 pref_page_results_group_advanced = Advanced
 pref_page_sql_editor_group_misc = Miscellaneous
+pref_page_database_general_use_column_names = Use column names instead of column labels
+pref_page_database_general_use_column_names_tip = Ignore column labels in data viewer
 results_decorator_drag_and_drop_results_column=Drag-and-drop results column(s) here to create grouping\nPress CONTROL to configure grouping settings
 results_decorator_error_cant_perform_grouping_query=Cannot perform grouping query
 results_decorator_error_grouping_error=Grouping error

--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_de.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_de.properties
@@ -180,6 +180,8 @@ pref_page_database_general_label_result_set_max_size = ResultSet Fetchsize
 pref_page_results_group_advanced = Erweitert
 pref_page_sql_editor_group_misc = Diverses
+pref_page_database_general_use_column_names = Verwenden Sie Spaltennamen anstelle von Spaltenbezeichnungen
+pref_page_database_general_use_column_names_tip = Ignorieren von Spaltenbeschriftungen im Datenviewer
 virtual_edit_columns_page_add =  Virtuelle Spalten hinzuf\u00FCgen
 virtual_edit_columns_page_table_column_name = Name

--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_fr.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_fr.properties
@@ -155,3 +155,5 @@ pref_page_database_general_group_transactions = Transactions
 pref_page_results_group_advanced = Avanc\u00E9
 pref_page_sql_editor_group_misc = Divers
+pref_page_database_general_use_column_names = Utiliser les noms des colonnes au lieu de leur \u00E9tiquettes
+pref_page_database_general_use_column_names_tip = Ignorer les \u00E9tiquettes de colonnes dans la visionneuse de donn\u00E9es
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_ja.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_ja.properties
@@ -156,3 +156,5 @@ pref_page_database_general_group_transactions =\u30C8\u30E9\u30F3\u30B6\u30AF\u3
 pref_page_results_group_advanced = \u9AD8\u5EA6
 pref_page_sql_editor_group_misc = \u305D\u306E\u4ED6
+pref_page_database_general_use_column_names =\u5217\u30E9\u30D9\u30EB\u306E\u4EE3\u308F\u308A\u306B\u5217\u540D\u3092\u4F7F\u7528\u3059\u308B
+pref_page_database_general_use_column_names_tip =\u30C7\u30FC\u30BF\u30D3\u30E5\u30FC\u30A2\u3067\u5217\u30E9\u30D9\u30EB\u3092\u7121\u8996\u3059\u308B
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_ru.properties
@@ -178,6 +178,8 @@ pref_page_database_general_group_transactions=\u0422\u0440\u0430\u043D\u0437\u04
 pref_page_results_group_advanced = \u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E
 pref_page_sql_editor_group_misc = \u0420\u0430\u0437\u043D\u043E\u0435
+pref_page_database_general_use_column_names = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0438\u043C\u0435\u043D\u0430 \u043A\u043E\u043B\u043E\u043D\u043E\u043A \u0432\u043C\u0435\u0441\u0442\u043E \u043C\u0435\u0442\u043E\u043A \u0441\u0442\u043E\u043B\u0431\u0446\u043E\u0432
+pref_page_database_general_use_column_names_tip = \u0418\u0433\u043D\u043E\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043C\u0435\u0442\u043A\u0438 \u043A\u043E\u043B\u043E\u043D\u043E\u043A \u0432 \u0441\u0440\u0435\u0434\u0441\u0442\u0432\u0435 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
 value_format_selector_database_native=\u0424\u043E\u0440\u043C\u0430\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0411\u0414
 value_format_selector_display=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E)
 value_format_selector_editable=\u041F\u0440\u043E\u0441\u0442\u043E\u0439

--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_zh.properties
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/internal/ResultSetMessages_zh.properties
@@ -182,3 +182,5 @@ pref_page_database_general_group_transactions = \u4E8B\u52A1
 pref_page_results_group_advanced = \u9AD8\u7EA7
 pref_page_sql_completion_group_misc = \u6742\u9879
+pref_page_database_general_use_column_names = \u4F7F\u7528\u5217\u540D\u79F0\u800C\u4E0D\u662F\u5217\u6807\u7B7E
+pref_page_database_general_use_column_names_tip = \u5FFD\u7565\u6570\u636E\u67E5\u770B\u5668\u4E2D\u7684\u5217\u6807\u7B7E
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetMain.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/editors/data/preferences/PrefPageResultSetMain.java
@@ -64,6 +64,8 @@ public class PrefPageResultSetMain extends TargetPrefPage
    private Button advUseFetchSize;
+    private Button ignoreColumnLabelCheck;
    public PrefPageResultSetMain()
    {
        super();
@@ -88,7 +90,8 @@ public class PrefPageResultSetMain extends TargetPrefPage
            store.contains(ResultSetPreferences.RESULT_SET_ORDER_SERVER_SIDE) ||
            store.contains(ModelPreferences.RESULT_SET_USE_FETCH_SIZE) ||
            store.contains(ResultSetPreferences.RESULT_SET_USE_NAVIGATOR_FILTERS) ||
-            store.contains(ResultSetPreferences.RESULT_SET_SHOW_ERRORS_IN_DIALOG)
+            store.contains(ResultSetPreferences.RESULT_SET_SHOW_ERRORS_IN_DIALOG) ||
+                    store.contains(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL)
            ;
    }
@@ -139,6 +142,7 @@ public class PrefPageResultSetMain extends TargetPrefPage
        {
            Group advGroup = UIUtils.createControlGroup(leftPane, ResultSetMessages.pref_page_results_group_advanced, 1, GridData.VERTICAL_ALIGN_BEGINNING, 0);
+            ignoreColumnLabelCheck = UIUtils.createCheckbox(advGroup, ResultSetMessages.pref_page_database_general_use_column_names, ResultSetMessages.pref_page_database_general_use_column_names_tip, false, 1);
            advUseFetchSize = UIUtils.createCheckbox(advGroup, ResultSetMessages.pref_page_database_resultsets_label_fetch_size, ResultSetMessages.pref_page_database_resultsets_label_fetch_size_tip, false, 1);
        }
@@ -190,6 +194,7 @@ public class PrefPageResultSetMain extends TargetPrefPage
            useNavigatorFilters.setSelection(store.getBoolean(ResultSetPreferences.RESULT_SET_USE_NAVIGATOR_FILTERS));
            advUseFetchSize.setSelection(store.getBoolean(ModelPreferences.RESULT_SET_USE_FETCH_SIZE));
+            ignoreColumnLabelCheck.setSelection(store.getBoolean(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL));
            showErrorsInDialog.setSelection(store.getBoolean(ResultSetPreferences.RESULT_SET_SHOW_ERRORS_IN_DIALOG));
@@ -220,6 +225,7 @@ public class PrefPageResultSetMain extends TargetPrefPage
            store.setValue(ResultSetPreferences.RESULT_SET_USE_NAVIGATOR_FILTERS, useNavigatorFilters.getSelection());
            store.setValue(ModelPreferences.RESULT_SET_USE_FETCH_SIZE, advUseFetchSize.getSelection());
+            store.setValue(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL, ignoreColumnLabelCheck.getSelection());
            store.setValue(ResultSetPreferences.RESULT_SET_SHOW_ERRORS_IN_DIALOG, showErrorsInDialog.getSelection());
        } catch (Exception e) {
@@ -248,6 +254,7 @@ public class PrefPageResultSetMain extends TargetPrefPage
        store.setToDefault(ResultSetPreferences.RESULT_SET_USE_NAVIGATOR_FILTERS);
        store.setToDefault(ModelPreferences.RESULT_SET_USE_FETCH_SIZE);
+        store.setToDefault(ModelPreferences.RESULT_SET_IGNORE_COLUMN_LABEL);
        store.setToDefault(ResultSetPreferences.RESULT_SET_SHOW_ERRORS_IN_DIALOG);

--- a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/PrefPageSQLEditor.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/preferences/PrefPageSQLEditor.java
@@ -138,7 +138,7 @@ public class PrefPageSQLEditor extends TargetPrefPage
        {
            new PreferenceLinkArea(composite, SWT.NONE,
                PrefPageSQLEditor.TEXT_EDITOR_PAGE_ID,
-                "<a>''{0}''</a>" + SQLEditorMessages.pref_page_sql_editor_link_text_editor,
+                "<a>''{0}''</a> " + SQLEditorMessages.pref_page_sql_editor_link_text_editor,
                (IWorkbenchPreferenceContainer) getContainer(), null); //$NON-NLS-1$
        }