diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_de.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_de.properties
index c555ddb563babb9acfafe503141c1d1b1aa660a2..8097e0d27be2377f539cf9ad2293f7238b110086 100644
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_de.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_de.properties
@@ -63,10 +63,6 @@ command.org.jkiss.dbeaver.core.edit.copy.special.description = Erwe
command.org.jkiss.dbeaver.core.edit.copy.special.name = Erweitertes Kopieren
command.org.jkiss.dbeaver.core.edit.paste.special.description = Einf\u00FCgen mit speziellen Einstellungen
command.org.jkiss.dbeaver.core.edit.paste.special.name = Erweitertes Einf\u00FCgen
-command.org.jkiss.dbeaver.core.export.data.description = Daten in Dateien oder Datenbanktabellen exportieren
-command.org.jkiss.dbeaver.core.export.data.name = Daten exportieren
-command.org.jkiss.dbeaver.core.import.data.description = Daten aus Datenbanktabellen importieren
-command.org.jkiss.dbeaver.core.import.data.name = Daten importieren
command.org.jkiss.dbeaver.core.invalidate.description = Datenbankverbindung invalidieren bzw. neu verbinden
command.org.jkiss.dbeaver.core.invalidate.name = Invalidieren/Neu Verbinden
command.org.jkiss.dbeaver.core.migrate.connection.description = Verbindung auf neuen Treiber migrieren
diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_es.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_es.properties
index 683ccac1e7a8c50f8b5a54f1f1236e4406def9c7..b58a4d04db8259d783259f80960e75141ae3f650 100644
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_es.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_es.properties
@@ -13,16 +13,16 @@ editor.dbdata.name = Datos
editor.dbdata.description = Tabla de datos
command.org.jkiss.dbeaver.core.driver.manager.name = Gestor de Driver
command.org.jkiss.dbeaver.core.driver.manager.description = Gestor de Driver
-command.org.jkiss.dbeaver.core.new.connection.name = Nueva Conexión
-command.org.jkiss.dbeaver.core.new.connection.description = Asistente para Nueva Conexión
-command.org.jkiss.dbeaver.core.migrate.connection.name = Migrar conexión(es)
-command.org.jkiss.dbeaver.core.migrate.connection.description = Migrar conexión(es) a otro driver
+command.org.jkiss.dbeaver.core.new.connection.name = Nueva Conexi\u0443n
+command.org.jkiss.dbeaver.core.new.connection.description = Asistente para Nueva Conexi\u0443n
+command.org.jkiss.dbeaver.core.migrate.connection.name = Migrar conexi\u0443n(es)
+command.org.jkiss.dbeaver.core.migrate.connection.description = Migrar conexi\u0443n(es) a otro driver
command.org.jkiss.dbeaver.core.navigator.linkeditor.name = Enlaza al editor
command.org.jkiss.dbeaver.core.navigator.linkeditor.description = Enlaza al editor
command.org.jkiss.dbeaver.core.navigator.set.active.name = Establecer objeto activo
command.org.jkiss.dbeaver.core.navigator.set.active.description = Establecer objeto activo
-command.org.jkiss.dbeaver.core.navigator.bookmark.add.name = Añadir marcador
-command.org.jkiss.dbeaver.core.navigator.bookmark.add.description = Añadir marcador
+command.org.jkiss.dbeaver.core.navigator.bookmark.add.name = A\u0441adir marcador
+command.org.jkiss.dbeaver.core.navigator.bookmark.add.description = A\u0441adir marcador
command.org.jkiss.dbeaver.core.project.create.name = Crear Proyecto
command.org.jkiss.dbeaver.core.project.create.description = Crear un nuevo proyecto
command.org.jkiss.dbeaver.core.project.refresh.name = Refrescar proyectos
@@ -44,12 +44,12 @@ command.org.jkiss.dbeaver.core.disconnectAll.description=Cerrar todas las conexi
command.org.jkiss.dbeaver.core.invalidate.name = Invalidar/Reconectar
command.org.jkiss.dbeaver.core.invalidate.description = Invalidar/Reconectar las conexiones a la base de datos
command.org.jkiss.dbeaver.core.commit.name = Commit de las modificaciones
-command.org.jkiss.dbeaver.core.commit.description = Commit de las modificaciones en la Sesión SQL
+command.org.jkiss.dbeaver.core.commit.description = Commit de las modificaciones en la Sesi\u0443n SQL
command.org.jkiss.dbeaver.core.rollback.name = Rollback de las modificaciones
-command.org.jkiss.dbeaver.core.rollback.description = Rollback de las modificaciones en la Sesión SQL
+command.org.jkiss.dbeaver.core.rollback.description = Rollback de las modificaciones en la Sesi\u0443n SQL
command.org.jkiss.dbeaver.core.txn.autocommit.name = Auto-commit
-command.org.jkiss.dbeaver.core.txn.autocommit.description = Cambia el modo de transación de la sesión activa
-command.org.jkiss.dbeaver.core.transaction_mode.name = Modo de transacción
+command.org.jkiss.dbeaver.core.txn.autocommit.description = Cambia el modo de transaci\u0443n de la sesi\u0443n activa
+command.org.jkiss.dbeaver.core.transaction_mode.name = Modo de transacci\u0443n
command.org.jkiss.dbeaver.core.sql.editor.open.name = Editor SQL
command.org.jkiss.dbeaver.core.sql.editor.open.description = Abrir el Editor SQL
command.org.jkiss.dbeaver.core.sql.editor.create.name = Nuevo Editor SQL
@@ -64,14 +64,12 @@ command.org.jkiss.dbeaver.ui.editors.sql.run.statement.name = Ejecutar Comando S
command.org.jkiss.dbeaver.ui.editors.sql.run.statement.description = Ejecutar Comando
command.org.jkiss.dbeaver.ui.editors.sql.run.script.name = Ejecutar Script SQL
command.org.jkiss.dbeaver.ui.editors.sql.run.script.description = Ejecutar Script
-command.org.jkiss.dbeaver.ui.editors.sql.run.explain.name = Visualizar plan de ejecución
-command.org.jkiss.dbeaver.ui.editors.sql.run.explain.description = Visualizar plan de ejecución
+command.org.jkiss.dbeaver.ui.editors.sql.run.explain.name = Visualizar plan de ejecuci\u0443n
+command.org.jkiss.dbeaver.ui.editors.sql.run.explain.description = Visualizar plan de ejecuci\u0443n
command.org.jkiss.dbeaver.ui.editors.sql.open.file.name = Abrir script SQL
command.org.jkiss.dbeaver.ui.editors.sql.open.file.description = Abrir desde fichero
command.org.jkiss.dbeaver.ui.editors.sql.save.file.name = Grabar script SQL
command.org.jkiss.dbeaver.ui.editors.sql.save.file.description = Grabar a fichero
-command.org.jkiss.dbeaver.core.export.data.name = Exportar los datos
-command.org.jkiss.dbeaver.core.export.data.description = Exportar los datos a un fichero
command.org.jkiss.dbeaver.core.resultset.toggleMode.name = Cambiar entre vista de tabla/registro
command.org.jkiss.dbeaver.core.resultset.toggleMode.description = Cambiar entre vista de tabla/registro
command.org.jkiss.dbeaver.core.resultset.row.first.name = Primer registro
@@ -80,12 +78,12 @@ command.org.jkiss.dbeaver.core.resultset.row.previous.name = Registro anterior
command.org.jkiss.dbeaver.core.resultset.row.previous.description = Ir al registro anterior
command.org.jkiss.dbeaver.core.resultset.row.next.name = Registro siguiente
command.org.jkiss.dbeaver.core.resultset.row.next.description = Ir al registro siguiente
-command.org.jkiss.dbeaver.core.resultset.row.last.name = Último registro
-command.org.jkiss.dbeaver.core.resultset.row.last.description = Ir al último registro
+command.org.jkiss.dbeaver.core.resultset.row.last.name = \u042Altimo registro
+command.org.jkiss.dbeaver.core.resultset.row.last.description = Ir al \u044Altimo registro
command.org.jkiss.dbeaver.core.resultset.row.edit.name = Modificar celda
command.org.jkiss.dbeaver.core.resultset.row.edit.description = Modificar celda
-command.org.jkiss.dbeaver.core.resultset.row.add.name = Añadir registro
-command.org.jkiss.dbeaver.core.resultset.row.add.description = Añadir nuevo registro
+command.org.jkiss.dbeaver.core.resultset.row.add.name = A\u0441adir registro
+command.org.jkiss.dbeaver.core.resultset.row.add.description = A\u0441adir nuevo registro
command.org.jkiss.dbeaver.core.resultset.row.copy.name = Copiar registro
command.org.jkiss.dbeaver.core.resultset.row.copy.description = Copiar registro actual
command.org.jkiss.dbeaver.core.resultset.row.delete.name = Eliminar registro actual
@@ -94,7 +92,7 @@ command.org.jkiss.dbeaver.core.resultset.applyChanges.name = Aplicar cambios
command.org.jkiss.dbeaver.core.resultset.applyChanges.description = Aplicar cambios en los datos
command.org.jkiss.dbeaver.core.resultset.rejectChanges.name = Descargar cambios
command.org.jkiss.dbeaver.core.resultset.rejectChanges.description = Descargar cambios en los datos
-command.org.jkiss.dbeaver.core.edit.copy.adv_info = Información de copiar avanzado
+command.org.jkiss.dbeaver.core.edit.copy.adv_info = Informaci\u0443n de copiar avanzado
command.org.jkiss.dbeaver.core.edit.copy.special.name = Copiar especial
command.org.jkiss.dbeaver.core.edit.copy.special.description = Copiar espcial
command.org.jkiss.dbeaver.core.qm.filter.name = Filtros ...
@@ -102,7 +100,7 @@ command.org.jkiss.dbeaver.core.qm.filter.description = Filtrar el gestor de cons
command.org.jkiss.dbeaver.core.qm.clear.name = Limpiar el log
command.org.jkiss.dbeaver.core.qm.clear.description = Limpiar el log del gestor de consultas
command.org.jkiss.dbeaver.core.process.stop.name = Terminar proceso
-command.org.jkiss.dbeaver.core.process.stop.description = Terminar proceso en ejecución
+command.org.jkiss.dbeaver.core.process.stop.description = Terminar proceso en ejecuci\u0443n
command.org.jkiss.dbeaver.ui.editors.text.content.format.name = Formatear contenidp
command.org.jkiss.dbeaver.ui.editors.text.content.format.description = Formatear texto
DateFormatter.date.label = Fecha
@@ -117,18 +115,18 @@ DateFormatter.timestamp.label = Fecha/Hora
DateFormatter.timestamp.general.label = General
DateFormatter.timestamp.general.pattern.label = Cadena de formato de fecha/hora
DateFormatter.timestamp.general.pattern.description = Cadena de formato de fecha/hora
-DateFormatter.number.label = Números
+DateFormatter.number.label = N\u044Ameros
DateFormatter.number.general.label = General
-DateFormatter.number.general.grouping.label = Usar agrupación
-DateFormatter.number.general.grouping.description = Indica qué agrupación se usa en el formato
-DateFormatter.number.general.maxIntDigits.label = Máximas cifras enteras
-DateFormatter.number.general.maxIntDigits.description = Máximas cifras enteras
-DateFormatter.number.general.minIntDigits.label = Mínimas cifras enteras
-DateFormatter.number.general.minIntDigits.description = Mínimas cifras enteras
-DateFormatter.number.general.maxFractDigits.label = Máximas cifras decimales
-DateFormatter.number.general.maxFractDigits.description = Máximas cifras decimales
-DateFormatter.number.general.minFractDigits.label = Míximas cifras decimales
-DateFormatter.number.general.minFractDigits.description = Míximas cifras decimales
+DateFormatter.number.general.grouping.label = Usar agrupaci\u0443n
+DateFormatter.number.general.grouping.description = Indica qu\u0439 agrupaci\u0443n se usa en el formato
+DateFormatter.number.general.maxIntDigits.label = M\u0431ximas cifras enteras
+DateFormatter.number.general.maxIntDigits.description = M\u0431ximas cifras enteras
+DateFormatter.number.general.minIntDigits.label = M\u043Dnimas cifras enteras
+DateFormatter.number.general.minIntDigits.description = M\u043Dnimas cifras enteras
+DateFormatter.number.general.maxFractDigits.label = M\u0431ximas cifras decimales
+DateFormatter.number.general.maxFractDigits.description = M\u0431ximas cifras decimales
+DateFormatter.number.general.minFractDigits.label = M\u043Dximas cifras decimales
+DateFormatter.number.general.minFractDigits.description = M\u043Dximas cifras decimales
DateFormatter.number.general.roundingMode.label = Modo de redondeo
DateFormatter.number.general.roundingMode.description = Modo de redondeo
menu.database = Base de Datos
diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_fr.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_fr.properties
index 82dfdff05e56ef2142ab900c6b9b9f194ec0e7f3..6cf485d81a583e5a1a6388b69bd536406a6f45e7 100755
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_fr.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_fr.properties
@@ -96,10 +96,6 @@ command.org.jkiss.dbeaver.core.edit.copy.special.name = Copi
command.org.jkiss.dbeaver.core.edit.copy.special.label = Copie sp\u00E9ciale
command.org.jkiss.dbeaver.core.edit.paste.special.description = Collage sp\u00E9cial
command.org.jkiss.dbeaver.core.edit.paste.special.name = Collage sp\u00E9cial
-command.org.jkiss.dbeaver.core.export.data.description = Exporter les donn\u00E9es issues de cette requ\u00EAte
-command.org.jkiss.dbeaver.core.export.data.name = Exporter les donn\u00E9es
-command.org.jkiss.dbeaver.core.import.data.description = Importer des donn\u00E9es depuis une table de donn\u00E9es
-command.org.jkiss.dbeaver.core.import.data.name = Importer des donn\u00E9es
command.org.jkiss.dbeaver.core.invalidate.description = Rejeter/se reconnecter \u00E0 une base de donn\u00E9es
command.org.jkiss.dbeaver.core.invalidate.name = Rejeter/se reconnecter
command.org.jkiss.dbeaver.core.migrate.connection.description = Migrer les connexions vers un autre pilote
diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_it.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_it.properties
index aa20ef3ca3e6b33f0dacf7b5c7940de5614b4515..590515f8f61abfe5d4659835d9afc6bcef96aecc 100644
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_it.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_it.properties
@@ -68,8 +68,6 @@ command.org.jkiss.dbeaver.ui.editors.sql.open.file.name = Carica script SQL
command.org.jkiss.dbeaver.ui.editors.sql.open.file.description = Carica da file
command.org.jkiss.dbeaver.ui.editors.sql.save.file.name = Salva script SQL
command.org.jkiss.dbeaver.ui.editors.sql.save.file.description = Salva su file
-command.org.jkiss.dbeaver.core.export.data.name = Esporta i dati
-command.org.jkiss.dbeaver.core.export.data.description = Esporta i dati su file
command.org.jkiss.dbeaver.core.resultset.toggleMode.name = Accendi/Spegni vista Griglia/Record
command.org.jkiss.dbeaver.core.resultset.toggleMode.description = Accendi/Spegni vista Risultati Griglia/Record
command.org.jkiss.dbeaver.core.resultset.row.first.name = Prima riga
diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ja.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ja.properties
index c046cd6fc056617c65a974b130714c9669ec9e67..df3d32137ea503aae1307c9c2e15a6c576c9f872 100644
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ja.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ja.properties
@@ -219,10 +219,6 @@ command.org.jkiss.dbeaver.ui.editors.sql.rename.description=\u73FE\u5728\u306ESQ
command.org.jkiss.dbeaver.ui.editors.sql.close.tab.name=\u30BF\u30D6\u3092\u9589\u3058\u308B
command.org.jkiss.dbeaver.ui.editors.sql.close.tab.description=\u7D50\u679C\u30BF\u30D6\u3092\u9589\u3058\u308B
-command.org.jkiss.dbeaver.core.export.data.name=\u30C7\u30FC\u30BF\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-command.org.jkiss.dbeaver.core.export.data.description=\u30C7\u30FC\u30BF\u3092\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B
-command.org.jkiss.dbeaver.core.import.data.name=\u30C7\u30FC\u30BF\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
-command.org.jkiss.dbeaver.core.import.data.description=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u30C7\u30FC\u30BF\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B
command.org.jkiss.dbeaver.core.compare.objects.name=\u6BD4\u8F03
command.org.jkiss.dbeaver.core.compare.objects.description=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u6BD4\u8F03
diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ru.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ru.properties
index 31f1df4f3eb183759752ee1488e74e8510c242b2..698385ded8151ca372f32c54b96a60022e52d261 100644
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ru.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_ru.properties
@@ -82,10 +82,6 @@ command.org.jkiss.dbeaver.ui.editors.sql.open.file.name=\u0417\u0430\u0433\u0440
command.org.jkiss.dbeaver.ui.editors.sql.open.file.description=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0438\u0437 \u0444\u0430\u0439\u043B\u0430
command.org.jkiss.dbeaver.ui.editors.sql.save.file.name=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C SQL \u0441\u043A\u0440\u0438\u043F\u0442
command.org.jkiss.dbeaver.ui.editors.sql.save.file.description=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u0432 \u0444\u0430\u0439\u043B
-command.org.jkiss.dbeaver.core.export.data.name=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445
-command.org.jkiss.dbeaver.core.export.data.description=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0444\u0430\u0439\u043B\u044B \u0438\u043B\u0438 \u0442\u0430\u0431\u043B\u0438\u0446\u044B \u0411\u0414
-command.org.jkiss.dbeaver.core.import.data.name=\u0418\u043C\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445
-command.org.jkiss.dbeaver.core.import.data.description=\u0418\u043C\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u0438\u0437 \u0442\u0430\u0431\u043B\u0438\u0446 \u0411\u0414
command.org.jkiss.dbeaver.core.compare.objects.name=\u0421\u0440\u0430\u0432\u043D\u0438\u0442\u044C
command.org.jkiss.dbeaver.core.compare.objects.description=\u0421\u0440\u0430\u0432\u043D\u0438\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B \u0411\u0414
diff --git a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_zh.properties b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_zh.properties
index f03a1be59012efe8a78e06c6f88fca9ee7011744..b76bffb1d0048dc34d6ee40b33526568a554d68c 100644
--- a/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_zh.properties
+++ b/nls/bundles/org.jkiss.dbeaver.core.nls/OSGI-INF/l10n/bundle_zh.properties
@@ -128,10 +128,6 @@ command.org.jkiss.dbeaver.core.edit.copy.special.label = \u9AD8\u7EA7\u62F7\u8D1
command.org.jkiss.dbeaver.core.edit.copy.special.name = \u9AD8\u7EA7\u590D\u5236
command.org.jkiss.dbeaver.core.edit.paste.special.description = \u7C98\u8D34\u5E76\u4FDD\u7559\u989D\u5916\u8BBE\u7F6E
command.org.jkiss.dbeaver.core.edit.paste.special.name = \u9AD8\u7EA7\u7C98\u8D34
-command.org.jkiss.dbeaver.core.export.data.description = \u5C06\u6570\u636E\u5BFC\u51FA\u81F3\u6587\u4EF6
-command.org.jkiss.dbeaver.core.export.data.name = \u5BFC\u51FA\u6570\u636E
-command.org.jkiss.dbeaver.core.import.data.description = \u4ECE\u6570\u636E\u5E93\u8868\u4E2D\u5BFC\u5165\u6570\u636E
-command.org.jkiss.dbeaver.core.import.data.name = \u5BFC\u5165\u6570\u636E
command.org.jkiss.dbeaver.core.invalidate.description = \u65AD\u5F00\u6216\u91CD\u65B0\u8FDE\u63A5
command.org.jkiss.dbeaver.core.invalidate.name = \u65AD\u5F00/\u91CD\u65B0\u8FDE\u63A5
command.org.jkiss.dbeaver.core.migrate.connection.description = \u8FC1\u79FB(\u8FDE\u63A5)\u81F3\u5176\u5B83\u6570\u636E\u5E93
diff --git a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
index c885191c3b376c8c4a5567989f4808b75e0eb0ed..c563a8560b3ea62bdb9200699f797d90b0067bc0 100644
--- a/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.core/OSGI-INF/l10n/bundle.properties
@@ -220,10 +220,6 @@ command.org.jkiss.dbeaver.ui.editors.sql.rename.description=Rename current SQL s
command.org.jkiss.dbeaver.ui.editors.sql.close.tab.name=Close tab
command.org.jkiss.dbeaver.ui.editors.sql.close.tab.description=Close results tab
-command.org.jkiss.dbeaver.core.export.data.name=Export Data
-command.org.jkiss.dbeaver.core.export.data.description=Export data to file(s) or database table(s)
-command.org.jkiss.dbeaver.core.import.data.name=Import Data
-command.org.jkiss.dbeaver.core.import.data.description=Import data from database table(s)
command.org.jkiss.dbeaver.core.compare.objects.name=Compare
command.org.jkiss.dbeaver.core.compare.objects.description=Compare database objects
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index d8d538208435e59c53e9ce7db568cbc757ed04d5..f878b6083c6add04f735ddda2056f3f8a198e0c1 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -295,8 +295,6 @@
-
-
@@ -348,8 +346,6 @@
-
-
@@ -2110,16 +2106,9 @@
label="%command.org.jkiss.dbeaver.core.sql.editor.forSelection.name">
-
-
-
-
-
-
+
+
+
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle.properties
index 6a19a357391063fc84bc7bdb6dbeee170b6dfd0c..896c6a86677fd9e0a30e3d760105c1392006eb26 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle.properties
@@ -3,6 +3,11 @@ Bundle-Name = DBeaver Data Transfer
extension-point.org.jkiss.dbeaver.dataTransfer.name = Data Transfer Provider
+command.org.jkiss.dbeaver.core.export.data.name=Export Data
+command.org.jkiss.dbeaver.core.export.data.description=Export data to file(s) or database table(s)
+command.org.jkiss.dbeaver.core.import.data.name=Import Data
+command.org.jkiss.dbeaver.core.import.data.description=Import data from database table(s)
+
dataTransfer.producer.database.name=Table
dataTransfer.producer.database.description=Database table(s)
dataTransfer.consumer.stream.name=Files
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_de.properties b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_de.properties
index abd5b15f138112d7555ec9731e54c4a061f2989d..693c31c47af47cf5fd9ab23d49127ea77650c196 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_de.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_de.properties
@@ -1,3 +1,8 @@
+command.org.jkiss.dbeaver.core.export.data.description = Daten in Dateien oder Datenbanktabellen exportieren
+command.org.jkiss.dbeaver.core.export.data.name = Daten exportieren
+command.org.jkiss.dbeaver.core.import.data.description = Daten aus Datenbanktabellen importieren
+command.org.jkiss.dbeaver.core.import.data.name = Daten importieren
+
dataTransfer.consumer.database.description = Datenbanktabellen
dataTransfer.consumer.database.name = Datenbank
dataTransfer.consumer.stream.description = Flat-Files
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_fr.properties b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_fr.properties
index ab7d2230c357f1daec592c4c9d4ff5d3766b77cd..2cc446f58edec659547d72244b00c50a691c0de6 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_fr.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_fr.properties
@@ -1,11 +1,10 @@
-# DBeaver - Universal Database Manager
-# Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
-
-Bundle-Vendor = JKISS
-Bundle-Name = Extension Noyau DBeaver
-
extension-point.org.jkiss.dbeaver.dataTransfer.name = Fournisseur de Transfert de donn\u00E9es
+command.org.jkiss.dbeaver.core.export.data.description = Exporter les donn\u00E9es issues de cette requ\u00EAte
+command.org.jkiss.dbeaver.core.export.data.name = Exporter les donn\u00E9es
+command.org.jkiss.dbeaver.core.import.data.description = Importer des donn\u00E9es depuis une table de donn\u00E9es
+command.org.jkiss.dbeaver.core.import.data.name = Importer des donn\u00E9es
+
dataTransfer.consumer.database.description = Table(s) de base de donn\u00E9es
dataTransfer.consumer.database.name = Base de donn\u00E9es
dataTransfer.consumer.stream.description = Fichier(s) \u00E0 plat
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ja.properties b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ja.properties
index bed8314206113e963b4a9a275144005a88fe364b..ca3b2f23944078399154270b37c7b2af07892b2a 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ja.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ja.properties
@@ -1,9 +1,10 @@
-
-Bundle-Vendor =JKISS
-Bundle-Name =DBeaver\u30B3\u30A2\u30D7\u30E9\u30B0\u30A4\u30F3
-
extension-point.org.jkiss.dbeaver.dataTransfer.name =\u30C7\u30FC\u30BF\u8EE2\u9001\u30D7\u30ED\u30D0\u30A4\u30C0
+command.org.jkiss.dbeaver.core.export.data.name=\u30C7\u30FC\u30BF\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
+command.org.jkiss.dbeaver.core.export.data.description=\u30C7\u30FC\u30BF\u3092\u30D5\u30A1\u30A4\u30EB\u307E\u305F\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B
+command.org.jkiss.dbeaver.core.import.data.name=\u30C7\u30FC\u30BF\u306E\u30A4\u30F3\u30DD\u30FC\u30C8
+command.org.jkiss.dbeaver.core.import.data.description=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u30C7\u30FC\u30BF\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B
+
dataTransfer.producer.database.name=\u8868
dataTransfer.producer.database.description=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C6\u30FC\u30D6\u30EB
dataTransfer.consumer.stream.name=\u30D5\u30A1\u30A4\u30EB
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ru.properties
index 2de9cf575ceabd77cf031c6fe470a2cc5b368757..af54dc4fc59946f27830b96fe40efe3fe9788cbc 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_ru.properties
@@ -1,3 +1,8 @@
+command.org.jkiss.dbeaver.core.export.data.name=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445
+command.org.jkiss.dbeaver.core.export.data.description=\u042D\u043A\u0441\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0444\u0430\u0439\u043B\u044B \u0438\u043B\u0438 \u0442\u0430\u0431\u043B\u0438\u0446\u044B \u0411\u0414
+command.org.jkiss.dbeaver.core.import.data.name=\u0418\u043C\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445
+command.org.jkiss.dbeaver.core.import.data.description=\u0418\u043C\u043F\u043E\u0440\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u0438\u0437 \u0442\u0430\u0431\u043B\u0438\u0446 \u0411\u0414 \u0438\u043B\u0438 \u0444\u0430\u0439\u043B\u043E\u0432
+
dataTransfer.producer.database.name=\u0422\u0430\u0431\u043B\u0438\u0446\u0430
dataTransfer.producer.database.description=\u0422\u0430\u0431\u043B\u0438\u0446\u0430 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445
dataTransfer.consumer.stream.name=\u0424\u0430\u0439\u043B\u044B
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_zh.properties b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_zh.properties
index 3e1358fa93a8d7c18845f8de95484c3e4bbf5841..d75d7f66d741c8c879cdbbb8cab150615ed8b5dd 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_zh.properties
+++ b/plugins/org.jkiss.dbeaver.data.transfer/OSGI-INF/l10n/bundle_zh.properties
@@ -1,3 +1,8 @@
+command.org.jkiss.dbeaver.core.export.data.description = \u5C06\u6570\u636E\u5BFC\u51FA\u81F3\u6587\u4EF6
+command.org.jkiss.dbeaver.core.export.data.name = \u5BFC\u51FA\u6570\u636E
+command.org.jkiss.dbeaver.core.import.data.description = \u4ECE\u6570\u636E\u5E93\u8868\u4E2D\u5BFC\u5165\u6570\u636E
+command.org.jkiss.dbeaver.core.import.data.name = \u5BFC\u5165\u6570\u636E
+
dataTransfer.consumer.database.description = \u6570\u636E\u5E93\u8868
dataTransfer.consumer.database.name = \u6570\u636E\u5E93
dataTransfer.consumer.stream.description = \u5E73\u9762\u6587\u4EF6
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml b/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml
index 0e960d5516570b154f4afd49420015a2627eb264..bcd730d4b22be4ddbf9f088321607f3b9cf8cae4 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.data.transfer/plugin.xml
@@ -4,6 +4,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+