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

plugins/org.jkiss.dbeaver.tasks.ui/OSGI-INF/l10n/bundle_de.properties

-extension-point.org.jkiss.dbeaver.tools.name                   = Werkzeuge
+extension-point.org.jkiss.dbeaver.tools.name = Werkzeuge
 
-menu.database.tools                                           = Werkzeuge
+view.tasks.title = Datenbankaufgaben
+
+menu.database.tasks.label = &Aufgaben
+menu.database.tools = Werkzeuge
+
+command.org.jkiss.dbeaver.task.create.name = Aufgabe erstellen ...
+command.org.jkiss.dbeaver.task.create.description = Datenbankaufgaben erstellen
+command.org.jkiss.dbeaver.task.run.name = Aufgabe ausf\u00fchren
+command.org.jkiss.dbeaver.task.run.description = Ausgew\u00e4hlte Aufgabe ausf\u00fchren
+command.org.jkiss.dbeaver.task.edit.name = Aufgabe bearbeiten
+command.org.jkiss.dbeaver.task.edit.description = \u00d6ffnet die Aufgabenkonfiguration
+command.org.jkiss.dbeaver.task.copy.name = Aufgabe kopieren
+command.org.jkiss.dbeaver.task.copy.description = Erstellt vorhandene Aufgabenkopie
+command.org.jkiss.dbeaver.task.group.name = Gruppiere nach
+command.org.jkiss.dbeaver.task.group.description = Gruppieren Aufgaben nach

plugins/org.jkiss.dbeaver.tasks.ui/OSGI-INF/l10n/bundle_es.properties

+extension-point.org.jkiss.dbeaver.tools.name = Herramientas
+
+view.tasks.title = Base de datos Tareas
+
+menu.database.tasks.label = &Tareas
 menu.database.tools = Herramientas
+
+command.org.jkiss.dbeaver.task.create.name = Crear nueva tarea ...
+command.org.jkiss.dbeaver.task.create.description = Crear nueva tarea de base de datos
+command.org.jkiss.dbeaver.task.run.name = Ejecutar tarea
+command.org.jkiss.dbeaver.task.run.description = Ejecuta tarea seleccionada
+command.org.jkiss.dbeaver.task.edit.name = Editar tarea
+command.org.jkiss.dbeaver.task.edit.description = Configuracin de tarea abierta
+command.org.jkiss.dbeaver.task.copy.name = Copiar tarea
+command.org.jkiss.dbeaver.task.copy.description = Crear copia de tarea existente
+command.org.jkiss.dbeaver.task.group.name = Agrupar por
+command.org.jkiss.dbeaver.task.group.description = Agrupar tareas por
\ No newline at end of file

plugins/org.jkiss.dbeaver.tasks.ui/OSGI-INF/l10n/bundle_fr.properties

 extension-point.org.jkiss.dbeaver.tools.name = Outils
 
-menu.database.tools        = Outils
+view.tasks.title = T\u00e2ches de base de donn\u00e9es
+
+menu.database.tasks.label = &T\u00e2ches
+menu.database.tools = Outils
+
+command.org.jkiss.dbeaver.task.create.name = Cr\u00e9er une nouvelle t\u00e2che ...
+command.org.jkiss.dbeaver.task.create.description = Cr\u00e9er une nouvelle t\u00e2che de base de donn\u00e9es
+command.org.jkiss.dbeaver.task.run.name = Ex\u00e9cuter la t\u00e2che
+command.org.jkiss.dbeaver.task.run.description = Ex\u00e9cute la t\u00e2che s\u00e9lectionn\u00e9e
+command.org.jkiss.dbeaver.task.edit.name = Modifier la t\u00e2che
+command.org.jkiss.dbeaver.task.edit.description = Ouvre configuration des t\u00e2ches
+command.org.jkiss.dbeaver.task.copy.name = T\u00e2che de copie
+command.org.jkiss.dbeaver.task.copy.description = Cr\u00e9er une copie de t\u00e2che existante
+command.org.jkiss.dbeaver.task.group.name = Grouper par
+command.org.jkiss.dbeaver.task.group.description = Grouper les t\u00e2ches par
\ No newline at end of file

plugins/org.jkiss.dbeaver.tasks.ui/OSGI-INF/l10n/bundle_it.properties

+extension-point.org.jkiss.dbeaver.tools.name = Strumenti
+
+view.tasks.title = Attivit\u00e0 del database
+
+menu.database.tasks.label = &Attivit\u00e0 del database
 menu.database.tools = Strumenti
+
+command.org.jkiss.dbeaver.task.create.name = Crea nuova attivit\u00e0 ...
+command.org.jkiss.dbeaver.task.create.description = Crea nuova attivit\u00e0 di database
+command.org.jkiss.dbeaver.task.run.name = Esegui attivit\u00e0
+command.org.jkiss.dbeaver.task.run.description = Esegue l'attivit\u00e0 selezionata
+command.org.jkiss.dbeaver.task.edit.name = Modifica attivit\u00e0
+command.org.jkiss.dbeaver.task.edit.description = Apre la configurazione dell'attivit\u00e0
+command.org.jkiss.dbeaver.task.copy.name = Copia attivit\u00e0
+command.org.jkiss.dbeaver.task.copy.description = Crea copia dell'attivit\u00e0 esistente
+command.org.jkiss.dbeaver.task.group.name = Raggruppa per
+command.org.jkiss.dbeaver.task.group.description = Raggruppa le attivit\u00e0 per
\ No newline at end of file

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

-menu.database.tools                                           = \u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
+extension-point.org.jkiss.dbeaver.tools.name = \u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
+
+view.tasks.title = \u0417\u0430\u0434\u0430\u0447\u0438\u0020\u0411\u0414
+
+menu.database.tasks.label = &\u0417\u0430\u0434\u0430\u0447\u0438
+menu.database.tools = \u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u044B
+
+command.org.jkiss.dbeaver.task.create.name = \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0443 ...
+command.org.jkiss.dbeaver.task.create.description = \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0443\u0020\u0411\u0414
+command.org.jkiss.dbeaver.task.run.name = \u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0443
+command.org.jkiss.dbeaver.task.run.description = \u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c\u0020\u0432\u044b\u0431\u0440\u0430\u043d\u043d\u0443\u044e\u0020\u0437\u0430\u0434\u0430\u0447\u0443
+command.org.jkiss.dbeaver.task.edit.name = \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0443
+command.org.jkiss.dbeaver.task.edit.description = \u041e\u0442\u043a\u0440\u044b\u0442\u044c\u0020\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e\u0020\u0437\u0430\u0434\u0430\u0447\u0438
+command.org.jkiss.dbeaver.task.copy.name = \u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0443
+command.org.jkiss.dbeaver.task.copy.description = \u0421\u043e\u0437\u0434\u0430\u0442\u044c\u0020\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e\u0020\u043a\u043e\u043f\u0438\u044e\u0020\u0437\u0430\u0434\u0430\u0447\u0438
+command.org.jkiss.dbeaver.task.group.name = \u0421\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0020\u043f\u043e
+command.org.jkiss.dbeaver.task.group.description = \u0421\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0438\u0020\u043f\u043e
\ No newline at end of file

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.java

@@ -34,7 +34,6 @@ public class TaskUIMessages extends NLS {
 	public static String task_config_wizard_page_settings_title_task_prop;
 	public static String task_config_wizard_page_settings_descr_set_task;
 	public static String task_config_wizard_page_settings_config;
-	public static String task_config_wizard_page_settings_settings;
 	
 	public static String task_config_wizard_page_task_title_new_task_prop;
 	public static String task_config_wizard_page_task_label_task_type;

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages.properties

@@ -9,8 +9,7 @@ task_config_wizard_page_settings_create_task = Create new task
 task_config_wizard_page_settings_edit_task = Edit task
 task_config_wizard_page_settings_title_task_prop = Edit task properties
 task_config_wizard_page_settings_descr_set_task = Set task name, type and input data
-task_config_wizard_page_settings_config = Configure
-task_config_wizard_page_settings_settings = settings
+task_config_wizard_page_settings_config = Configure {0} settings
 
 task_config_wizard_page_task_title_new_task_prop = New task properties
 task_config_wizard_page_task_label_task_type = Task type

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages_de.properties

@@ -9,8 +9,7 @@ task_config_wizard_page_settings_create_task = Aufgabe erstellen
 task_config_wizard_page_settings_edit_task = Aufgabe bearbeiten
 task_config_wizard_page_settings_title_task_prop = Aufgabeneigenschaften bearbeiten
 task_config_wizard_page_settings_descr_set_task = Legen Sie den Namen, den Typ und die Eingabedaten der Aufgabe fest
-task_config_wizard_page_settings_config = Konfigurieren
-task_config_wizard_page_settings_settings = Einstellungen
+task_config_wizard_page_settings_config = Konfigurieren {0} Einstellungen
 
 task_config_wizard_page_task_title_new_task_prop = Neue Aufgabeneigenschaften
 task_config_wizard_page_task_label_task_type = Aufgabentyp

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages_es.properties

@@ -9,8 +9,7 @@ task_config_wizard_page_settings_create_task = Crear tarea
 task_config_wizard_page_settings_edit_task = Editar tarea
 task_config_wizard_page_settings_title_task_prop = Editar propiedades de tarea
 task_config_wizard_page_settings_descr_set_task = Establecer nombre de tarea, tipo y datos de entrada
-task_config_wizard_page_settings_config = Configurar
-task_config_wizard_page_settings_settings = ajustes
+task_config_wizard_page_settings_config = Configurar {0} ajustes
 
 task_config_wizard_page_task_title_new_task_prop = Nuevas propiedades de tarea
 task_config_wizard_page_task_label_task_type = Tipo de tarea

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages_fr.properties

@@ -9,8 +9,7 @@ task_config_wizard_page_settings_create_task = Cr\u00e9er une t\u00e2che
 task_config_wizard_page_settings_edit_task = Modifier la t\u00e2che
 task_config_wizard_page_settings_title_task_prop = Modifier les propri\u00e9t\u00e9s de la t\u00e2che
 task_config_wizard_page_settings_descr_set_task = D\u00e9finir le nom, le type et les donn\u00e9es d'entr\u00e9e de la t\u00e2che
-task_config_wizard_page_settings_config = Configurer
-task_config_wizard_page_settings_settings = param\u00e9tres
+task_config_wizard_page_settings_config = Configurer {0} param\u00e9tres
 
 task_config_wizard_page_task_title_new_task_prop = Nouvelles propri\u00e9t\u00e9s de t\u00e2che
 task_config_wizard_page_task_label_task_type = Type de t\u00e2che

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/internal/TaskUIMessages_ru.properties

@@ -9,8 +9,7 @@ task_config_wizard_page_settings_create_task = \u0421\u043e\u0437\u0434\u0430\u0
 task_config_wizard_page_settings_edit_task = \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c\u0020\u0437\u0430\u0434\u0430\u0447\u0443
 task_config_wizard_page_settings_title_task_prop = \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c\u0020\u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430\u0020\u0437\u0430\u0434\u0430\u0447\u0438
 task_config_wizard_page_settings_descr_set_task = \u0417\u0430\u0434\u0430\u0439\u0442\u0435\u0020\u0438\u043c\u044f\u0020\u0437\u0430\u0434\u0430\u0447\u0438\u002c\u0020\u0442\u0438\u043f\u0020\u0438\u0020\u0432\u0445\u043e\u0434\u043d\u044b\u0435\u0020\u0434\u0430\u043d\u043d\u044b\u0435
-task_config_wizard_page_settings_config = \u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
-task_config_wizard_page_settings_settings = \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432
+task_config_wizard_page_settings_config = \u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f {0} \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432
 
 task_config_wizard_page_task_title_new_task_prop = \u041d\u043e\u0432\u044b\u0435\u0020\u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430\u0020\u0437\u0430\u0434\u0430\u0447\u0438
 task_config_wizard_page_task_label_task_type = \u0422\u0438\u043f\u0020\u0437\u0430\u0434\u0430\u0447\u0438

plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/wizard/TaskConfigurationWizardPageSettings.java

@@ -16,7 +16,9 @@
  */
 package org.jkiss.dbeaver.tasks.ui.wizard;
 
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
+
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.jkiss.dbeaver.Log;
@@ -91,7 +93,7 @@ class TaskConfigurationWizardPageSettings extends ActiveWizardPage<TaskConfigura
                 title += " (" + getWizard().getCurrentTask().getName() + ")";
             }
             setTitle(title);
-            setDescription(TaskUIMessages.task_config_wizard_page_settings_config + " " + curTaskType.getName() + " " + TaskUIMessages.task_config_wizard_page_settings_settings);
+            setDescription(NLS.bind(TaskUIMessages.task_config_wizard_page_settings_config,curTaskType.getName()));
         }
         setPageComplete(determinePageCompletion());
     }