dbeaver-corp/dbeaver-i18n#38

Former-commit-id: bff1dc7a

plugins/org.jkiss.dbeaver.core.application/OSGI-INF/l10n/bundle_ru.properties

@@ -27,6 +27,8 @@ pref.page.name.sql.editor             = \u0420\u0435\u0434\u0430\u043A\u0442\u04
 pref.page.name.sql.execute            = \u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432
 pref.page.name.sql.format             = \u0424\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 pref.page.name.entity.editor          = \u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432
+pref.page.name.sql.completion         = \u0414\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 SQL
+pref.page.name.sql.resources          = \u0421\u043A\u0440\u0438\u043F\u0442\u044B
 
 productName = DBeaver
 

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

@@ -29,6 +29,12 @@ sql.convert.label.keep.formatting.discription = Keeps original formatting (white
 sql.convert.label.line.delimiter.name = Line delimiter
 sql.convert.label.line.delimiter.discription = Delimiter for source code lines. Usually \\n or space
 sql.convert.label.line.delimiter.delphi.discription = Delimiter for source code lines. Usually #13#10 or space
+sql.formatter.combo.default = Default formatter
+sql.formatter.combo.default_tip = Default SQL formatter
+sql.formatter.combo.compact = Compact formatter
+sql.formatter.combo.compact_tip = Compact SQL formatter. Similar to default formatter but with more compact output
+sql.formatter.combo.external = External formatter
+sql.formatter.combo.external_tip = External formatter. Uses configurable command-line executable to format SQL queries
 
 column.org.jkiss.dbeaver.ui.editors.columns.script.position.name = Script position
 

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

@@ -86,3 +86,10 @@ sql.convert.label.keep.formatting.discription                               = \u
 sql.convert.label.line.delimiter.name                                       = \u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0441\u0442\u0440\u043E\u043A
 sql.convert.label.line.delimiter.discription                                = \u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0441\u0442\u0440\u043E\u043A \u0438\u0441\u0445\u043E\u0434\u043D\u043E\u0433\u043E \u043A\u043E\u0434\u0430. \u041E\u0431\u044B\u0447\u043D\u043E \\n \u0438\u043B\u0438 \u043F\u0440\u043E\u0431\u0435\u043B 
 sql.convert.label.line.delimiter.delphi.discription                         = \u0420\u0430\u0437\u0434\u0435\u043B\u0438\u0442\u0435\u043B\u044C \u0441\u0442\u0440\u043E\u043A \u0438\u0441\u0445\u043E\u0434\u043D\u043E\u0433\u043E \u043A\u043E\u0434\u0430. \u041E\u0431\u044B\u0447\u043D\u043E \#13#10 \u0438\u043B\u0438 \u043F\u0440\u043E\u0431\u0435\u043B 
+
+sql.formatter.combo.default = \u0424\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
+sql.formatter.combo.default_tip = SQL \u0444\u043E\u0440\u043C\u0430\u0442\u0435\u0440 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
+sql.formatter.combo.compact = \u041A\u043E\u043C\u043F\u0430\u043A\u0442\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442\u0435\u0440
+sql.formatter.combo.compact_tip = \u041A\u043E\u043C\u043F\u0430\u043A\u0442\u043D\u044B\u0439 SQL \u0444\u043E\u0440\u043C\u0430\u0442\u0435\u0440. \u0410\u043D\u0430\u043B\u043E\u0433\u0438\u0447\u043D\u043E \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044E \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, \u043D\u043E \u0441 \u0431\u043E\u043B\u0435\u0435 \u043A\u043E\u043C\u043F\u0430\u043A\u0442\u043D\u044B\u043C \u0432\u044B\u0445\u043E\u0434\u043E\u043C
+sql.formatter.combo.external = \u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u0444\u043E\u0440\u043C\u0430\u0442\u0435\u0440
+sql.formatter.combo.external_tip = \u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u0444\u043E\u0440\u043C\u0430\u0442\u0435\u0440. \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 \u043D\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043C\u044B\u0439 \u0438\u0441\u043F\u043E\u043B\u043D\u044F\u0435\u043C\u044B\u0439 \u0444\u0430\u0439\u043B \u043A\u043E\u043C\u0430\u043D\u0434\u043D\u043E\u0439 \u0441\u0442\u0440\u043E\u043A\u0438 \u0434\u043B\u044F \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432 SQL

plugins/org.jkiss.dbeaver.ui.editors.sql/plugin.xml

@@ -40,9 +40,9 @@
     </extension>
 
     <extension point="org.jkiss.dbeaver.sqlFormatter">
-        <formatter id="default" class="org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.tokenized.SQLTokenizedFormatterConfigurationPage" label="Default formatter" description="Default SQL formatter"/>
-        <formatter id="compact" class="org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterCompact" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.tokenized.SQLTokenizedFormatterConfigurationPage" label="Compact formatter" description="Compact SQL formatter. Similar to default formatter but with more compact output"/>
-        <formatter id="external" class="org.jkiss.dbeaver.model.sql.format.external.SQLFormatterExternal" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.SQLExternalFormatterConfigurationPage" label="External formatter" description="External formatter. Uses configurable command-line executable to format SQL queries"/>
+        <formatter id="default" class="org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterTokenized" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.tokenized.SQLTokenizedFormatterConfigurationPage" label="%sql.formatter.combo.default" description="%sql.formatter.combo.default_tip"/>
+        <formatter id="compact" class="org.jkiss.dbeaver.model.sql.format.tokenized.SQLFormatterCompact" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.tokenized.SQLTokenizedFormatterConfigurationPage" label="%sql.formatter.combo.compact" description="%sql.formatter.combo.compact_tip"/>
+        <formatter id="external" class="org.jkiss.dbeaver.model.sql.format.external.SQLFormatterExternal" configurerClass="org.jkiss.dbeaver.ui.editors.sql.format.SQLExternalFormatterConfigurationPage" label="%sql.formatter.combo.external" description="%sql.formatter.combo.external_tip"/>
     </extension>
 
     <extension point="org.jkiss.dbeaver.sqlCommand">

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java

@@ -2186,9 +2186,9 @@ public class SQLEditor extends SQLEditorBase implements
     }
 
     public enum ResultSetOrientation {
-        HORIZONTAL(SWT.VERTICAL, "Horizontal", "Results are below the editor", true),
-        VERTICAL(SWT.HORIZONTAL, "Vertical", "Results are to the right from editor", true),
-        DETACHED(SWT.VERTICAL, "Detached", "Results are in separate view", false);
+        HORIZONTAL(SWT.VERTICAL, SQLEditorMessages.sql_editor_result_set_orientation_horizontal, SQLEditorMessages.sql_editor_result_set_orientation_horizontal_tip, true),
+        VERTICAL(SWT.HORIZONTAL, SQLEditorMessages.sql_editor_result_set_orientation_vertical, SQLEditorMessages.sql_editor_result_set_orientation_vertical_tip, true),
+        DETACHED(SWT.VERTICAL, SQLEditorMessages.sql_editor_result_set_orientation_detached, SQLEditorMessages.sql_editor_result_set_orientation_detached_tip, false);
 
         private final int sashOrientation;
         private final String label;

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/internal/SQLEditorMessages.java

@@ -270,7 +270,12 @@ public class SQLEditorMessages extends NLS {
     public static String controls_querylog_transaction;
     public static String sql_editor_menu_choose_format;
     public static String sql_editor_panel_format;
-    
+    public static String sql_editor_result_set_orientation_detached;
+	public static String sql_editor_result_set_orientation_detached_tip;
+	public static String sql_editor_result_set_orientation_horizontal;
+	public static String sql_editor_result_set_orientation_horizontal_tip;
+	public static String sql_editor_result_set_orientation_vertical;
+	public static String sql_editor_result_set_orientation_vertical_tip;
     public static String sql_script_binding_type_radio_button_connection_name;
 	public static String sql_script_binding_type_radio_button_connection_parameters;
 	public static String sql_script_binding_type_radio_button_connection_unique;

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

@@ -252,3 +252,10 @@ sql_script_binding_type_radio_button_connection_name=Connection name
 sql_script_binding_type_radio_button_connection_parameters=Connection parameters (name1=value1;name2=value2;...)
 sql_script_binding_type_radio_button_connection_unique=Connection unique ID
 sql_script_binding_type_radio_button_connection_url=Connection URL (jdbc:dbms://host:port/...)
+
+sql_editor_result_set_orientation_detached=Detached
+sql_editor_result_set_orientation_detached_tip=Results are in separate view
+sql_editor_result_set_orientation_horizontal=Horizontal
+sql_editor_result_set_orientation_horizontal_tip=Results are below the editor
+sql_editor_result_set_orientation_vertical=Vertical
+sql_editor_result_set_orientation_vertical_tip=Results are to the right from editor

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

@@ -147,12 +147,12 @@ pref_page_sql_editor_label_results_orientation = \u041E\u0440\u0438\u0435\u043D\
 pref_page_sql_editor_label_results_orientation_tip = \u041E\u0440\u0438\u0435\u043D\u0442\u0430\u0446\u0438\u044F \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u043E\u0432 \u0432 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0435 SQL
 pref_page_sql_editor_link_text_editor = \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u043E\u0433\u043E \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430
 #SQLExecute
-pref_page_sql_editor_label_sql_timeout_tip = Query execute timeout (in seconds). 0 means no timeout
-pref_page_sql_editor_enable_parameters_in_ddl = Enable parameters in DDL
-pref_page_sql_editor_enable_parameters_in_ddl_tip = Usually DDL (like CREATE PROCEDURE) don't use input query parameters but may contain complex logic/scripting.\nThis may conflict with parameters prefix.\nSo it makes sense to disable parameters parsing for DDL queries.
-pref_page_sql_editor_enable_variables = Enable variables
-pref_page_sql_editor_enable_variables_tip = Enable variables in SQL scripts.\nVariable is a special mark ${VAR_NAME} which will be replaced with user input before query execution
-pref_page_sql_editor_checkbox_create_script_folders = Create script folders
+pref_page_sql_editor_label_sql_timeout_tip = \u0412\u0440\u0435\u043C\u044F \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0437\u0430\u043F\u0440\u043E\u0441\u0430 (\u0432 \u0441\u0435\u043A\u0443\u043D\u0434\u0430\u0445). 0 \u043E\u0437\u043D\u0430\u0447\u0430\u0435\u0442 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435 \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F
+pref_page_sql_editor_enable_parameters_in_ddl = \u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0432 DDL
+pref_page_sql_editor_enable_parameters_in_ddl_tip = \u041E\u0431\u044B\u0447\u043D\u043E DDL (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, CREATE PROCEDURE) \u043D\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 \u0432\u0445\u043E\u0434\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0437\u0430\u043F\u0440\u043E\u0441\u0430, \u043D\u043E \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0441\u043B\u043E\u0436\u043D\u0443\u044E \u043B\u043E\u0433\u0438\u043A\u0443/\u0441\u0446\u0435\u043D\u0430\u0440\u0438\u0438.\\u043F\u044D\u0442\u043E \u043C\u043E\u0436\u0435\u0442 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u043E\u0432\u0430\u0442\u044C \u0441 \u043F\u0440\u0435\u0444\u0438\u043A\u0441\u043E\u043C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432.\n\u041F\u043E\u044D\u0442\u043E\u043C\u0443 \u0438\u043C\u0435\u0435\u0442 \u0441\u043C\u044B\u0441\u043B \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0430\u043D\u0430\u043B\u0438\u0437 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432 \u0434\u043B\u044F DDL-\u0437\u0430\u043F\u0440\u043E\u0441\u043E\u0432.
+pref_page_sql_editor_enable_variables = \u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435
+pref_page_sql_editor_enable_variables_tip = \u0412\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0445 \u0432 \u0441\u043A\u0440\u0438\u043F\u0442\u0430\u0445 SQL.\n\u041F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F - \u044D\u0442\u043E \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u0430\u044F \u043C\u0435\u0442\u043A\u0430 ${VAR_NAME}, \u043A\u043E\u0442\u043E\u0440\u0430\u044F \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u043C\u0435\u043D\u0435\u043D\u0430 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u043C \u0432\u0432\u043E\u0434\u043E\u043C \u043F\u0435\u0440\u0435\u0434 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435\u043C \u0437\u0430\u043F\u0440\u043E\u0441\u0430
+pref_page_sql_editor_checkbox_create_script_folders = \u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0438 \u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0432
 
 #SQLFormat
 pref_page_sql_format_group_auto_close = \u0410\u0432\u0442\u043E-\u0434\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435
@@ -243,3 +243,9 @@ sql_script_binding_type_radio_button_connection_name=\u0418\u043C\u044F \u0441\u
 sql_script_binding_type_radio_button_connection_parameters=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0441\u043E\u0434\u0438\u043D\u0435\u043D\u0438\u044F (name1=value1;name2=value2;...)
 sql_script_binding_type_radio_button_connection_unique=\u0423\u043D\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u0439 ID \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
 sql_script_binding_type_radio_button_connection_url=URL-\u0430\u0434\u0440\u0435\u0441 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F  (jdbc:dbms://host:port/...)
+sql_editor_result_set_orientation_horizontal=\u0413\u043E\u0440\u0438\u0437\u043E\u043D\u0442\u0430\u043B\u044C\u043D\u044B\u0439
+sql_editor_result_set_orientation_horizontal_tip=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u043D\u0438\u0436\u0435 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430
+sql_editor_result_set_orientation_detached=\u041E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\u0439
+sql_editor_result_set_orientation_detached_tip=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u0432 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u043C \u043E\u043A\u043D\u0435
+sql_editor_result_set_orientation_vertical=\u0412\u0435\u0440\u0442\u0438\u043A\u0430\u043B\u044C\u043D\u044B\u0439
+sql_editor_result_set_orientation_vertical_tip=\u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u044B \u0441\u043F\u0440\u0430\u0432\u0430 \u043E\u0442 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430