dbeaver-corp/dbeaver-i18n#14Fixed bugs

22f6a08b · RiedNyko · c2963fc8 · 22f6a08b · 22f6a08b · 22f6a08b
4 changed file
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleMessages.java
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleMessages.java
@@ -103,7 +103,6 @@ public class OracleMessages extends NLS {
 	public static String dialog_controlgroup_content;
 	public static String edit_create_checkbox_hide_empty_schemas;
 	public static String edit_create_checkbox_hide_empty_schemas_tool_tip_text;
-	public static String edit_create_checkbox_hide_empty_schemas_default_line_separator;
 	public static String edit_create_checkbox_content_group_show;
 	public static String edit_create_checkbox_content_group_show_discription;
 	public static String edit_create_checkbox_content_group_use;
@@ -111,5 +110,5 @@ public class OracleMessages extends NLS {
 	public static String dialog_controlgroup_performance;
 	public static String edit_create_checkbox_group_use_rule;
 	public static String edit_create_checkbox_adds_rule_tool_tip_text;
-	public static String edit_create_checkbox_significantly_increases_performance_tool_tip_text;
+
 }
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleResources.properties
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleResources.properties
@@ -70,13 +70,11 @@ edit_label_combo_territory_tool_tip_text = Session territory
 edit_label_text_date_format = NLS Date Format
 dialog_controlgroup_content = Content
 edit_create_checkbox_hide_empty_schemas = Hide empty schemas
-edit_create_checkbox_hide_empty_schemas_tool_tip_text = Check existence of objects within schema and do not show empty schemas in tree.
-edit_create_checkbox_hide_empty_schemas_default_line_separator = Enabled by default but it may cause performance problems on databases with very big number of objects.
+edit_create_checkbox_hide_empty_schemas_tool_tip_text = Check existence of objects within schema and do not show empty schemas in tree.\nEnabled by default but it may cause performance problems on databases with very big number of objects.
 edit_create_checkbox_content_group_show = Always show DBA objects
 edit_create_checkbox_content_group_show_discription = Always shows DBA-related metadata objects in tree even if user do not has DBA role.
 edit_create_checkbox_content_group_use = Always use DBA_* views
 edit_create_checkbox_content_group_use_discription = Use DBA_* views instead of ALL_* views wherever it is possible
 dialog_controlgroup_performance = Performance
 edit_create_checkbox_group_use_rule = Use RULE hint for system catalog queries.
-edit_create_checkbox_adds_rule_tool_tip_text = Adds RULE hint for some system catalog queries (like columns and constraints reading).
-edit_create_checkbox_significantly_increases_performance_tool_tip_text = It significantly increases performance on some Oracle databases (and decreases on others).
+edit_create_checkbox_adds_rule_tool_tip_text = Adds RULE hint for some system catalog queries (like columns and constraints reading).\nIt significantly increases performance on some Oracle databases (and decreases on others).
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleResources_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/OracleResources_ru.properties
@@ -70,13 +70,12 @@ edit_label_combo_territory_tool_tip_text = \u0422\u0435\u0440\u0440\u0438\u0442\
 edit_label_text_date_format = \u0424\u043E\u0440\u043C\u0430\u0442 \u0434\u0430\u0442\u044B NLS
 dialog_controlgroup_content = \u0421\u043E\u0434\u0435\u0440\u0436\u0430\u043D\u0438\u0435
 edit_create_checkbox_hide_empty_schemas = \u0421\u043A\u0440\u044B\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u0435 \u0441\u0445\u0435\u043C\u044B
-edit_create_checkbox_hide_empty_schemas_tool_tip_text = \u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043D\u0430\u043B\u0438\u0447\u0438\u0435 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0432 \u0441\u0445\u0435\u043C\u0435 \u0438 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0439\u0442\u0435 \u043F\u0443\u0441\u0442\u044B\u0435 \u0441\u0445\u0435\u043C\u044B \u0432 \u0434\u0435\u0440\u0435\u0432\u0435.
-edit_create_checkbox_hide_empty_schemas_default_line_separator = \u0412\u043A\u043B\u044E\u0447\u0435\u043D\u043E \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, \u043D\u043E \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B \u0441 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C\u044E \u0432 \u0431\u0430\u0437\u0430\u0445 \u0434\u0430\u043D\u043D\u044B\u0445 \u0441 \u043E\u0447\u0435\u043D\u044C \u0431\u043E\u043B\u044C\u0448\u0438\u043C \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E\u043C \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432.
+edit_create_checkbox_hide_empty_schemas_tool_tip_text = \u041F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u043D\u0430\u043B\u0438\u0447\u0438\u0435 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0432 \u0441\u0445\u0435\u043C\u0435 \u0438 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043F\u0443\u0441\u0442\u044B\u0435 \u0441\u0445\u0435\u043C\u044B \u0432 \u0434\u0435\u0440\u0435\u0432\u0435.\n\u0412\u043A\u043B\u044E\u0447\u0435\u043D\u043E \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, \u043D\u043E \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B \u0441 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C\u044E \u0432 \u0431\u0430\u0437\u0430\u0445 \u0434\u0430\u043D\u043D\u044B\u0445 \u0441 \u043E\u0447\u0435\u043D\u044C \u0431\u043E\u043B\u044C\u0448\u0438\u043C \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E\u043C \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432.
 edit_create_checkbox_content_group_show = \u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442\u044B DBA
 edit_create_checkbox_content_group_show_discription = \u0412\u0441\u0435\u0433\u0434\u0430 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0435 \u0441 DBA \u043E\u0431\u044A\u0435\u043A\u0442\u044B \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0445 \u0432 \u0434\u0435\u0440\u0435\u0432\u0435, \u0434\u0430\u0436\u0435 \u0435\u0441\u043B\u0438 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u043D\u0435 \u0438\u043C\u0435\u0435\u0442 \u0440\u043E\u043B\u0438 DBA.
-edit_create_checkbox_content_group_use = \u0412\u0441\u0435\u0433\u0434\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432\u0438\u0434 DBA_*
-edit_create_checkbox_content_group_use_discription = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0432\u0438\u0434 DBA_* \u0432\u043C\u0435\u0441\u0442\u043E ALL_*, \u0432\u0435\u0437\u0434\u0435 \u0433\u0434\u0435 \u044D\u0442\u043E \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E
+edit_create_checkbox_content_group_use = \u0412\u0441\u0435\u0433\u0434\u0430 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432\u0438\u0434 DBA_*.
+edit_create_checkbox_content_group_use_discription = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0432\u0438\u0434 DBA_* \u0432\u043C\u0435\u0441\u0442\u043E ALL_* \u0432\u0435\u0437\u0434\u0435, \u0433\u0434\u0435 \u044D\u0442\u043E \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E.
 dialog_controlgroup_performance = \u041F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C
 edit_create_checkbox_group_use_rule = \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0443 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u0434\u043B\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430.
-edit_create_checkbox_adds_rule_tool_tip_text = \u0414\u043E\u0431\u0430\u0432\u043B\u044F\u0435\u0442 \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0443 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u0434\u043B\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430 (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0447\u0442\u0435\u043D\u0438\u0435 \u0441\u0442\u043E\u043B\u0431\u0446\u043E\u0432 \u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0439).
-edit_create_checkbox_significantly_increases_performance_tool_tip_text = \u042D\u0442\u043E \u0437\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u043F\u043E\u0432\u044B\u0448\u0430\u0435\u0442 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445 Oracle (\u0438 \u0441\u043D\u0438\u0436\u0430\u0435\u0442 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u0434\u0440\u0443\u0433\u0438\u0445).
+edit_create_checkbox_adds_rule_tool_tip_text = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u043E\u0434\u0441\u043A\u0430\u0437\u043A\u0443 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u0434\u043B\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u043E\u0433\u043E \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430 (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0447\u0442\u0435\u043D\u0438\u0435 \u0441\u0442\u043E\u043B\u0431\u0446\u043E\u0432 \u0438 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0439).\n\u0417\u043D\u0430\u0447\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\u0442 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u0431\u0430\u0437 \u0434\u0430\u043D\u043D\u044B\u0445 Oracle (\u0438 \u0443\u043C\u0435\u043D\u044C\u0448\u0430\u0435\u0442 \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u0434\u0440\u0443\u0433\u0438\u0445).
+
--- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/views/OracleConnectionExtraPage.java
@@ -98,8 +98,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract

            hideEmptySchemasCheckbox = UIUtils.createCheckbox(contentGroup, OracleMessages.edit_create_checkbox_hide_empty_schemas, false);
            hideEmptySchemasCheckbox.setToolTipText(
-            		OracleMessages.edit_create_checkbox_hide_empty_schemas_tool_tip_text + GeneralUtils.getDefaultLineSeparator() +
-            		OracleMessages.edit_create_checkbox_hide_empty_schemas_default_line_separator);
+            		OracleMessages.edit_create_checkbox_hide_empty_schemas_tool_tip_text);

            showDBAAlwaysCheckbox = UIUtils.createCheckbox(contentGroup, OracleMessages.edit_create_checkbox_content_group_show, OracleMessages.edit_create_checkbox_content_group_show_discription, false, 1);
            useDBAViewsCheckbox = UIUtils.createCheckbox(contentGroup, OracleMessages.edit_create_checkbox_content_group_use,  OracleMessages.edit_create_checkbox_content_group_use_discription, false, 1);
@@ -110,8 +109,7 @@ public class OracleConnectionExtraPage extends ConnectionPageAbstract

            useRuleHint = UIUtils.createCheckbox(contentGroup, OracleMessages.edit_create_checkbox_group_use_rule, true);
            useRuleHint.setToolTipText(
-            		OracleMessages.edit_create_checkbox_adds_rule_tool_tip_text + GeneralUtils.getDefaultLineSeparator() +
-            		OracleMessages.edit_create_checkbox_significantly_increases_performance_tool_tip_text);
+            		OracleMessages.edit_create_checkbox_adds_rule_tool_tip_text);
        }

        setControl(cfgGroup);