Add i18n and l10n for Connection Edit.

Former-commit-id: dac175ea

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreMessages.java

@@ -1151,6 +1151,62 @@ public class CoreMessages extends NLS {
 	public static String pref_page_projects_settings_label_not_store_resources_in_another_project;
 	public static String pref_page_projects_settings_label_restart_require_refresh_global_settings;
 	// Preference/Properties
+
+	// Connection edit
+	public static String dialog_connection_edit_title;
+
+	public static String dialog_connection_edit_wizard_conn_conf_network_link;
+
+	public static String dialog_connection_edit_wizard_general;
+	public static String dialog_connection_edit_wizard_general_bootstrap_query_title;
+	public static String dialog_connection_edit_wizard_general_bootstrap_query_sql_label;
+	public static String dialog_connection_edit_wizard_general_bootstrap_query_sql_title;
+	public static String dialog_connection_edit_wizard_general_bootstrap_query_ignore_error_lable;
+	public static String dialog_connection_edit_wizard_general_filter_save_button;
+	public static String dialog_connection_edit_wizard_general_filter_remove_button;
+	public static String dialog_connection_edit_wizard_general_filter_save_label;
+	public static String dialog_connection_edit_wizard_general_filter_name_label;
+	public static String dialog_connection_edit_wizard_general_filter_hint_text;
+
+	public static String dialog_connection_edit_wizard_shell_cmd;
+	public static String dialog_connection_edit_wizard_shell_cmd_pause_label;
+	public static String dialog_connection_edit_wizard_shell_cmd_pause_tooltip;
+	public static String dialog_connection_edit_wizard_shell_cmd_directory_label;
+	public static String dialog_connection_edit_wizard_shell_cmd_directory_title;
+	public static String dialog_connection_edit_wizard_shell_cmd_variables_hint_label;
+	public static String dialog_connection_edit_wizard_shell_cmd_variables_hint_title;
+
+	public static String dialog_connection_edit_wizard_metadata;
+	public static String dialog_connection_edit_wizard_metadata_description;
+	public static String dialog_connection_edit_wizard_resultset;
+	public static String dialog_connection_edit_wizard_resultset_description;
+	public static String dialog_connection_edit_wizard_binary;
+	public static String dialog_connection_edit_wizard_binary_description;
+	public static String dialog_connection_edit_wizard_data_format;
+	public static String dialog_connection_edit_wizard_data_format_description;
+	public static String dialog_connection_edit_wizard_presentation;
+	public static String dialog_connection_edit_wizard_presentation_description;
+	public static String dialog_connection_edit_wizard_sql_editor;
+	public static String dialog_connection_edit_wizard_sql_editor_description;
+	public static String dialog_connection_edit_wizard_sql_processing;
+	public static String dialog_connection_edit_wizard_sql_processing_description;
+	
+	public static String dialog_connection_edit_wizard_conn_change_title;
+	public static String dialog_connection_edit_wizard_conn_change_question;
+	public static String dialog_connection_edit_wizard_lock_pwd_title;
+	public static String dialog_connection_edit_wizard_bad_pwd_title;
+	public static String dialog_connection_edit_wizard_bad_pwd_msg;
+	public static String dialog_connection_edit_wizard_error_md5_title;
+	public static String dialog_connection_edit_wizard_error_md5_msg;
+	// Connection edit
+
+	// Driver edit
+	public static String dialog_edit_driver_setting;
+	public static String dialog_edit_driver_type_label;
+	public static String dialog_edit_driver_embedded_label;
+	public static String dialog_edit_driver_description;
+	// Driver edit
+
 	
 	
 	static {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources.properties

@@ -1116,3 +1116,59 @@ pref_page_projects_settings_label_restart_require_refresh_global_settings = Rest
 pref_page_sql_editor_checkbox_create_script_folders = Create script folders
 ## Preference/Properties ##
 
+
+## Connection edit ##
+dialog_connection_edit_title = Connection '{0}' configuration
+
+dialog_connection_edit_wizard_conn_conf_network_link = Network settings (SSH, SSL, Proxy, ...)
+
+dialog_connection_edit_wizard_general = General
+dialog_connection_edit_wizard_general_bootstrap_query_title = Bootstrap SQL queries
+dialog_connection_edit_wizard_general_bootstrap_query_sql_label = SQL Queries
+dialog_connection_edit_wizard_general_bootstrap_query_sql_title = Enter SQL
+dialog_connection_edit_wizard_general_bootstrap_query_ignore_error_lable = Ignore SQL errors
+dialog_connection_edit_wizard_general_filter_save_button = Save
+dialog_connection_edit_wizard_general_filter_remove_button = Remove
+dialog_connection_edit_wizard_general_filter_save_label = Saved filter
+dialog_connection_edit_wizard_general_filter_name_label = Name
+dialog_connection_edit_wizard_general_filter_hint_text = You can use masks (%, _ and *) in filters
+
+dialog_connection_edit_wizard_shell_cmd = Shell Commands
+dialog_connection_edit_wizard_shell_cmd_pause_label = Pause after execute (ms)
+dialog_connection_edit_wizard_shell_cmdp_pause_tooliti = Wait for specified amount of milliseconds after process spawn
+dialog_connection_edit_wizard_shell_cmd_directory_label = Working directory
+dialog_connection_edit_wizard_shell_cmd_directory_title = Working directory
+dialog_connection_edit_wizard_shell_cmd_variables_hint_label = You can use variables in commands. Click to see the list.
+dialog_connection_edit_wizard_shell_cmd_variables_hint_title = Variables
+
+dialog_connection_edit_wizard_metadata = Metadata
+dialog_connection_edit_wizard_metadata_description = Metadata reading preferences
+dialog_connection_edit_wizard_resultset = Result Sets
+dialog_connection_edit_wizard_resultset_description = Result Set preferences
+dialog_connection_edit_wizard_binary = Binaries
+dialog_connection_edit_wizard_binary_description = Binary data representation
+dialog_connection_edit_wizard_data_format = Data Formatting
+dialog_connection_edit_wizard_data_format_description = Data formatting preferences
+dialog_connection_edit_wizard_presentation = Presentation
+dialog_connection_edit_wizard_presentation_description = ResultSets UI & presentation
+dialog_connection_edit_wizard_sql_editor = SQL Editor
+dialog_connection_edit_wizard_sql_editor_description = SQL editor settings
+dialog_connection_edit_wizard_sql_processing = SQL Processing
+dialog_connection_edit_wizard_sql_processing_description = SQL processing settings
+
+dialog_connection_edit_wizard_conn_change_title = Connection changed
+dialog_connection_edit_wizard_conn_change_question = Connection '{0}' has been changed.\nDo you want to reconnect?
+dialog_connection_edit_wizard_lock_pwd_title = Enter lock password
+dialog_connection_edit_wizard_bad_pwd_title = Bad password
+dialog_connection_edit_wizard_bad_pwd_msg = Password doesn't match
+dialog_connection_edit_wizard_error_md5_title = Error making MD5
+dialog_connection_edit_wizard_error_md5_msg =Can't generate password hash
+## Connection edit ##
+
+## Driver edit ##
+dialog_edit_driver_type_label = Driver Type
+dialog_edit_driver_embedded_label = Embedded
+dialog_edit_driver_setting = Settings
+dialog_edit_driver_description = Descriptions
+## Driver edit ##
+

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/CoreResources_zh.properties

@@ -1118,3 +1118,58 @@ pref_page_projects_settings_label_not_store_resources_in_another_project = \u4E0
 pref_page_projects_settings_label_restart_require_refresh_global_settings = \u66F4\u65B0\u901A\u7528\u8BBE\u7F6E\u540E\u8981\u6C42\u91CD\u542F
 ##Preference/Properties End
 
+## Connection edit ##
+dialog_connection_edit_title = \u8FDE\u63A5 '{0}' \u914D\u7F6E
+
+dialog_connection_edit_wizard_conn_conf_network_link = \u7F51\u7EDC\u8BBE\u7F6E (SSH, SSL, Proxy, ...)
+
+dialog_connection_edit_wizard_general = \u5E38\u89C4
+dialog_connection_edit_wizard_general_bootstrap_query_title = \u542F\u52A8\u65F6 SQL \u67E5\u8BE2
+dialog_connection_edit_wizard_general_bootstrap_query_sql_label = SQL \u67E5\u8BE2
+dialog_connection_edit_wizard_general_bootstrap_query_sql_title = \u8F93\u5165 SQL
+dialog_connection_edit_wizard_general_bootstrap_query_ignore_error_lable = \u5FFD\u7565 SQL \u9519\u8BEF
+dialog_connection_edit_wizard_general_filter_save_button = \u4FDD\u5B58
+dialog_connection_edit_wizard_general_filter_remove_button = \u79FB\u9664
+dialog_connection_edit_wizard_general_filter_save_label = \u4FDD\u5B58\u7684\u8FC7\u6EE4
+dialog_connection_edit_wizard_general_filter_name_label = \u540D\u79F0
+dialog_connection_edit_wizard_general_filter_hint_text = \u4F60\u53EF\u4EE5\u5728\u8FC7\u6EE4\u4E2D\u4F7F\u7528\u63A9\u7801 (%, _ and *)
+
+dialog_connection_edit_wizard_shell_cmd = Shell \u547D\u4EE4
+dialog_connection_edit_wizard_shell_cmd_pause_label = \u6267\u884C\u540E\u6682\u505C (ms) 
+dialog_connection_edit_wizard_shell_cmdp_pause_tooliti = \u5728\u8FDB\u7A0B\u751F\u6210\u540E\u7B49\u5F85\u6307\u5B9A\u7684\u6BEB\u79D2\u6570
+dialog_connection_edit_wizard_shell_cmd_directory_label = \u5DE5\u4F5C\u76EE\u5F55
+dialog_connection_edit_wizard_shell_cmd_directory_title = \u5DE5\u4F5C\u76EE\u5F55
+dialog_connection_edit_wizard_shell_cmd_variables_hint_label = \u4F60\u53EF\u4EE5\u5728\u547D\u4EE4\u4E2D\u4F7F\u7528\u53D8\u91CF\u3002\u5355\u51FB\u770B\u5217\u8868\u3002
+dialog_connection_edit_wizard_shell_cmd_variables_hint_title = \u53D8\u91CF
+
+dialog_connection_edit_wizard_metadata = \u5143\u6570\u636E
+dialog_connection_edit_wizard_metadata_description = \u5143\u6570\u636E\u8BFB\u53D6\u504F\u597D
+dialog_connection_edit_wizard_resultset = \u7ED3\u679C\u96C6
+dialog_connection_edit_wizard_resultset_description = \u7ED3\u679C\u96C6\u504F\u597D
+dialog_connection_edit_wizard_binary = \u4E8C\u8FDB\u5236
+dialog_connection_edit_wizard_binary_description = \u4E8C\u8FDB\u5236\u6570\u636E\u8868\u793A
+dialog_connection_edit_wizard_data_format = \u6570\u636E\u683C\u5F0F\u5316
+dialog_connection_edit_wizard_data_format_description = \u6570\u636E\u683C\u5F0F\u5316\u504F\u597D
+dialog_connection_edit_wizard_presentation = \u5C55\u793A
+dialog_connection_edit_wizard_presentation_description = \u7ED3\u679C\u96C6\u7528\u6237\u754C\u9762\u548C\u5C55\u793A
+dialog_connection_edit_wizard_sql_editor = SQL \u7F16\u8F91\u5668
+dialog_connection_edit_wizard_sql_editor_description = SQL \u7F16\u8F91\u5668\u8BBE\u7F6E
+dialog_connection_edit_wizard_sql_processing = SQL \u5904\u7406
+dialog_connection_edit_wizard_sql_processing_description = SQL \u5904\u7406\u8BBE\u7F6E
+
+dialog_connection_edit_wizard_conn_change_title = \u8FDE\u63A5\u53D8\u66F4
+dialog_connection_edit_wizard_conn_change_question = \u8FDE\u63A5 '{0}' \u5DF2\u7ECF\u88AB\u66F4\u6539\u3002\n\u4F60\u60F3\u91CD\u65B0\u8FDE\u63A5\u5417?
+dialog_connection_edit_wizard_lock_pwd_title = \u8BF7\u8F93\u5165\u9501\u5BC6\u7801
+dialog_connection_edit_wizard_bad_pwd_title = \u9519\u8BEF\u7684\u5BC6\u7801
+dialog_connection_edit_wizard_bad_pwd_msg = \u5BC6\u7801\u4E0D\u5339\u914D
+dialog_connection_edit_wizard_error_md5_title = \u9519\u8BEF\u751F\u6210 MD5
+dialog_connection_edit_wizard_error_md5_msg = \u4E0D\u80FD\u751F\u6210\u5BC6\u7801\u54C8\u5E0C
+## Connection edit ##
+
+## Driver edit ##
+dialog_edit_driver_type_label = \u9A71\u52A8\u7C7B\u578B
+dialog_edit_driver_embedded_label = \u5D4C\u5165
+dialog_edit_driver_setting = \u8BBE\u7F6E
+dialog_edit_driver_description = \u63CF\u8FF0
+## Driver edit ##
+

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/VariablesHintLabel.java

@@ -24,6 +24,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Layout;
+import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.ui.dialogs.EditTextDialog;
 import org.jkiss.dbeaver.utils.GeneralUtils;
@@ -38,7 +39,7 @@ public class VariablesHintLabel
     {
         String varsText = GeneralUtils.generateVariablesLegend(vars);
 
-        CLabel infoLabel = UIUtils.createInfoLabel(parent, "You can use variables in commands. Click to see the list.");
+        CLabel infoLabel = UIUtils.createInfoLabel(parent, CoreMessages.dialog_connection_edit_wizard_shell_cmd_variables_hint_label);
         Layout layout = parent.getLayout();
         GridData gd = new GridData(GridData.FILL_HORIZONTAL);
         if (layout instanceof GridLayout) {
@@ -49,7 +50,7 @@ public class VariablesHintLabel
         infoLabel.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseDown(MouseEvent e) {
-                new EditTextDialog(parent.getShell(), "Variables", varsText, true).open();
+                new EditTextDialog(parent.getShell(), CoreMessages.dialog_connection_edit_wizard_shell_cmd_variables_hint_title, varsText, true).open();
             }
         });
         infoLabel.setToolTipText(varsText);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageAbstract.java

@@ -104,7 +104,7 @@ public abstract class ConnectionPageAbstract extends DialogPage implements IData
 
         if (!site.isNew() && !site.getDriver().isEmbedded()) {
             Link netConfigLink = new Link(panel, SWT.NONE);
-            netConfigLink.setText("<a>Network settings (SSH, SSL, Proxy, ...)</a>");
+            netConfigLink.setText("<a>" + CoreMessages.dialog_connection_edit_wizard_conn_conf_network_link + "</a>");
             netConfigLink.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java

@@ -39,7 +39,6 @@ import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.*;
-import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.connection.DBPConnectionBootstrap;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPConnectionEventType;
@@ -118,7 +117,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
     {
         super("newConnectionFinal"); //$NON-NLS-1$
         this.wizard = wizard;
-        setTitle(wizard.isNew() ? CoreMessages.dialog_connection_wizard_final_header : "General");
+        setTitle(wizard.isNew() ? CoreMessages.dialog_connection_wizard_final_header : CoreMessages.dialog_connection_edit_wizard_general);
         setDescription(CoreMessages.dialog_connection_wizard_final_description);
 
         filters.add(new FilterInfo(DBSCatalog.class, CoreMessages.dialog_connection_wizard_final_filter_catalogs));
@@ -412,10 +411,12 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
                     }
                 });
 
-                isolationLevel = UIUtils.createLabelCombo(txnGroup, CoreMessages.dialog_connection_wizard_final_label_isolation_level, CoreMessages.dialog_connection_wizard_final_label_isolation_level_tooltip, SWT.DROP_DOWN | SWT.READ_ONLY);
-                defaultSchema = UIUtils.createLabelCombo(txnGroup, CoreMessages.dialog_connection_wizard_final_label_default_schema, CoreMessages.dialog_connection_wizard_final_label_default_schema_tooltip, SWT.DROP_DOWN);
-                
-                keepAliveInterval = UIUtils.createLabelSpinner(txnGroup, CoreMessages.dialog_connection_wizard_final_label_keepalive, CoreMessages.dialog_connection_wizard_final_label_keepalive_tooltip, 0, 0, Short.MAX_VALUE);
+                isolationLevel = UIUtils.createLabelCombo(txnGroup, CoreMessages.dialog_connection_wizard_final_label_isolation_level, 
+                		CoreMessages.dialog_connection_wizard_final_label_isolation_level_tooltip, SWT.DROP_DOWN | SWT.READ_ONLY);
+                defaultSchema = UIUtils.createLabelCombo(txnGroup, CoreMessages.dialog_connection_wizard_final_label_default_schema, 
+                		CoreMessages.dialog_connection_wizard_final_label_default_schema_tooltip, SWT.DROP_DOWN);
+                keepAliveInterval = UIUtils.createLabelSpinner(txnGroup, CoreMessages.dialog_connection_wizard_final_label_keepalive,
+                		CoreMessages.dialog_connection_wizard_final_label_keepalive_tooltip, 0, 0, Short.MAX_VALUE);
 
                 {
                     String bootstrapTooltip = CoreMessages.dialog_connection_wizard_final_label_bootstrap_tooltip;
@@ -540,13 +541,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
     {
         connectionFolderCombo.removeAll();
         connectionFolderCombo.addItem(null);
-        DBPDataSourceRegistry dataSourceRegistry = getWizard().getDataSourceRegistry();
-        if (dataSourceRegistry == null) {
-            //FIXME:AF: we need a solution for IDE mode
-            return;
-        }
-        List<? extends DBPDataSourceFolder> rootFolders = dataSourceRegistry.getRootFolders();
-        for (DBPDataSourceFolder folder : rootFolders) {
+        for (DBPDataSourceFolder folder : getWizard().getDataSourceRegistry().getRootFolders()) {
             loadConnectionFolder(0, folder);
         }
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditBootstrapQueriesDialog.java

@@ -54,11 +54,11 @@ public class EditBootstrapQueriesDialog extends HelpEnabledDialog {
 
     @Override
     protected Control createDialogArea(Composite parent) {
-        getShell().setText("Bootstrap SQL queries");
+        getShell().setText(CoreMessages.dialog_connection_edit_wizard_general_bootstrap_query_title);
 
         Composite composite = (Composite) super.createDialogArea(parent);
 
-        Group group = UIUtils.createControlGroup(composite, "SQL Queries", 2, GridData.FILL_BOTH, 0);
+        Group group = UIUtils.createControlGroup(composite, CoreMessages.dialog_connection_edit_wizard_general_bootstrap_query_sql_label, 2, GridData.FILL_BOTH, 0);
 
         queriesTable = new Table(group, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
         final GridData gd = new GridData(GridData.FILL_BOTH);
@@ -95,7 +95,7 @@ public class EditBootstrapQueriesDialog extends HelpEnabledDialog {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 tableEditor.closeEditor();
-                String sql = EditTextDialog.editText(getShell(), "Enter SQL", "");
+                String sql = EditTextDialog.editText(getShell(), CoreMessages.dialog_connection_edit_wizard_general_bootstrap_query_sql_title, "");
                 if (sql != null) {
                     TableItem newItem = new TableItem(queriesTable, SWT.LEFT);
                     newItem.setText(sql);
@@ -129,7 +129,7 @@ public class EditBootstrapQueriesDialog extends HelpEnabledDialog {
             }
         });
 
-        ignoreErrorButton = UIUtils.createCheckbox(composite, "Ignore SQL errors", ignoreErrors);
+        ignoreErrorButton = UIUtils.createCheckbox(composite, CoreMessages.dialog_connection_edit_wizard_general_bootstrap_query_ignore_error_lable, ignoreErrors);
         new VariablesHintLabel(composite, DataSourceDescriptor.CONNECT_VARIABLES);
 
         UIUtils.packColumns(queriesTable, true);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionDialog.java

@@ -17,6 +17,7 @@
 package org.jkiss.dbeaver.ui.dialogs.connection;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -57,7 +58,7 @@ public class EditConnectionDialog extends MultiPageWizardDialog
     {
         Control contents = super.createContents(parent);
         DataSourceDescriptor activeDataSource = getWizard().getActiveDataSource();
-        getShell().setText("Connection '" + activeDataSource.getName() + "' configuration");
+        getShell().setText(NLS.bind( CoreMessages.dialog_connection_edit_title, activeDataSource.getName()));
         getShell().setImage(DBeaverIcons.getImage(activeDataSource.getObjectImage()));
         return contents;
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditObjectFilterDialog.java

@@ -102,11 +102,11 @@ public class EditObjectFilterDialog extends HelpEnabledDialog {
         includeTable = createEditableList(CoreMessages.dialog_filter_list_include, filter.getInclude());
         excludeTable = createEditableList(CoreMessages.dialog_filter_list_exclude, filter.getExclude());
 
-        UIUtils.createInfoLabel(blockControl, "You can use masks (%, _ and *) in filters");
+        UIUtils.createInfoLabel(blockControl, CoreMessages.dialog_connection_edit_wizard_general_filter_hint_text);
 
         {
-            Group sfGroup = UIUtils.createControlGroup(composite, "Saved filter", 4, GridData.FILL_HORIZONTAL, 0);
-            namesCombo = UIUtils.createLabelCombo(sfGroup, "Name", SWT.DROP_DOWN);
+            Group sfGroup = UIUtils.createControlGroup(composite, CoreMessages.dialog_connection_edit_wizard_general_filter_save_label, 4, GridData.FILL_HORIZONTAL, 0);
+            namesCombo = UIUtils.createLabelCombo(sfGroup, CoreMessages.dialog_connection_edit_wizard_general_filter_name_label, SWT.DROP_DOWN);
             namesCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
             namesCombo.add(NULL_FILTER_NAME);
@@ -126,14 +126,14 @@ public class EditObjectFilterDialog extends HelpEnabledDialog {
                 }
             });
 
-            Button saveButton = UIUtils.createPushButton(sfGroup, "Save", null);
+            Button saveButton = UIUtils.createPushButton(sfGroup, CoreMessages.dialog_connection_edit_wizard_general_filter_save_button, null);
             saveButton.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
                     saveConfigurations();
                 }
             });
-            Button removeButton = UIUtils.createPushButton(sfGroup, "Remove", null);
+            Button removeButton = UIUtils.createPushButton(sfGroup, CoreMessages.dialog_connection_edit_wizard_general_filter_remove_button, null);
             removeButton.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditShellCommandsDialogPage.java

@@ -45,7 +45,8 @@ import java.util.Map;
  */
 public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWizard> {
 
-    private Text commandText;
+    private static final String CoreMessagesdialog_connection_edit_wizard_shell_cmd_directory_title = null;
+	private Text commandText;
     private Button showProcessCheck;
     private Button waitFinishCheck;
     private Spinner waitFinishTimeoutMs;
@@ -60,7 +61,7 @@ public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWiza
     protected EditShellCommandsDialogPage(DataSourceDescriptor dataSource)
     {
         super(CoreMessages.dialog_connection_events_title);
-        setTitle("Shell Commands");
+        setTitle(CoreMessages.dialog_connection_edit_wizard_shell_cmd);
         setDescription(CoreMessages.dialog_connection_events_title);
         setImageDescriptor(DBeaverIcons.getImageDescriptor(UIIcon.EVENT));
         for (DBPConnectionEventType eventType : DBPConnectionEventType.values()) {
@@ -154,11 +155,11 @@ public class EditShellCommandsDialogPage extends ActiveWizardPage<ConnectionWiza
                 Composite pauseComposite = UIUtils.createPlaceholder(detailsGroup, 2, 5);
                 pauseComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-                pauseAfterExecute = UIUtils.createLabelSpinner(pauseComposite, "Pause after execute (ms)", "Wait for specified amount of milliseconds after process spawn", 0, 0, Integer.MAX_VALUE);
+                pauseAfterExecute = UIUtils.createLabelSpinner(pauseComposite, CoreMessages.dialog_connection_edit_wizard_shell_cmd_pause_label, CoreMessages.dialog_connection_edit_wizard_shell_cmd_pause_tooltip, 0, 0, Integer.MAX_VALUE);
                 pauseAfterExecute.addSelectionListener(eventEditAdapter);
 
-                UIUtils.createControlLabel(pauseComposite, "Working directory");
-                workingDirectory = new TextWithOpenFolder(pauseComposite, "Working directory");
+                UIUtils.createControlLabel(pauseComposite, CoreMessages.dialog_connection_edit_wizard_shell_cmd_directory_label);
+                workingDirectory = new TextWithOpenFolder(pauseComposite, CoreMessagesdialog_connection_edit_wizard_shell_cmd_directory_title);
                 workingDirectory.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
                 workingDirectory.getTextControl().addModifyListener(new ModifyListener() {
                     @Override