From c57622de8e619319f4f297d1c096f0750da8b056 Mon Sep 17 00:00:00 2001 From: RiedNyko Date: Thu, 7 Feb 2019 14:18:09 +0300 Subject: [PATCH] dbeaver-corp/dbeaver-i18n#117 Former-commit-id: 45a15e42196c8994d22003ccf59c26b96ede48fc --- .../OSGI-INF/l10n/bundle_ru.properties | 4 ++++ .../org/jkiss/dbeaver/ext/postgresql/PostgreMessages.java | 4 ++++ .../dbeaver/ext/postgresql/PostgresResources.properties | 3 +++ .../dbeaver/ext/postgresql/PostgresResources_ru.properties | 2 ++ .../ext/postgresql/edit/PostgreForeignKeyManager.java | 7 ++++--- .../dbeaver/model/messages/ModelResources_ru.properties | 5 +++++ .../ui/editors/internal/EditorsResources_ru.properties | 4 ++-- 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties index 95d025dc2e..e376fd18db 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/OSGI-INF/l10n/bundle_ru.properties @@ -302,6 +302,10 @@ meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableForeignKey.updateRule.na meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableForeignKey.updateRule.description= meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableForeignKeyColumn.referencedColumn.name=\u0421\u0441\u044B\u043B\u043A\u0430 \u043D\u0430 \u043A\u043E\u043B\u043E\u043D\u043A\u0443 meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableForeignKeyColumn.referencedColumn.description=Referenced Column +meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableForeignKey.matchType.name=\u0422\u0438\u043F \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u044F +meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableForeignKey.matchType.description=MATCH FULL \u043D\u0435 \u043F\u043E\u0437\u0432\u043E\u043B\u0438\u0442 \u043E\u0434\u043D\u043E\u0439 \u043A\u043E\u043B\u043E\u043D\u043A\u0435 \u043C\u043D\u043E\u0433\u043E\u043A\u043E\u043B\u043E\u043D\u043E\u0447\u043D\u043E\u0433\u043E \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u043A\u043B\u044E\u0447\u0430 \u0431\u044B\u0442\u044C null, \u0435\u0441\u043B\u0438 \u0432\u0441\u0435 \u043A\u043E\u043B\u043E\u043D\u043A\u0438 \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u043A\u043B\u044E\u0447\u0430 \u043D\u0435 \u044F\u0432\u043B\u044F\u044E\u0442\u0441\u044F null.\nMATCH SIMPLE \u043F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u043C \u043A\u043E\u043B\u043E\u043D\u043A\u0430\u043C \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u043A\u043B\u044E\u0447\u0430 \u0431\u044B\u0442\u044C null, \u0432 \u0442\u043E \u0432\u0440\u0435\u043C\u044F \u043A\u0430\u043A \u0434\u0440\u0443\u0433\u0438\u0435 \u0447\u0430\u0441\u0442\u0438 \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u043A\u043B\u044E\u0447\u0430 \u043D\u0435 \u044F\u0432\u043B\u044F\u044E\u0442\u0441\u044F null. +meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableConstraintBase.description.name=\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 +meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableConstraintBase.description.description=\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u044F meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableInheritance.associatedEntity.name=\u0421\u0432\u044F\u0437\u0430\u043D\u043D\u0430\u044F \u0441\u0443\u0449\u043D\u043E\u0441\u0442\u044C meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableInheritance.associatedEntity.description= meta.org.jkiss.dbeaver.ext.postgresql.model.PostgreTableInheritance.sequenceNum.name=\u0417\u043D\u0430\u0447\u0435\u043D\u0438\u0435 diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreMessages.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreMessages.java index f74c293935..df239ea623 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreMessages.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreMessages.java @@ -158,6 +158,10 @@ public class PostgreMessages extends NLS { public static String edit_command_grant_privilege_action_grant_privilege; public static String edit_command_grant_privilege_action_revoke_privilege; + 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; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, PostgreMessages.class); diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources.properties b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources.properties index 50e3227708..729599818b 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources.properties +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources.properties @@ -139,3 +139,6 @@ dialog_create_role_label_user_role = Is user # Permissions edit_command_grant_privilege_action_grant_privilege = Grant edit_command_grant_privilege_action_revoke_privilege = Revoke +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 diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources_ru.properties b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources_ru.properties index 571c345830..0851d9cec4 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources_ru.properties +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgresResources_ru.properties @@ -15,3 +15,5 @@ dialog_setting_connection_user = \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u043 dialog_create_schema_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0441\u0445\u0435\u043C\u044B dialog_create_schema_owner=\u0412\u043B\u0430\u0434\u0435\u043B\u0435\u0446 dialog_create_schema_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0441\u0445\u0435\u043C\u0443 + +postgre_foreign_key_manager_header_edit_foreign_key=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0432\u043D\u0435\u0448\u043D\u0438\u0439 \u043A\u043B\u044E\u0447 diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreForeignKeyManager.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreForeignKeyManager.java index 1e763963a2..177743877f 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreForeignKeyManager.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreForeignKeyManager.java @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.jkiss.code.Nullable; import org.jkiss.dbeaver.DBException; +import org.jkiss.dbeaver.ext.postgresql.PostgreMessages; import org.jkiss.dbeaver.ext.postgresql.model.*; import org.jkiss.dbeaver.model.DBConstants; import org.jkiss.dbeaver.model.DBPScriptObject; @@ -67,7 +68,7 @@ public class PostgreForeignKeyManager extends SQLForeignKeyManager