Merge remote-tracking branch 'origin/devel' into devel

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

@@ -824,7 +824,7 @@ editor_file_copy_path = Dateipfad kopieren
 
 editor_file_open_in_explorer = \u00D6ffne Ordner im Explorer
 
-editor_file_rename = Datei umbennen
+editor_file_rename = Datei umbenennen
 
 model_html_read_database_meta_data = Datenbank Metadaten lesen
 

plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLResources_ru.properties

@@ -9,6 +9,7 @@ dialog_connection_port=\u041F\u043E\u0440\u0442
 dialog_connection_test_connection=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 ...
 dialog_connection_user_name=\u0418\u043C\u044F \u043F\u043E\u043B\u044C\u0437-\u043B\u044F
 dialog_connection_database=\u0411\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445
+dialog_connection_local_client=\u041B\u043E\u043A\u0430\u043B. \u043A\u043B\u0438\u0435\u043D\u0442
 edit_catalog_manager_dialog_schema_name=\u0418\u043C\u044F \u0441\u0445\u0435\u043C\u044B
 edit_command_change_user_action_create_new_user=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u043E\u0433\u043E \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
 edit_command_change_user_action_update_user_record= \u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0437\u0430\u043F\u0438\u0441\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreMessages.java

@@ -159,7 +159,13 @@ public class PostgreMessages extends NLS {
 	public static String edit_command_grant_privilege_action_revoke_privilege;
     public static String edit_constraint_page_add_constraint;
 
-	public static String postgre_foreign_key_manager_checkbox_deferrable;
+	public static String dialog_create_push_button_grant_all;
+    public static String dialog_create_push_button_revoke_all;
+    public static String dialog_object_description_text_no_objects;
+    public static String dialog_create_table_column_name_permission;
+    public static String dialog_create_table_column_name_with_garant;
+    public static String dialog_create_table_column_name_with_hierarchy;
+    public static String postgre_foreign_key_manager_checkbox_deferrable;
 	public static String postgre_foreign_key_manager_checkbox_deferred;
 	public static String postgre_foreign_key_manager_header_edit_foreign_key;
 

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources.properties

@@ -140,6 +140,12 @@ dialog_create_role_label_user_role = Is user
 edit_command_grant_privilege_action_grant_privilege = Grant
 edit_command_grant_privilege_action_revoke_privilege = Revoke
 edit_constraint_page_add_constraint=Add constraint
+dialog_create_push_button_grant_all=Grant All
+dialog_create_push_button_revoke_all=Revoke All
+dialog_object_description_text_no_objects=<no objects>
+dialog_create_table_column_name_permission=Permission
+dialog_create_table_column_name_with_garant=With GRANT
+dialog_create_table_column_name_with_hierarchy=With Hierarchy
 postgre_foreign_key_manager_checkbox_deferrable=Deferrable
 postgre_foreign_key_manager_checkbox_deferred=Deferred
 postgre_foreign_key_manager_header_edit_foreign_key=Edit foreign key

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources_ru.properties

@@ -20,7 +20,7 @@ dialog_create_db_title = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0431\u0430
 dialog_create_role_group_general = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
 dialog_create_role_label_role_name = \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
 dialog_create_role_label_user_password = \u041F\u0430\u0440\u043E\u043B\u044C
-dialog_create_role_label_user_role = \u042F\u0432\u043B\u044F\u0435\u0435\u0442\u0441\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C
+dialog_create_role_label_user_role = \u042F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u043C
 dialog_create_role_title = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0440\u043E\u043B\u044C
 # dialog create schema #
 dialog_create_schema_name = \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0441\u0445\u0435\u043C\u044B
@@ -39,6 +39,12 @@ dialog_setting_connection_show_templates_tip = \u041F\u043E\u043A\u0430\u0437\u0
 dialog_setting_connection_switchDatabaseOnExpand = \u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0430\u0442\u044C \u0411\u0414 \u043F\u0440\u0438 \u0434\u043E\u0441\u0442\u0443\u043F\u0435
 dialog_setting_connection_switchDatabaseOnExpand_tip = \u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0430\u0442\u044C \u0430\u043A\u0442\u0438\u0432\u043D\u0443\u044E \u0411\u0414, \u0435\u0441\u043B\u0438 \u0438\u0434\u0451\u0442 \u0434\u043E\u0441\u0442\u0443\u043F \u043A \u043E\u0431\u044A\u0435\u043A\u0442\u0443 \u0432 \u0438\u043D\u043E\u0439 \u0411\u0414 (\u043D\u0430\u043F\u0440. \u043A \u0441\u0445\u0435\u043C\u0435)
 dialog_setting_connection_user = \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C
+dialog_create_push_button_grant_all=\u0412\u044B\u0434\u0430\u0442\u044C \u0432\u0441\u0435 \u043F\u0440\u0430\u0432\u0430
+dialog_create_push_button_revoke_all=\u041E\u0442\u043E\u0437\u0432\u0430\u0442\u044C \u0432\u0441\u0435 \u043F\u0440\u0430\u0432\u0430
+dialog_object_description_text_no_objects=<\u043D\u0435\u0442 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432>
+dialog_create_table_column_name_permission=\u041F\u0440\u0430\u0432\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430
+dialog_create_table_column_name_with_garant=\u0421 \u0432\u044B\u0434\u0430\u0447\u0435\u0439 \u043F\u0440\u0430\u0432
+dialog_create_table_column_name_with_hierarchy=\u0421 \u0438\u0435\u0440\u0430\u0440\u0445\u0438\u0435\u0439
 edit_command_grant_privilege_action_grant_privilege = \u0412\u044B\u0434\u0430\u0447\u0430 \u043F\u0440\u0430\u0432
 edit_command_grant_privilege_action_revoke_privilege = \u041E\u0442\u0437\u044B\u0432 \u043F\u0440\u0430\u0432
 edit_constraint_page_add_constraint=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u043D\u0438\u0435

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/ui/editors/PostgresRolePrivilegesEditor.java

@@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbenchSite;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.DBeaverUI;
+import org.jkiss.dbeaver.ext.postgresql.PostgreMessages;
 import org.jkiss.dbeaver.ext.postgresql.edit.PostgreCommandGrantPrivilege;
 import org.jkiss.dbeaver.ext.postgresql.model.*;
 import org.jkiss.dbeaver.model.DBPEvaluationContext;
@@ -155,9 +156,9 @@ public class PostgresRolePrivilegesEditor extends AbstractDatabaseObjectEditor<P
             permissionTable.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
             permissionTable.setHeaderVisible(true);
             permissionTable.setLinesVisible(true);
-            UIUtils.createTableColumn(permissionTable, SWT.LEFT, "Permission");
-            UIUtils.createTableColumn(permissionTable, SWT.CENTER, "With GRANT");
-            UIUtils.createTableColumn(permissionTable, SWT.CENTER, "With Hierarchy");
+            UIUtils.createTableColumn(permissionTable, SWT.LEFT, PostgreMessages.dialog_create_table_column_name_permission);
+            UIUtils.createTableColumn(permissionTable, SWT.CENTER, PostgreMessages.dialog_create_table_column_name_with_garant);
+            UIUtils.createTableColumn(permissionTable, SWT.CENTER, PostgreMessages.dialog_create_table_column_name_with_hierarchy);
             permissionTable.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
@@ -188,7 +189,7 @@ public class PostgresRolePrivilegesEditor extends AbstractDatabaseObjectEditor<P
             buttonPanel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
             buttonPanel.setLayout(new RowLayout());
 
-            UIUtils.createPushButton(buttonPanel, "Grant All", null, new SelectionAdapter() {
+            UIUtils.createPushButton(buttonPanel, PostgreMessages.dialog_create_push_button_grant_all, null, new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
                     boolean hadNonChecked = false;
@@ -199,7 +200,7 @@ public class PostgresRolePrivilegesEditor extends AbstractDatabaseObjectEditor<P
                     if (hadNonChecked) updateCurrentPrivileges(true, null);
                 }
             });
-            UIUtils.createPushButton(buttonPanel, "Revoke All", null, new SelectionAdapter() {
+            UIUtils.createPushButton(buttonPanel, PostgreMessages.dialog_create_push_button_revoke_all, null, new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
                     boolean hadChecked = false;
@@ -357,7 +358,7 @@ public class PostgresRolePrivilegesEditor extends AbstractDatabaseObjectEditor<P
         }
         boolean editEnabled;
         if (hasBadObjects) {
-            objectDescriptionText.setText("<no objects>");
+            objectDescriptionText.setText(PostgreMessages.dialog_object_description_text_no_objects);
 
             this.currentPermissions = null;
             this.currentObjects = null;

plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHUIMessages_ru.properties

@@ -15,5 +15,5 @@ model_ssh_configurator_group_advanced = \u0414\u043E\u043F\u043E\u043B\u043D\u04
 model_ssh_configurator_label_implementation = \u0420\u0435\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044F
 model_ssh_configurator_label_local_port = \u041B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439 \u043F\u043E\u0440\u0442
 model_ssh_configurator_label_local_port_description = \u041B\u043E\u043A\u0430\u043B\u044C\u043D\u044B\u0439 \u043F\u043E\u0440\u0442 \u0434\u043B\u044F \u0442\u0443\u043D\u043D\u0435\u043B\u044F. \u0415\u0441\u043B\u0438 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043B\u0435\u043D\u043E \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 <=0, \u0442\u043E \u0431\u0443\u0434\u0435\u0442 \u043F\u043E\u043B\u0443\u0447\u0435\u043D \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u044B\u0439 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u0439 \u043F\u043E\u0440\u0442 (>10000)
-model_ssh_configurator_label_tunnel_timeout = \u0412\u0440\u0435\u043C\u044F \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0442\u0443\u043D\u043D\u0435\u043B\u044F (\u043C\u0441)
+model_ssh_configurator_label_tunnel_timeout = \u0422\u0430\u0439\u043C-\u0430\u0443\u0442 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u043A \u0442\u0443\u043D\u043D\u0435\u043B\u044E (\u043C\u0441)
 model_ssh_configurator_button_test_tunnel = \u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F \u0442\u0435\u0441\u0442\u043E\u0432\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044F

plugins/org.jkiss.dbeaver.ui.editors.sql/OSGI-INF/l10n/bundle_ru.properties

@@ -54,7 +54,7 @@ command.org.jkiss.dbeaver.ui.editors.sql.run.statementNew.name              = \u
 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.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.show.log.description               = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0436\u0443\u0440\u043D\u0430\u043B \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
-command.org.jkiss.dbeaver.ui.editors.sql.show.log.name                      = \u0416\u0443\u0440\u043D\u0430\u043B \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
+command.org.jkiss.dbeaver.ui.editors.sql.show.log.name                      = \u041B\u043E\u0433 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
 command.org.jkiss.dbeaver.ui.editors.sql.show.output.description            = \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043A\u043E\u043D\u0441\u043E\u043B\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
 command.org.jkiss.dbeaver.ui.editors.sql.show.output.name                   = \u041A\u043E\u043D\u0441\u043E\u043B\u044C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439
 command.org.jkiss.dbeaver.ui.editors.sql.switch.panel.description           = \u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0430\u043A\u0442\u0438\u0432\u043D\u0443\u044E \u043F\u0430\u043D\u0435\u043B\u044C SQL \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/internal/SQLEditorMessages_ru.properties

@@ -32,7 +32,7 @@ editors_sql_error_cant_obtain_session=\u041D\u0435\u0432\u043E\u0437\u043C\u043E
 editors_sql_error_execution_plan_message=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043F\u043B\u0430\u043D \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u0430.
 editors_sql_error_execution_plan_title=\u041F\u043B\u0430\u043D \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u0430
 editors_sql_execution_log=\u041B\u043E\u0433 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
-editors_sql_execution_log_tip = \u0416\u0443\u0440\u043D\u0430\u043B \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F SQL-\u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
+editors_sql_execution_log_tip = \u041B\u043E\u0433 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F SQL-\u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
 editors_sql_explain_plan=\u041F\u043B\u0430\u043D \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F
 editors_sql_output=\u0412\u044B\u0432\u043E\u0434
 editors_sql_output_tip = \u0416\u0443\u0440\u043D\u0430\u043B \u0432\u044B\u0432\u043E\u0434\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u0430\u0437\u044B \u0434\u0430\u043D\u043D\u044B\u0445