diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLResources_ru.properties b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLResources_ru.properties index 3e60400c8ec0a7e892608fdd86f02913f287743a..bf3c5e839a7d5c03952cb1f2985de23f47103fa1 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLResources_ru.properties +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/MySQLResources_ru.properties @@ -15,7 +15,7 @@ edit_command_change_user_action_update_user_record= \u041E\u0431\u043D\u043E\u04 edit_command_grant_privilege_action_grant_privilege=\u041F\u0440\u0435\u0434\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u044E edit_command_grant_privilege_name_revoke_privilege=\u041E\u0442\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u0440\u0438\u0432\u0438\u043B\u0435\u0433\u0438\u044E edit_constraint_manager_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435 -edit_foreign_key_manager_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0432\u043D\u0435\u0448\u043D\u0438\u0439 \u043A\u043B\u044E\u0447 +edit_foreign_key_manager_title=\u0421\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u043A\u043B\u044E\u0447\u0430 edit_index_manager_title=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0438\u043D\u0434\u0435\u043A\u0441 edit_procedure_manager_body=\u0422\u0435\u043B\u043E edit_user_manager_command_create_user=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F diff --git a/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle.properties index 193bbfe17d7a3d33009e643dac5341a9945685ca..8bce0b8e747b40b171cac9317d68ce75a80ca788 100644 --- a/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle.properties +++ b/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle.properties @@ -107,7 +107,7 @@ meta.org.jkiss.dbeaver.model.impl.struct.AbstractProcedure.description.name=Proc meta.org.jkiss.dbeaver.model.impl.struct.AbstractTable.name.name=Table Name meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.name.name=Name meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.table.name=Owner -meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.type.name=Type +meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.constraintType.name=Type meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableIndex.primary.name = Primary meta.org.jkiss.dbeaver.model.impl.struct.AbstractTrigger.name.name=Trigger Name meta.org.jkiss.dbeaver.model.impl.struct.AbstractTrigger.actionTiming.name=Timing diff --git a/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle_ru.properties index d754a0a90cb63a2f45b3be3f11481a18cccb2825..643f1f78603e43f9bba82f41f1db36cf92a44a91 100644 --- a/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle_ru.properties +++ b/plugins/org.jkiss.dbeaver.model/OSGI-INF/l10n/bundle_ru.properties @@ -60,7 +60,7 @@ meta.org.jkiss.dbeaver.model.impl.struct.AbstractProcedure.description.name=\u04 meta.org.jkiss.dbeaver.model.impl.struct.AbstractTable.name.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.name.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.table.name=\u0412\u043B\u0430\u0434\u0435\u043B\u0435\u0446 -meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.type.name=\u0422\u0438\u043F +meta.org.jkiss.dbeaver.model.impl.struct.AbstractTableConstraint.constraintType.name=\u0422\u0438\u043F meta.org.jkiss.dbeaver.model.impl.struct.AbstractTrigger.name.name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 meta.org.jkiss.dbeaver.model.impl.struct.AbstractTrigger.actionTiming.name=\u0422\u0430\u0439\u043C\u0438\u043D\u0433 meta.org.jkiss.dbeaver.model.impl.struct.AbstractTrigger.manipulationType.name=\u0422\u0438\u043F diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTableConstraint.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTableConstraint.java index 58a27f04538b508f9ed0e65cffe808169735f579..c30cf2d1cd80f755915c374308e756129d65338d 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTableConstraint.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/struct/AbstractTableConstraint.java @@ -85,7 +85,7 @@ public abstract class AbstractTableConstraint implements @NotNull @Override - @Property(name = "Type", viewable = true, order = 3) + @Property(viewable = true, order = 3) public DBSEntityConstraintType getConstraintType() { return constraintType; diff --git a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsMessages.java b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsMessages.java index c3e9159b7998e9647f338c69116032a94dec4b10..aeaebe4fbadc9c35231aca34c33bec31cd8ce828 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsMessages.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsMessages.java @@ -38,6 +38,7 @@ public class EditorsMessages extends NLS { public static String dialog_struct_create_sequence_title; public static String dialog_struct_create_sequence_name; public static String dialog_struct_create_sequence_container; + public static String dialog_struct_edit_constrain_label_name; public static String dialog_struct_edit_constrain_label_type; public static String dialog_struct_edit_fk_column_col_type; public static String dialog_struct_edit_fk_column_column; diff --git a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources.properties b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources.properties index 3bce927324278fbeccdce21740f9a6cf5e65963a..1bd927d2ff33479357d898453361e508068689ed 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources.properties +++ b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources.properties @@ -17,6 +17,7 @@ dialog_struct_create_procedure_container = Container dialog_struct_create_sequence_title = Create new Sequence dialog_struct_create_sequence_name = Sequence Name dialog_struct_create_sequence_container = Container +dialog_struct_edit_constrain_label_name=Name dialog_struct_edit_constrain_label_type = Type dialog_struct_edit_fk_column_col_type = Column Type dialog_struct_edit_fk_column_column = Column diff --git a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources_ru.properties b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources_ru.properties index adf313cfe3663903ad698f782775b6c35ac8f0e1..b7c1dc16cc05051cef494ad34d79844720ef92fd 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources_ru.properties +++ b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/internal/EditorsResources_ru.properties @@ -2,6 +2,7 @@ dialog_struct_attribute_edit_page_header_edit_attribute=\u0420\u0435\u0434\u0430 dialog_struct_attribute_edit_page_label_text_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 dialog_struct_attribute_edit_page_label_text_properties=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 dialog_struct_columns_select_column = \u041A\u043E\u043B\u043E\u043D\u043A\u0430 +dialog_struct_columns_type = \u0422\u0438\u043F dialog_struct_columns_select_error_load_columns_message = \u041E\u0448\u0438\u0431\u043A\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u043A\u043E\u043B\u043E\u043D\u043E\u043A \u0442\u0430\u0431\u043B\u0438\u0446\u044B dialog_struct_columns_select_error_load_columns_title = \u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u043A\u043E\u043B\u043E\u043D\u043E\u043A dialog_struct_columns_select_group_columns = \u041A\u043E\u043B\u043E\u043D\u043A\u0438 @@ -16,6 +17,7 @@ dialog_struct_create_procedure_container = \u041A\u043E\u043D\u0442\u0435\u0439\ dialog_struct_create_sequence_title = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C dialog_struct_create_sequence_name = \u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438 dialog_struct_create_sequence_container = \u041A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440 +dialog_struct_edit_constrain_label_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 dialog_struct_edit_constrain_label_type = \u0422\u0438\u043F dialog_struct_edit_fk_column_col_type = \u0422\u0438\u043F \u043A\u043E\u043B\u043E\u043D\u043A\u0438 dialog_struct_edit_fk_column_column = \u041A\u043E\u043B\u043E\u043D\u043A\u0430 diff --git a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/struct/EditConstraintPage.java b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/struct/EditConstraintPage.java index 244249a20e5a0ff8c597817e5999f43aa9f3a505..e2ecea4c79303b99490cd255a33821449716c86c 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/struct/EditConstraintPage.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.base/src/org/jkiss/dbeaver/ui/editors/object/struct/EditConstraintPage.java @@ -142,7 +142,7 @@ public class EditConstraintPage extends AttributesSelectorPage { this.constraintName = DBObjectNameCaseTransformer.transformName(entity.getDataSource(), CommonUtils.escapeIdentifier(entity.getName()) + namePrefix); } - final Text nameText = entity != null ? UIUtils.createLabelText(panel, "Name", constraintName) : null; + final Text nameText = entity != null ? UIUtils.createLabelText(panel, EditorsMessages.dialog_struct_edit_constrain_label_name, constraintName) : null; if (nameText != null) { nameText.addModifyListener(e -> constraintName = nameText.getText()); }