Changed the tasks handling to allow for more fine grained task designations.

Sun, 29 Apr 2012 16:42:02 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 29 Apr 2012 16:42:02 +0200
changeset 1819
cfcfd617216a
parent 1818
a5e4cb4bed43
child 1820
3504f8175816

Changed the tasks handling to allow for more fine grained task designations.

APIs/Python3/eric5.api file | annotate | diff | comparison | revisions
DTDs/Tasks-5.1.dtd file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Preferences.ConfigurationPages.TasksPage.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Tasks.Task.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Tasks.TaskFilter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Tasks.TaskFilterConfigDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/eric5.Tasks.TaskViewer.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric5.Tasks.html file | annotate | diff | comparison | revisions
E5XML/Config.py file | annotate | diff | comparison | revisions
E5XML/TasksReader.py file | annotate | diff | comparison | revisions
E5XML/TasksWriter.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/TasksPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/TasksPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
Project/CreateDialogCodeDialog.py file | annotate | diff | comparison | revisions
QScintilla/Editor.py file | annotate | diff | comparison | revisions
Tasks/Task.py file | annotate | diff | comparison | revisions
Tasks/TaskFilter.py file | annotate | diff | comparison | revisions
Tasks/TaskFilterConfigDialog.py file | annotate | diff | comparison | revisions
Tasks/TaskFilterConfigDialog.ui file | annotate | diff | comparison | revisions
Tasks/TaskViewer.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
eric5.e4p file | annotate | diff | comparison | revisions
i18n/eric5_cs.ts file | annotate | diff | comparison | revisions
i18n/eric5_de.qm file | annotate | diff | comparison | revisions
i18n/eric5_de.ts file | annotate | diff | comparison | revisions
i18n/eric5_en.ts file | annotate | diff | comparison | revisions
i18n/eric5_es.ts file | annotate | diff | comparison | revisions
i18n/eric5_fr.ts file | annotate | diff | comparison | revisions
i18n/eric5_it.ts file | annotate | diff | comparison | revisions
i18n/eric5_ru.ts file | annotate | diff | comparison | revisions
i18n/eric5_tr.ts file | annotate | diff | comparison | revisions
i18n/eric5_zh_CN.GB2312.ts file | annotate | diff | comparison | revisions
icons/default/taskCompleted.png file | annotate | diff | comparison | revisions
icons/default/taskFixme.png file | annotate | diff | comparison | revisions
icons/default/taskNote.png file | annotate | diff | comparison | revisions
icons/default/taskTodo.png file | annotate | diff | comparison | revisions
icons/default/taskWarning.png file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric5.api	Sat Apr 28 17:00:32 2012 +0200
+++ b/APIs/Python3/eric5.api	Sun Apr 29 16:42:02 2012 +0200
@@ -5103,10 +5103,10 @@
 eric5.Preferences.ConfigurationPages.ShellPage.ShellPage.save?4()
 eric5.Preferences.ConfigurationPages.ShellPage.ShellPage?1()
 eric5.Preferences.ConfigurationPages.ShellPage.create?4(dlg)
-eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksBgColourButton_clicked?4()
-eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksBugfixColourButton_clicked?4()
-eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksColourButton_clicked?4()
-eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksProjectBgColourButton_clicked?4()
+eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksFixmeColourButton_clicked?4()
+eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksNoteColourButton_clicked?4()
+eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksTodoColourButton_clicked?4()
+eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.on_tasksWarningColourButton_clicked?4()
 eric5.Preferences.ConfigurationPages.TasksPage.TasksPage.save?4()
 eric5.Preferences.ConfigurationPages.TasksPage.TasksPage?1()
 eric5.Preferences.ConfigurationPages.TasksPage.create?4(dlg)
@@ -6528,34 +6528,39 @@
 eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.showSchema?4()
 eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget.tableActivated?7
 eric5.SqlBrowser.SqlConnectionWidget.SqlConnectionWidget?1(parent=None)
+eric5.Tasks.Task.Task.TypeFixme?7
+eric5.Tasks.Task.Task.TypeNone?7
+eric5.Tasks.Task.Task.TypeNote?7
+eric5.Tasks.Task.Task.TypeTodo?7
+eric5.Tasks.Task.Task.TypeWarning?7
+eric5.Tasks.Task.Task.colorizeTask?4()
+eric5.Tasks.Task.Task.getFilename?4()
+eric5.Tasks.Task.Task.getLineno?4()
+eric5.Tasks.Task.Task.isCompleted?4()
+eric5.Tasks.Task.Task.isProjectTask?4()
+eric5.Tasks.Task.Task.setCompleted?4(completed)
+eric5.Tasks.Task.Task.setDescription?4(description)
+eric5.Tasks.Task.Task.setLongText?4(longtext)
+eric5.Tasks.Task.Task.setPriority?4(priority)
+eric5.Tasks.Task.Task.setProjectTask?4(pt)
+eric5.Tasks.Task.Task?1(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, longtext="")
+eric5.Tasks.TaskFilter.TaskFilter.hasActiveFilter?4()
+eric5.Tasks.TaskFilter.TaskFilter.setActive?4(enabled)
+eric5.Tasks.TaskFilter.TaskFilter.setDescriptionFilter?4(filter)
+eric5.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filter)
+eric5.Tasks.TaskFilter.TaskFilter.setPrioritiesFilter?4(priorities)
+eric5.Tasks.TaskFilter.TaskFilter.setScopeFilter?4(scope)
+eric5.Tasks.TaskFilter.TaskFilter.setStatusFilter?4(status)
+eric5.Tasks.TaskFilter.TaskFilter.setTypeFilter?4(taskType)
+eric5.Tasks.TaskFilter.TaskFilter.showTask?4(task)
+eric5.Tasks.TaskFilter.TaskFilter?1()
 eric5.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog.configureTaskFilter?4(taskFilter)
 eric5.Tasks.TaskFilterConfigDialog.TaskFilterConfigDialog?1(taskFilter, parent=None)
 eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.getData?4()
 eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog.setReadOnly?4()
 eric5.Tasks.TaskPropertiesDialog.TaskPropertiesDialog?1(task=None, parent=None, projectOpen=False)
-eric5.Tasks.TaskViewer.Task.colorizeTask?4()
-eric5.Tasks.TaskViewer.Task.getFilename?4()
-eric5.Tasks.TaskViewer.Task.getLineno?4()
-eric5.Tasks.TaskViewer.Task.isCompleted?4()
-eric5.Tasks.TaskViewer.Task.isProjectTask?4()
-eric5.Tasks.TaskViewer.Task.setCompleted?4(completed)
-eric5.Tasks.TaskViewer.Task.setDescription?4(description)
-eric5.Tasks.TaskViewer.Task.setLongText?4(longtext)
-eric5.Tasks.TaskViewer.Task.setPriority?4(priority)
-eric5.Tasks.TaskViewer.Task.setProjectTask?4(pt)
-eric5.Tasks.TaskViewer.Task?1(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, project=None, longtext="")
-eric5.Tasks.TaskViewer.TaskFilter.hasActiveFilter?4()
-eric5.Tasks.TaskViewer.TaskFilter.setActive?4(enabled)
-eric5.Tasks.TaskViewer.TaskFilter.setDescriptionFilter?4(filter)
-eric5.Tasks.TaskViewer.TaskFilter.setFileNameFilter?4(filter)
-eric5.Tasks.TaskViewer.TaskFilter.setPrioritiesFilter?4(priorities)
-eric5.Tasks.TaskViewer.TaskFilter.setScopeFilter?4(scope)
-eric5.Tasks.TaskViewer.TaskFilter.setStatusFilter?4(status)
-eric5.Tasks.TaskViewer.TaskFilter.setTypeFilter?4(type_)
-eric5.Tasks.TaskViewer.TaskFilter.showTask?4(task)
-eric5.Tasks.TaskViewer.TaskFilter?1()
-eric5.Tasks.TaskViewer.TaskViewer.addFileTask?4(description, filename, lineno, isBugfixTask=False, longtext="")
-eric5.Tasks.TaskViewer.TaskViewer.addTask?4(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, longtext="")
+eric5.Tasks.TaskViewer.TaskViewer.addFileTask?4(description, filename, lineno, taskType=Task.TypeTodo, longtext="")
+eric5.Tasks.TaskViewer.TaskViewer.addTask?4(description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, longtext="")
 eric5.Tasks.TaskViewer.TaskViewer.clearFileTasks?4(filename, conditionally=False)
 eric5.Tasks.TaskViewer.TaskViewer.clearProjectTasks?4()
 eric5.Tasks.TaskViewer.TaskViewer.clearTasks?4()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/DTDs/Tasks-5.1.dtd	Sun Apr 29 16:42:02 2012 +0200
@@ -0,0 +1,29 @@
+<!-- This is the DTD for eric5's tasks file version 5.0 -->
+
+<!ELEMENT   Summary             (#PCDATA)>
+
+<!ELEMENT   Description         (#PCDATA)>
+
+<!ELEMENT   Created             (#PCDATA)>
+
+<!ELEMENT   Filename            (#PCDATA)>
+
+<!ELEMENT   Linenumber          (#PCDATA)>
+
+<!ELEMENT   Resource            (Filename, Linenumber)>
+
+<!ELEMENT   Task                (Summary,
+                                 Description,
+                                 Created,
+                                 Resource?)>
+<!ATTLIST   Task
+    priority    CDATA   #REQUIRED
+    completed   CDATA   #REQUIRED
+    type        CDATA   #IMPLIED>
+
+<!ELEMENT   ProjectScanFilter   (#PCDATA)>
+
+<!ELEMENT   Tasks               (ProjectScanFilter?,
+                                 Task*)>
+<!ATTLIST   Tasks
+    version     CDATA   #REQUIRED>
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Apr 28 17:00:32 2012 +0200
+++ b/Documentation/Help/source.qhp	Sun Apr 29 16:42:02 2012 +0200
@@ -820,6 +820,8 @@
             <section title="eric5.SqlBrowser.SqlConnectionWidget" ref="eric5.SqlBrowser.SqlConnectionWidget.html" />
           </section>
           <section title="eric5.Tasks" ref="index-eric5.Tasks.html">
+            <section title="eric5.Tasks.Task" ref="eric5.Tasks.Task.html" />
+            <section title="eric5.Tasks.TaskFilter" ref="eric5.Tasks.TaskFilter.html" />
             <section title="eric5.Tasks.TaskFilterConfigDialog" ref="eric5.Tasks.TaskFilterConfigDialog.html" />
             <section title="eric5.Tasks.TaskPropertiesDialog" ref="eric5.Tasks.TaskPropertiesDialog.html" />
             <section title="eric5.Tasks.TaskViewer" ref="eric5.Tasks.TaskViewer.html" />
@@ -9837,29 +9839,31 @@
       <keyword name="Tabview.showWindowMenu" id="Tabview.showWindowMenu" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.showWindowMenu" />
       <keyword name="Tabview.tile" id="Tabview.tile" ref="eric5.Plugins.ViewManagerPlugins.Tabview.Tabview.html#Tabview.tile" />
       <keyword name="TagError" id="TagError" ref="eric5.DocumentationTools.ModuleDocumentor.html#TagError" />
-      <keyword name="Task" id="Task" ref="eric5.Tasks.TaskViewer.html#Task" />
-      <keyword name="Task (Constructor)" id="Task (Constructor)" ref="eric5.Tasks.TaskViewer.html#Task.__init__" />
-      <keyword name="Task.colorizeTask" id="Task.colorizeTask" ref="eric5.Tasks.TaskViewer.html#Task.colorizeTask" />
-      <keyword name="Task.getFilename" id="Task.getFilename" ref="eric5.Tasks.TaskViewer.html#Task.getFilename" />
-      <keyword name="Task.getLineno" id="Task.getLineno" ref="eric5.Tasks.TaskViewer.html#Task.getLineno" />
-      <keyword name="Task.isCompleted" id="Task.isCompleted" ref="eric5.Tasks.TaskViewer.html#Task.isCompleted" />
-      <keyword name="Task.isProjectTask" id="Task.isProjectTask" ref="eric5.Tasks.TaskViewer.html#Task.isProjectTask" />
-      <keyword name="Task.setCompleted" id="Task.setCompleted" ref="eric5.Tasks.TaskViewer.html#Task.setCompleted" />
-      <keyword name="Task.setDescription" id="Task.setDescription" ref="eric5.Tasks.TaskViewer.html#Task.setDescription" />
-      <keyword name="Task.setLongText" id="Task.setLongText" ref="eric5.Tasks.TaskViewer.html#Task.setLongText" />
-      <keyword name="Task.setPriority" id="Task.setPriority" ref="eric5.Tasks.TaskViewer.html#Task.setPriority" />
-      <keyword name="Task.setProjectTask" id="Task.setProjectTask" ref="eric5.Tasks.TaskViewer.html#Task.setProjectTask" />
-      <keyword name="TaskFilter" id="TaskFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter" />
-      <keyword name="TaskFilter (Constructor)" id="TaskFilter (Constructor)" ref="eric5.Tasks.TaskViewer.html#TaskFilter.__init__" />
-      <keyword name="TaskFilter.hasActiveFilter" id="TaskFilter.hasActiveFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.hasActiveFilter" />
-      <keyword name="TaskFilter.setActive" id="TaskFilter.setActive" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setActive" />
-      <keyword name="TaskFilter.setDescriptionFilter" id="TaskFilter.setDescriptionFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setDescriptionFilter" />
-      <keyword name="TaskFilter.setFileNameFilter" id="TaskFilter.setFileNameFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setFileNameFilter" />
-      <keyword name="TaskFilter.setPrioritiesFilter" id="TaskFilter.setPrioritiesFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setPrioritiesFilter" />
-      <keyword name="TaskFilter.setScopeFilter" id="TaskFilter.setScopeFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setScopeFilter" />
-      <keyword name="TaskFilter.setStatusFilter" id="TaskFilter.setStatusFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setStatusFilter" />
-      <keyword name="TaskFilter.setTypeFilter" id="TaskFilter.setTypeFilter" ref="eric5.Tasks.TaskViewer.html#TaskFilter.setTypeFilter" />
-      <keyword name="TaskFilter.showTask" id="TaskFilter.showTask" ref="eric5.Tasks.TaskViewer.html#TaskFilter.showTask" />
+      <keyword name="Task" id="Task" ref="eric5.Tasks.Task.html#Task" />
+      <keyword name="Task (Constructor)" id="Task (Constructor)" ref="eric5.Tasks.Task.html#Task.__init__" />
+      <keyword name="Task (Module)" id="Task (Module)" ref="eric5.Tasks.Task.html" />
+      <keyword name="Task.colorizeTask" id="Task.colorizeTask" ref="eric5.Tasks.Task.html#Task.colorizeTask" />
+      <keyword name="Task.getFilename" id="Task.getFilename" ref="eric5.Tasks.Task.html#Task.getFilename" />
+      <keyword name="Task.getLineno" id="Task.getLineno" ref="eric5.Tasks.Task.html#Task.getLineno" />
+      <keyword name="Task.isCompleted" id="Task.isCompleted" ref="eric5.Tasks.Task.html#Task.isCompleted" />
+      <keyword name="Task.isProjectTask" id="Task.isProjectTask" ref="eric5.Tasks.Task.html#Task.isProjectTask" />
+      <keyword name="Task.setCompleted" id="Task.setCompleted" ref="eric5.Tasks.Task.html#Task.setCompleted" />
+      <keyword name="Task.setDescription" id="Task.setDescription" ref="eric5.Tasks.Task.html#Task.setDescription" />
+      <keyword name="Task.setLongText" id="Task.setLongText" ref="eric5.Tasks.Task.html#Task.setLongText" />
+      <keyword name="Task.setPriority" id="Task.setPriority" ref="eric5.Tasks.Task.html#Task.setPriority" />
+      <keyword name="Task.setProjectTask" id="Task.setProjectTask" ref="eric5.Tasks.Task.html#Task.setProjectTask" />
+      <keyword name="TaskFilter" id="TaskFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter" />
+      <keyword name="TaskFilter (Constructor)" id="TaskFilter (Constructor)" ref="eric5.Tasks.TaskFilter.html#TaskFilter.__init__" />
+      <keyword name="TaskFilter (Module)" id="TaskFilter (Module)" ref="eric5.Tasks.TaskFilter.html" />
+      <keyword name="TaskFilter.hasActiveFilter" id="TaskFilter.hasActiveFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.hasActiveFilter" />
+      <keyword name="TaskFilter.setActive" id="TaskFilter.setActive" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setActive" />
+      <keyword name="TaskFilter.setDescriptionFilter" id="TaskFilter.setDescriptionFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setDescriptionFilter" />
+      <keyword name="TaskFilter.setFileNameFilter" id="TaskFilter.setFileNameFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setFileNameFilter" />
+      <keyword name="TaskFilter.setPrioritiesFilter" id="TaskFilter.setPrioritiesFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setPrioritiesFilter" />
+      <keyword name="TaskFilter.setScopeFilter" id="TaskFilter.setScopeFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setScopeFilter" />
+      <keyword name="TaskFilter.setStatusFilter" id="TaskFilter.setStatusFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setStatusFilter" />
+      <keyword name="TaskFilter.setTypeFilter" id="TaskFilter.setTypeFilter" ref="eric5.Tasks.TaskFilter.html#TaskFilter.setTypeFilter" />
+      <keyword name="TaskFilter.showTask" id="TaskFilter.showTask" ref="eric5.Tasks.TaskFilter.html#TaskFilter.showTask" />
       <keyword name="TaskFilterConfigDialog" id="TaskFilterConfigDialog" ref="eric5.Tasks.TaskFilterConfigDialog.html#TaskFilterConfigDialog" />
       <keyword name="TaskFilterConfigDialog (Constructor)" id="TaskFilterConfigDialog (Constructor)" ref="eric5.Tasks.TaskFilterConfigDialog.html#TaskFilterConfigDialog.__init__" />
       <keyword name="TaskFilterConfigDialog (Module)" id="TaskFilterConfigDialog (Module)" ref="eric5.Tasks.TaskFilterConfigDialog.html" />
@@ -9904,10 +9908,10 @@
       <keyword name="TasksPage" id="TasksPage" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage" />
       <keyword name="TasksPage (Constructor)" id="TasksPage (Constructor)" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.__init__" />
       <keyword name="TasksPage (Module)" id="TasksPage (Module)" ref="eric5.Preferences.ConfigurationPages.TasksPage.html" />
-      <keyword name="TasksPage.on_tasksBgColourButton_clicked" id="TasksPage.on_tasksBgColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksBgColourButton_clicked" />
-      <keyword name="TasksPage.on_tasksBugfixColourButton_clicked" id="TasksPage.on_tasksBugfixColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksBugfixColourButton_clicked" />
-      <keyword name="TasksPage.on_tasksColourButton_clicked" id="TasksPage.on_tasksColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksColourButton_clicked" />
-      <keyword name="TasksPage.on_tasksProjectBgColourButton_clicked" id="TasksPage.on_tasksProjectBgColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksProjectBgColourButton_clicked" />
+      <keyword name="TasksPage.on_tasksFixmeColourButton_clicked" id="TasksPage.on_tasksFixmeColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksFixmeColourButton_clicked" />
+      <keyword name="TasksPage.on_tasksNoteColourButton_clicked" id="TasksPage.on_tasksNoteColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksNoteColourButton_clicked" />
+      <keyword name="TasksPage.on_tasksTodoColourButton_clicked" id="TasksPage.on_tasksTodoColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksTodoColourButton_clicked" />
+      <keyword name="TasksPage.on_tasksWarningColourButton_clicked" id="TasksPage.on_tasksWarningColourButton_clicked" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.on_tasksWarningColourButton_clicked" />
       <keyword name="TasksPage.save" id="TasksPage.save" ref="eric5.Preferences.ConfigurationPages.TasksPage.html#TasksPage.save" />
       <keyword name="TasksReader" id="TasksReader" ref="eric5.E5XML.TasksReader.html#TasksReader" />
       <keyword name="TasksReader (Constructor)" id="TasksReader (Constructor)" ref="eric5.E5XML.TasksReader.html#TasksReader.__init__" />
@@ -12578,6 +12582,8 @@
       <file>eric5.SqlBrowser.SqlBrowserWidget.html</file>
       <file>eric5.SqlBrowser.SqlConnectionDialog.html</file>
       <file>eric5.SqlBrowser.SqlConnectionWidget.html</file>
+      <file>eric5.Tasks.Task.html</file>
+      <file>eric5.Tasks.TaskFilter.html</file>
       <file>eric5.Tasks.TaskFilterConfigDialog.html</file>
       <file>eric5.Tasks.TaskPropertiesDialog.html</file>
       <file>eric5.Tasks.TaskViewer.html</file>
--- a/Documentation/Source/eric5.Preferences.ConfigurationPages.TasksPage.html	Sat Apr 28 17:00:32 2012 +0200
+++ b/Documentation/Source/eric5.Preferences.ConfigurationPages.TasksPage.html	Sun Apr 29 16:42:02 2012 +0200
@@ -64,18 +64,18 @@
 <td><a href="#TasksPage.__init__">TasksPage</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#TasksPage.on_tasksBgColourButton_clicked">on_tasksBgColourButton_clicked</a></td>
+<td><a href="#TasksPage.on_tasksFixmeColourButton_clicked">on_tasksFixmeColourButton_clicked</a></td>
+<td>Private slot to set the colour for standard tasks.</td>
+</tr><tr>
+<td><a href="#TasksPage.on_tasksNoteColourButton_clicked">on_tasksNoteColourButton_clicked</a></td>
+<td>Private slot to set the backgroundcolour for project tasks.</td>
+</tr><tr>
+<td><a href="#TasksPage.on_tasksTodoColourButton_clicked">on_tasksTodoColourButton_clicked</a></td>
 <td>Private slot to set the background colour for global tasks.</td>
 </tr><tr>
-<td><a href="#TasksPage.on_tasksBugfixColourButton_clicked">on_tasksBugfixColourButton_clicked</a></td>
+<td><a href="#TasksPage.on_tasksWarningColourButton_clicked">on_tasksWarningColourButton_clicked</a></td>
 <td>Private slot to set the colour for bugfix tasks.</td>
 </tr><tr>
-<td><a href="#TasksPage.on_tasksColourButton_clicked">on_tasksColourButton_clicked</a></td>
-<td>Private slot to set the colour for standard tasks.</td>
-</tr><tr>
-<td><a href="#TasksPage.on_tasksProjectBgColourButton_clicked">on_tasksProjectBgColourButton_clicked</a></td>
-<td>Private slot to set the backgroundcolour for project tasks.</td>
-</tr><tr>
 <td><a href="#TasksPage.save">save</a></td>
 <td>Public slot to save the Tasks configuration.</td>
 </tr>
@@ -89,26 +89,26 @@
 <b>TasksPage</b>(<i></i>)
 <p>
         Constructor
-</p><a NAME="TasksPage.on_tasksBgColourButton_clicked" ID="TasksPage.on_tasksBgColourButton_clicked"></a>
-<h4>TasksPage.on_tasksBgColourButton_clicked</h4>
-<b>on_tasksBgColourButton_clicked</b>(<i></i>)
+</p><a NAME="TasksPage.on_tasksFixmeColourButton_clicked" ID="TasksPage.on_tasksFixmeColourButton_clicked"></a>
+<h4>TasksPage.on_tasksFixmeColourButton_clicked</h4>
+<b>on_tasksFixmeColourButton_clicked</b>(<i></i>)
+<p>
+        Private slot to set the colour for standard tasks.
+</p><a NAME="TasksPage.on_tasksNoteColourButton_clicked" ID="TasksPage.on_tasksNoteColourButton_clicked"></a>
+<h4>TasksPage.on_tasksNoteColourButton_clicked</h4>
+<b>on_tasksNoteColourButton_clicked</b>(<i></i>)
+<p>
+        Private slot to set the backgroundcolour for project tasks.
+</p><a NAME="TasksPage.on_tasksTodoColourButton_clicked" ID="TasksPage.on_tasksTodoColourButton_clicked"></a>
+<h4>TasksPage.on_tasksTodoColourButton_clicked</h4>
+<b>on_tasksTodoColourButton_clicked</b>(<i></i>)
 <p>
         Private slot to set the background colour for global tasks.
-</p><a NAME="TasksPage.on_tasksBugfixColourButton_clicked" ID="TasksPage.on_tasksBugfixColourButton_clicked"></a>
-<h4>TasksPage.on_tasksBugfixColourButton_clicked</h4>
-<b>on_tasksBugfixColourButton_clicked</b>(<i></i>)
+</p><a NAME="TasksPage.on_tasksWarningColourButton_clicked" ID="TasksPage.on_tasksWarningColourButton_clicked"></a>
+<h4>TasksPage.on_tasksWarningColourButton_clicked</h4>
+<b>on_tasksWarningColourButton_clicked</b>(<i></i>)
 <p>
         Private slot to set the colour for bugfix tasks.
-</p><a NAME="TasksPage.on_tasksColourButton_clicked" ID="TasksPage.on_tasksColourButton_clicked"></a>
-<h4>TasksPage.on_tasksColourButton_clicked</h4>
-<b>on_tasksColourButton_clicked</b>(<i></i>)
-<p>
-        Private slot to set the colour for standard tasks.
-</p><a NAME="TasksPage.on_tasksProjectBgColourButton_clicked" ID="TasksPage.on_tasksProjectBgColourButton_clicked"></a>
-<h4>TasksPage.on_tasksProjectBgColourButton_clicked</h4>
-<b>on_tasksProjectBgColourButton_clicked</b>(<i></i>)
-<p>
-        Private slot to set the backgroundcolour for project tasks.
 </p><a NAME="TasksPage.save" ID="TasksPage.save"></a>
 <h4>TasksPage.save</h4>
 <b>save</b>(<i></i>)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Tasks.Task.html	Sun Apr 29 16:42:02 2012 +0200
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Tasks.Task</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Tasks.Task</h1>
+<p>
+Module implementing a class to store task data.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#Task">Task</a></td>
+<td>Class implementing the task data structure.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="Task" ID="Task"></a>
+<h2>Task</h2>
+<p>
+    Class implementing the task data structure.
+</p>
+<h3>Derived from</h3>
+QTreeWidgetItem
+<h3>Class Attributes</h3>
+<table>
+<tr><td>TypeFixme</td></tr><tr><td>TypeNone</td></tr><tr><td>TypeNote</td></tr><tr><td>TypeTodo</td></tr><tr><td>TypeWarning</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#Task.__init__">Task</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#Task.colorizeTask">colorizeTask</a></td>
+<td>Public slot to set the colors of the task item.</td>
+</tr><tr>
+<td><a href="#Task.getFilename">getFilename</a></td>
+<td>Public method to retrieve the tasks filename.</td>
+</tr><tr>
+<td><a href="#Task.getLineno">getLineno</a></td>
+<td>Public method to retrieve the tasks linenumber.</td>
+</tr><tr>
+<td><a href="#Task.isCompleted">isCompleted</a></td>
+<td>Public slot to return the completion status.</td>
+</tr><tr>
+<td><a href="#Task.isProjectTask">isProjectTask</a></td>
+<td>Public slot to return the project relation status.</td>
+</tr><tr>
+<td><a href="#Task.setCompleted">setCompleted</a></td>
+<td>Public slot to update the completed flag.</td>
+</tr><tr>
+<td><a href="#Task.setDescription">setDescription</a></td>
+<td>Public slot to update the description.</td>
+</tr><tr>
+<td><a href="#Task.setLongText">setLongText</a></td>
+<td>Public slot to update the longtext field.</td>
+</tr><tr>
+<td><a href="#Task.setPriority">setPriority</a></td>
+<td>Public slot to update the priority.</td>
+</tr><tr>
+<td><a href="#Task.setProjectTask">setProjectTask</a></td>
+<td>Public method to set the project relation flag.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="Task.__init__" ID="Task.__init__"></a>
+<h4>Task (Constructor)</h4>
+<b>Task</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, longtext=""</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i></dt>
+<dd>
+parent widget of the task (QWidget)
+</dd><dt><i>description</i></dt>
+<dd>
+descriptive text of the task (string)
+</dd><dt><i>priority</i></dt>
+<dd>
+priority of the task (0=high, 1=normal, 2=low)
+</dd><dt><i>filename</i></dt>
+<dd>
+filename containing the task (string)
+</dd><dt><i>lineno</i></dt>
+<dd>
+line number containing the task (integer)
+</dd><dt><i>completed</i></dt>
+<dd>
+flag indicating completion status (boolean)
+</dd><dt><i>_time</i></dt>
+<dd>
+creation time of the task (float, if 0 use current time)
+</dd><dt><i>isProjectTask</i></dt>
+<dd>
+flag indicating a task related to the current project
+            (boolean)
+</dd><dt><i>taskType</i></dt>
+<dd>
+type of the task (one of TypeFixme, TypeTodo,
+            TypeWarning, TypeNote)
+</dd><dt><i>project</i></dt>
+<dd>
+reference to the project object (Project)
+</dd><dt><i>longtext</i></dt>
+<dd>
+explanatory text of the task (string)
+</dd>
+</dl><a NAME="Task.colorizeTask" ID="Task.colorizeTask"></a>
+<h4>Task.colorizeTask</h4>
+<b>colorizeTask</b>(<i></i>)
+<p>
+        Public slot to set the colors of the task item.
+</p><a NAME="Task.getFilename" ID="Task.getFilename"></a>
+<h4>Task.getFilename</h4>
+<b>getFilename</b>(<i></i>)
+<p>
+        Public method to retrieve the tasks filename.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+filename (string)
+</dd>
+</dl><a NAME="Task.getLineno" ID="Task.getLineno"></a>
+<h4>Task.getLineno</h4>
+<b>getLineno</b>(<i></i>)
+<p>
+        Public method to retrieve the tasks linenumber.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+linenumber (integer)
+</dd>
+</dl><a NAME="Task.isCompleted" ID="Task.isCompleted"></a>
+<h4>Task.isCompleted</h4>
+<b>isCompleted</b>(<i></i>)
+<p>
+        Public slot to return the completion status.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the completion status (boolean)
+</dd>
+</dl><a NAME="Task.isProjectTask" ID="Task.isProjectTask"></a>
+<h4>Task.isProjectTask</h4>
+<b>isProjectTask</b>(<i></i>)
+<p>
+        Public slot to return the project relation status.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the project relation status (boolean)
+</dd>
+</dl><a NAME="Task.setCompleted" ID="Task.setCompleted"></a>
+<h4>Task.setCompleted</h4>
+<b>setCompleted</b>(<i>completed</i>)
+<p>
+        Public slot to update the completed flag.
+</p><dl>
+<dt><i>completed</i></dt>
+<dd>
+flag indicating completion status (boolean)
+</dd>
+</dl><a NAME="Task.setDescription" ID="Task.setDescription"></a>
+<h4>Task.setDescription</h4>
+<b>setDescription</b>(<i>description</i>)
+<p>
+        Public slot to update the description.
+</p><dl>
+<dt><i>longtext</i></dt>
+<dd>
+explanatory text of the task (string)
+</dd>
+</dl><a NAME="Task.setLongText" ID="Task.setLongText"></a>
+<h4>Task.setLongText</h4>
+<b>setLongText</b>(<i>longtext</i>)
+<p>
+        Public slot to update the longtext field.
+</p><dl>
+<dt><i>longtext</i></dt>
+<dd>
+descriptive text of the task (string)
+</dd>
+</dl><a NAME="Task.setPriority" ID="Task.setPriority"></a>
+<h4>Task.setPriority</h4>
+<b>setPriority</b>(<i>priority</i>)
+<p>
+        Public slot to update the priority.
+</p><dl>
+<dt><i>priority</i></dt>
+<dd>
+priority of the task (0=high, 1=normal, 2=low)
+</dd>
+</dl><a NAME="Task.setProjectTask" ID="Task.setProjectTask"></a>
+<h4>Task.setProjectTask</h4>
+<b>setProjectTask</b>(<i>pt</i>)
+<p>
+        Public method to set the project relation flag.
+</p><dl>
+<dt><i>pt</i></dt>
+<dd>
+flag indicating a project task (boolean)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric5.Tasks.TaskFilter.html	Sun Apr 29 16:42:02 2012 +0200
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
+<html><head>
+<title>eric5.Tasks.TaskFilter</title>
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric5.Tasks.TaskFilter</h1>
+<p>
+Module implementing a class to store task data.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#TaskFilter">TaskFilter</a></td>
+<td>Class implementing a filter for tasks.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="TaskFilter" ID="TaskFilter"></a>
+<h2>TaskFilter</h2>
+<p>
+    Class implementing a filter for tasks.
+</p>
+<h3>Derived from</h3>
+object
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#TaskFilter.__init__">TaskFilter</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#TaskFilter.hasActiveFilter">hasActiveFilter</a></td>
+<td>Public method to check for active filters.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setActive">setActive</a></td>
+<td>Public method to activate the filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setDescriptionFilter">setDescriptionFilter</a></td>
+<td>Public method to set the description filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setFileNameFilter">setFileNameFilter</a></td>
+<td>Public method to set the filename filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setPrioritiesFilter">setPrioritiesFilter</a></td>
+<td>Public method to set the priorities filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setScopeFilter">setScopeFilter</a></td>
+<td>Public method to set the scope filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setStatusFilter">setStatusFilter</a></td>
+<td>Public method to set the status filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.setTypeFilter">setTypeFilter</a></td>
+<td>Public method to set the type filter.</td>
+</tr><tr>
+<td><a href="#TaskFilter.showTask">showTask</a></td>
+<td>Public method to check, if a task should be shown.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="TaskFilter.__init__" ID="TaskFilter.__init__"></a>
+<h4>TaskFilter (Constructor)</h4>
+<b>TaskFilter</b>(<i></i>)
+<p>
+        Constructor
+</p><a NAME="TaskFilter.hasActiveFilter" ID="TaskFilter.hasActiveFilter"></a>
+<h4>TaskFilter.hasActiveFilter</h4>
+<b>hasActiveFilter</b>(<i></i>)
+<p>
+        Public method to check for active filters.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating an active filter was found (boolean)
+</dd>
+</dl><a NAME="TaskFilter.setActive" ID="TaskFilter.setActive"></a>
+<h4>TaskFilter.setActive</h4>
+<b>setActive</b>(<i>enabled</i>)
+<p>
+        Public method to activate the filter.
+</p><dl>
+<dt><i>enabled</i></dt>
+<dd>
+flag indicating the activation state (boolean)
+</dd>
+</dl><a NAME="TaskFilter.setDescriptionFilter" ID="TaskFilter.setDescriptionFilter"></a>
+<h4>TaskFilter.setDescriptionFilter</h4>
+<b>setDescriptionFilter</b>(<i>filter</i>)
+<p>
+        Public method to set the description filter.
+</p><dl>
+<dt><i>filter</i></dt>
+<dd>
+a regular expression for the description filter
+            to set (string) or None
+</dd>
+</dl><a NAME="TaskFilter.setFileNameFilter" ID="TaskFilter.setFileNameFilter"></a>
+<h4>TaskFilter.setFileNameFilter</h4>
+<b>setFileNameFilter</b>(<i>filter</i>)
+<p>
+        Public method to set the filename filter.
+</p><dl>
+<dt><i>filter</i></dt>
+<dd>
+a wildcard expression for the filename filter
+            to set (string) or None
+</dd>
+</dl><a NAME="TaskFilter.setPrioritiesFilter" ID="TaskFilter.setPrioritiesFilter"></a>
+<h4>TaskFilter.setPrioritiesFilter</h4>
+<b>setPrioritiesFilter</b>(<i>priorities</i>)
+<p>
+        Public method to set the priorities filter.
+</p><dl>
+<dt><i>priorities</i></dt>
+<dd>
+list of task priorities (list of integer) or None
+</dd>
+</dl><a NAME="TaskFilter.setScopeFilter" ID="TaskFilter.setScopeFilter"></a>
+<h4>TaskFilter.setScopeFilter</h4>
+<b>setScopeFilter</b>(<i>scope</i>)
+<p>
+        Public method to set the scope filter.
+</p><dl>
+<dt><i>scope</i></dt>
+<dd>
+flag indicating a project task (boolean) or None
+</dd>
+</dl><a NAME="TaskFilter.setStatusFilter" ID="TaskFilter.setStatusFilter"></a>
+<h4>TaskFilter.setStatusFilter</h4>
+<b>setStatusFilter</b>(<i>status</i>)
+<p>
+        Public method to set the status filter.
+</p><dl>
+<dt><i>status</i></dt>
+<dd>
+flag indicating a completed task (boolean) or None
+</dd>
+</dl><a NAME="TaskFilter.setTypeFilter" ID="TaskFilter.setTypeFilter"></a>
+<h4>TaskFilter.setTypeFilter</h4>
+<b>setTypeFilter</b>(<i>taskType</i>)
+<p>
+        Public method to set the type filter.
+</p><dl>
+<dt><i>taskType</i></dt>
+<dd>
+type of the task (one of Task.TypeNone, Task.TypeFixme,
+            Task.TypeTodo, Task.TypeWarning, Task.TypeNote)
+</dd>
+</dl><a NAME="TaskFilter.showTask" ID="TaskFilter.showTask"></a>
+<h4>TaskFilter.showTask</h4>
+<b>showTask</b>(<i>task</i>)
+<p>
+        Public method to check, if a task should be shown.
+</p><dl>
+<dt><i>task</i></dt>
+<dd>
+reference to the task object to check (Task)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating whether the task should be shown (boolean)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric5.Tasks.TaskFilterConfigDialog.html	Sat Apr 28 17:00:32 2012 +0200
+++ b/Documentation/Source/eric5.Tasks.TaskFilterConfigDialog.html	Sun Apr 29 16:42:02 2012 +0200
@@ -62,7 +62,7 @@
 <td>Constructor</td>
 </tr><tr>
 <td><a href="#TaskFilterConfigDialog.configureTaskFilter">configureTaskFilter</a></td>
-<td>Public method to set the parameters of the task filter object..</td>
+<td>Public method to set the parameters of the task filter object.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -86,7 +86,7 @@
 <h4>TaskFilterConfigDialog.configureTaskFilter</h4>
 <b>configureTaskFilter</b>(<i>taskFilter</i>)
 <p>
-        Public method to set the parameters of the task filter object..
+        Public method to set the parameters of the task filter object.
 </p><dl>
 <dt><i>taskFilter</i></dt>
 <dd>
--- a/Documentation/Source/eric5.Tasks.TaskViewer.html	Sat Apr 28 17:00:32 2012 +0200
+++ b/Documentation/Source/eric5.Tasks.TaskViewer.html	Sun Apr 29 16:42:02 2012 +0200
@@ -35,12 +35,6 @@
 <h3>Classes</h3>
 <table>
 <tr>
-<td><a href="#Task">Task</a></td>
-<td>Class implementing the task data structure.</td>
-</tr><tr>
-<td><a href="#TaskFilter">TaskFilter</a></td>
-<td>Class implementing a filter for tasks.</td>
-</tr><tr>
 <td><a href="#TaskViewer">TaskViewer</a></td>
 <td>Class implementing the task viewer.</td>
 </tr>
@@ -50,359 +44,6 @@
 <tr><td>None</td></tr>
 </table>
 <hr /><hr />
-<a NAME="Task" ID="Task"></a>
-<h2>Task</h2>
-<p>
-    Class implementing the task data structure.
-</p>
-<h3>Derived from</h3>
-QTreeWidgetItem
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#Task.__init__">Task</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#Task.colorizeTask">colorizeTask</a></td>
-<td>Public slot to set the colors of the task item.</td>
-</tr><tr>
-<td><a href="#Task.getFilename">getFilename</a></td>
-<td>Public method to retrieve the tasks filename.</td>
-</tr><tr>
-<td><a href="#Task.getLineno">getLineno</a></td>
-<td>Public method to retrieve the tasks linenumber.</td>
-</tr><tr>
-<td><a href="#Task.isCompleted">isCompleted</a></td>
-<td>Public slot to return the completion status.</td>
-</tr><tr>
-<td><a href="#Task.isProjectTask">isProjectTask</a></td>
-<td>Public slot to return the project relation status.</td>
-</tr><tr>
-<td><a href="#Task.setCompleted">setCompleted</a></td>
-<td>Public slot to update the completed flag.</td>
-</tr><tr>
-<td><a href="#Task.setDescription">setDescription</a></td>
-<td>Public slot to update the description.</td>
-</tr><tr>
-<td><a href="#Task.setLongText">setLongText</a></td>
-<td>Public slot to update the longtext field.</td>
-</tr><tr>
-<td><a href="#Task.setPriority">setPriority</a></td>
-<td>Public slot to update the priority.</td>
-</tr><tr>
-<td><a href="#Task.setProjectTask">setProjectTask</a></td>
-<td>Public method to set the project relation flag.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="Task.__init__" ID="Task.__init__"></a>
-<h4>Task (Constructor)</h4>
-<b>Task</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, project=None, longtext=""</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>parent</i></dt>
-<dd>
-parent widget of the task (QWidget)
-</dd><dt><i>description</i></dt>
-<dd>
-descriptive text of the task (string)
-</dd><dt><i>priority</i></dt>
-<dd>
-priority of the task (0=high, 1=normal, 2=low)
-</dd><dt><i>filename</i></dt>
-<dd>
-filename containing the task (string)
-</dd><dt><i>lineno</i></dt>
-<dd>
-line number containing the task (integer)
-</dd><dt><i>completed</i></dt>
-<dd>
-flag indicating completion status (boolean)
-</dd><dt><i>_time</i></dt>
-<dd>
-creation time of the task (float, if 0 use current time)
-</dd><dt><i>isProjectTask</i></dt>
-<dd>
-flag indicating a task related to the current project
-            (boolean)
-</dd><dt><i>isBugfixTask</i></dt>
-<dd>
-flag indicating a bugfix task (boolean)
-</dd><dt><i>project</i></dt>
-<dd>
-reference to the project object (Project)
-</dd><dt><i>longtext</i></dt>
-<dd>
-explanatory text of the task (string)
-</dd>
-</dl><a NAME="Task.colorizeTask" ID="Task.colorizeTask"></a>
-<h4>Task.colorizeTask</h4>
-<b>colorizeTask</b>(<i></i>)
-<p>
-        Public slot to set the colors of the task item.
-</p><a NAME="Task.getFilename" ID="Task.getFilename"></a>
-<h4>Task.getFilename</h4>
-<b>getFilename</b>(<i></i>)
-<p>
-        Public method to retrieve the tasks filename.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-filename (string)
-</dd>
-</dl><a NAME="Task.getLineno" ID="Task.getLineno"></a>
-<h4>Task.getLineno</h4>
-<b>getLineno</b>(<i></i>)
-<p>
-        Public method to retrieve the tasks linenumber.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-linenumber (integer)
-</dd>
-</dl><a NAME="Task.isCompleted" ID="Task.isCompleted"></a>
-<h4>Task.isCompleted</h4>
-<b>isCompleted</b>(<i></i>)
-<p>
-        Public slot to return the completion status.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating the completion status (boolean)
-</dd>
-</dl><a NAME="Task.isProjectTask" ID="Task.isProjectTask"></a>
-<h4>Task.isProjectTask</h4>
-<b>isProjectTask</b>(<i></i>)
-<p>
-        Public slot to return the project relation status.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating the project relation status (boolean)
-</dd>
-</dl><a NAME="Task.setCompleted" ID="Task.setCompleted"></a>
-<h4>Task.setCompleted</h4>
-<b>setCompleted</b>(<i>completed</i>)
-<p>
-        Public slot to update the completed flag.
-</p><dl>
-<dt><i>completed</i></dt>
-<dd>
-flag indicating completion status (boolean)
-</dd>
-</dl><a NAME="Task.setDescription" ID="Task.setDescription"></a>
-<h4>Task.setDescription</h4>
-<b>setDescription</b>(<i>description</i>)
-<p>
-        Public slot to update the description.
-</p><dl>
-<dt><i>longtext</i></dt>
-<dd>
-explanatory text of the task (string)
-</dd>
-</dl><a NAME="Task.setLongText" ID="Task.setLongText"></a>
-<h4>Task.setLongText</h4>
-<b>setLongText</b>(<i>longtext</i>)
-<p>
-        Public slot to update the longtext field.
-</p><dl>
-<dt><i>longtext</i></dt>
-<dd>
-descriptive text of the task (string)
-</dd>
-</dl><a NAME="Task.setPriority" ID="Task.setPriority"></a>
-<h4>Task.setPriority</h4>
-<b>setPriority</b>(<i>priority</i>)
-<p>
-        Public slot to update the priority.
-</p><dl>
-<dt><i>priority</i></dt>
-<dd>
-priority of the task (0=high, 1=normal, 2=low)
-</dd>
-</dl><a NAME="Task.setProjectTask" ID="Task.setProjectTask"></a>
-<h4>Task.setProjectTask</h4>
-<b>setProjectTask</b>(<i>pt</i>)
-<p>
-        Public method to set the project relation flag.
-</p><dl>
-<dt><i>pt</i></dt>
-<dd>
-flag indicating a project task (boolean)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
-<a NAME="TaskFilter" ID="TaskFilter"></a>
-<h2>TaskFilter</h2>
-<p>
-    Class implementing a filter for tasks.
-</p>
-<h3>Derived from</h3>
-object
-<h3>Class Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#TaskFilter.__init__">TaskFilter</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#TaskFilter.hasActiveFilter">hasActiveFilter</a></td>
-<td>Public method to check for active filters.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setActive">setActive</a></td>
-<td>Public method to activate the filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setDescriptionFilter">setDescriptionFilter</a></td>
-<td>Public method to set the description filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setFileNameFilter">setFileNameFilter</a></td>
-<td>Public method to set the filename filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setPrioritiesFilter">setPrioritiesFilter</a></td>
-<td>Public method to set the priorities filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setScopeFilter">setScopeFilter</a></td>
-<td>Public method to set the scope filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setStatusFilter">setStatusFilter</a></td>
-<td>Public method to set the status filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.setTypeFilter">setTypeFilter</a></td>
-<td>Public method to set the type filter.</td>
-</tr><tr>
-<td><a href="#TaskFilter.showTask">showTask</a></td>
-<td>Public method to check, if a task should be shown.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="TaskFilter.__init__" ID="TaskFilter.__init__"></a>
-<h4>TaskFilter (Constructor)</h4>
-<b>TaskFilter</b>(<i></i>)
-<p>
-        Constructor
-</p><a NAME="TaskFilter.hasActiveFilter" ID="TaskFilter.hasActiveFilter"></a>
-<h4>TaskFilter.hasActiveFilter</h4>
-<b>hasActiveFilter</b>(<i></i>)
-<p>
-        Public method to check for active filters.
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating an active filter was found (boolean)
-</dd>
-</dl><a NAME="TaskFilter.setActive" ID="TaskFilter.setActive"></a>
-<h4>TaskFilter.setActive</h4>
-<b>setActive</b>(<i>enabled</i>)
-<p>
-        Public method to activate the filter.
-</p><dl>
-<dt><i>enabled</i></dt>
-<dd>
-flag indicating the activation state (boolean)
-</dd>
-</dl><a NAME="TaskFilter.setDescriptionFilter" ID="TaskFilter.setDescriptionFilter"></a>
-<h4>TaskFilter.setDescriptionFilter</h4>
-<b>setDescriptionFilter</b>(<i>filter</i>)
-<p>
-        Public method to set the description filter.
-</p><dl>
-<dt><i>filter</i></dt>
-<dd>
-a regular expression for the description filter
-            to set (string) or None
-</dd>
-</dl><a NAME="TaskFilter.setFileNameFilter" ID="TaskFilter.setFileNameFilter"></a>
-<h4>TaskFilter.setFileNameFilter</h4>
-<b>setFileNameFilter</b>(<i>filter</i>)
-<p>
-        Public method to set the filename filter.
-</p><dl>
-<dt><i>filter</i></dt>
-<dd>
-a wildcard expression for the filename filter
-            to set (string) or None
-</dd>
-</dl><a NAME="TaskFilter.setPrioritiesFilter" ID="TaskFilter.setPrioritiesFilter"></a>
-<h4>TaskFilter.setPrioritiesFilter</h4>
-<b>setPrioritiesFilter</b>(<i>priorities</i>)
-<p>
-        Public method to set the priorities filter.
-</p><dl>
-<dt><i>priorities</i></dt>
-<dd>
-list of task priorities (list of integer) or None
-</dd>
-</dl><a NAME="TaskFilter.setScopeFilter" ID="TaskFilter.setScopeFilter"></a>
-<h4>TaskFilter.setScopeFilter</h4>
-<b>setScopeFilter</b>(<i>scope</i>)
-<p>
-        Public method to set the scope filter.
-</p><dl>
-<dt><i>scope</i></dt>
-<dd>
-flag indicating a project task (boolean) or None
-</dd>
-</dl><a NAME="TaskFilter.setStatusFilter" ID="TaskFilter.setStatusFilter"></a>
-<h4>TaskFilter.setStatusFilter</h4>
-<b>setStatusFilter</b>(<i>status</i>)
-<p>
-        Public method to set the status filter.
-</p><dl>
-<dt><i>status</i></dt>
-<dd>
-flag indicating a completed task (boolean) or None
-</dd>
-</dl><a NAME="TaskFilter.setTypeFilter" ID="TaskFilter.setTypeFilter"></a>
-<h4>TaskFilter.setTypeFilter</h4>
-<b>setTypeFilter</b>(<i>type_</i>)
-<p>
-        Public method to set the type filter.
-</p><dl>
-<dt><i>type_</i></dt>
-<dd>
-flag indicating a bugfix task (boolean) or None
-</dd>
-</dl><a NAME="TaskFilter.showTask" ID="TaskFilter.showTask"></a>
-<h4>TaskFilter.showTask</h4>
-<b>showTask</b>(<i>task</i>)
-<p>
-        Public method to check, if a task should be shown.
-</p><dl>
-<dt><i>task</i></dt>
-<dd>
-reference to the task object to check (Task)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating whether the task should be shown (boolean)
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
 <a NAME="TaskViewer" ID="TaskViewer"></a>
 <h2>TaskViewer</h2>
 <p>
@@ -642,7 +283,7 @@
 </dd>
 </dl><a NAME="TaskViewer.addFileTask" ID="TaskViewer.addFileTask"></a>
 <h4>TaskViewer.addFileTask</h4>
-<b>addFileTask</b>(<i>description, filename, lineno, isBugfixTask=False, longtext=""</i>)
+<b>addFileTask</b>(<i>description, filename, lineno, taskType=Task.TypeTodo, longtext=""</i>)
 <p>
         Public slot to add a file related task.
 </p><dl>
@@ -655,16 +296,17 @@
 </dd><dt><i>lineno</i></dt>
 <dd>
 line number containing the task (integer)
-</dd><dt><i>isBugfixTask</i></dt>
+</dd><dt><i>taskType</i></dt>
 <dd>
-flag indicating a bugfix task (boolean)
+type of the task (one of Task.TypeFixme, Task.TypeTodo,
+            Task.TypeWarning, Task.TypeNote)
 </dd><dt><i>longtext</i></dt>
 <dd>
 explanatory text of the task (string)
 </dd>
 </dl><a NAME="TaskViewer.addTask" ID="TaskViewer.addTask"></a>
 <h4>TaskViewer.addTask</h4>
-<b>addTask</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, isBugfixTask=False, longtext=""</i>)
+<b>addTask</b>(<i>description, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=Task.TypeTodo, longtext=""</i>)
 <p>
         Public slot to add a task.
 </p><dl>
@@ -690,9 +332,10 @@
 <dd>
 flag indicating a task related to the current
             project (boolean)
-</dd><dt><i>isBugfixTask</i></dt>
+</dd><dt><i>taskType</i></dt>
 <dd>
-flag indicating a bugfix task (boolean)
+type of the task (one of Task.TypeFixme, Task.TypeTodo,
+            Task.TypeWarning, Task.TypeNote)
 </dd><dt><i>longtext</i></dt>
 <dd>
 explanatory text of the task (string)
--- a/Documentation/Source/index-eric5.Tasks.html	Sat Apr 28 17:00:32 2012 +0200
+++ b/Documentation/Source/index-eric5.Tasks.html	Sun Apr 29 16:42:02 2012 +0200
@@ -29,6 +29,12 @@
 <h3>Modules</h3>
 <table>
 <tr>
+<td><a href="eric5.Tasks.Task.html">Task</a></td>
+<td>Module implementing a class to store task data.</td>
+</tr><tr>
+<td><a href="eric5.Tasks.TaskFilter.html">TaskFilter</a></td>
+<td>Module implementing a class to store task data.</td>
+</tr><tr>
 <td><a href="eric5.Tasks.TaskFilterConfigDialog.html">TaskFilterConfigDialog</a></td>
 <td>Module implementing the task filter configuration dialog.</td>
 </tr><tr>
--- a/E5XML/Config.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/E5XML/Config.py	Sun Apr 29 16:42:02 2012 +0200
@@ -23,7 +23,7 @@
 shortcutsFileFormatVersion = "3.6"
 
 # version number of the tasks file
-tasksFileFormatVersion = "5.0"
+tasksFileFormatVersion = "5.1"
 
 # version number of the debugger properties file
 debuggerPropertiesFileFormatVersion = "3.9"
--- a/E5XML/TasksReader.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/E5XML/TasksReader.py	Sun Apr 29 16:42:02 2012 +0200
@@ -14,6 +14,8 @@
 from .Config import tasksFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
 
+from Tasks.Task import Task
+
 import Utilities
 
 
@@ -21,7 +23,7 @@
     """
     Class for reading an XML tasks file.
     """
-    supportedVersions = ["4.2", "5.0"]
+    supportedVersions = ["4.2", "5.0", "5.1"]
     
     def __init__(self, device, forProject=False, viewer=None):
         """
@@ -75,12 +77,17 @@
                 "created": 0,
                 "filename": "",
                 "linenumber": 0,
-                "bugfix": False,
+                "type": Task.TypeTodo,
                 "description": "",
                }
         task["priority"] = int(self.attribute("priority", "1"))
         task["completed"] = self.toBool(self.attribute("completed", "False"))
-        task["bugfix"] = self.toBool(self.attribute("bugfix", "False"))
+        if self.version in ["4.2", "5.0"]:
+            isBugfix = self.toBool(self.attribute("bugfix", "False"))
+            if isBugfix:
+                task["type"] = Task.TypeFixme
+        else:
+            task["type"] = int(self.attribute("type", str(Task.TypeTodo)))
         
         while not self.atEnd():
             self.readNext()
@@ -88,7 +95,7 @@
                 self.viewer.addTask(task["summary"], priority=task["priority"],
                     filename=task["filename"], lineno=task["linenumber"],
                     completed=task["completed"], _time=task["created"],
-                    isProjectTask=self.forProject, isBugfixTask=task["bugfix"],
+                    isProjectTask=self.forProject, taskType=task["type"],
                     longtext=task["description"])
                 break
             
--- a/E5XML/TasksWriter.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/E5XML/TasksWriter.py	Sun Apr 29 16:42:02 2012 +0200
@@ -72,7 +72,7 @@
             self.writeStartElement("Task")
             self.writeAttribute("priority", str(task.priority))
             self.writeAttribute("completed", str(task.completed))
-            self.writeAttribute("bugfix", str(task.isBugfixTask))
+            self.writeAttribute("type", str(task.taskType))
             self.writeTextElement("Summary", task.description.strip())
             self.writeTextElement("Description", task.longtext.strip())
             self.writeTextElement("Created",
--- a/Preferences/ConfigurationPages/TasksPage.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/Preferences/ConfigurationPages/TasksPage.py	Sun Apr 29 16:42:02 2012 +0200
@@ -30,20 +30,26 @@
         self.tasksColours = {}
         
         # set initial values
-        self.tasksMarkerEdit.setText(Preferences.getTasks("TasksMarkers"))
-        self.tasksMarkerBugfixEdit.setText(
-            Preferences.getTasks("TasksMarkersBugfix"))
+        self.tasksMarkerFixmeEdit.setText(
+            Preferences.getTasks("TasksFixmeMarkers"))
+        self.tasksMarkerWarningEdit.setText(
+            Preferences.getTasks("TasksWarningMarkers"))
+        self.tasksMarkerTodoEdit.setText(
+            Preferences.getTasks("TasksTodoMarkers"))
+        self.tasksMarkerNoteEdit.setText(
+            Preferences.getTasks("TasksNoteMarkers"))
         
-        self.tasksColours["TasksColour"] = \
-            self.initColour("TasksColour", self.tasksColourButton, Preferences.getTasks)
-        self.tasksColours["TasksBugfixColour"] = \
-            self.initColour("TasksBugfixColour", self.tasksBugfixColourButton,
+        self.tasksColours["TasksFixmeColor"] = \
+            self.initColour("TasksFixmeColor", self.tasksFixmeColourButton,
+                Preferences.getTasks)
+        self.tasksColours["TasksWarningColor"] = \
+            self.initColour("TasksWarningColor", self.tasksWarningColourButton,
                 Preferences.getTasks)
-        self.tasksColours["TasksBgColour"] = \
-            self.initColour("TasksBgColour", self.tasksBgColourButton,
+        self.tasksColours["TasksTodoColor"] = \
+            self.initColour("TasksTodoColor", self.tasksTodoColourButton,
                 Preferences.getTasks)
-        self.tasksColours["TasksProjectBgColour"] = \
-            self.initColour("TasksProjectBgColour", self.tasksProjectBgColourButton,
+        self.tasksColours["TasksNoteColor"] = \
+            self.initColour("TasksNoteColor", self.tasksNoteColourButton,
                 Preferences.getTasks)
         
         self.clearCheckBox.setChecked(Preferences.getTasks("ClearOnFileClose"))
@@ -52,15 +58,20 @@
         """
         Public slot to save the Tasks configuration.
         """
-        Preferences.setTasks("TasksMarkers", self.tasksMarkerEdit.text())
-        Preferences.setTasks("TasksMarkersBugfix",
-            self.tasksMarkerBugfixEdit.text())
+        Preferences.setTasks("TasksFixmeMarkers",
+            self.tasksMarkerFixmeEdit.text())
+        Preferences.setTasks("TasksWarningMarkers",
+            self.tasksMarkerWarningEdit.text())
+        Preferences.setTasks("TasksTodoMarkers",
+            self.tasksMarkerTodoEdit.text())
+        Preferences.setTasks("TasksNoteMarkers",
+            self.tasksMarkerNoteEdit.text())
         for key in list(self.tasksColours.keys()):
             Preferences.setTasks(key, self.tasksColours[key])
         Preferences.setTasks("ClearOnFileClose", self.clearCheckBox.isChecked())
         
     @pyqtSlot()
-    def on_tasksColourButton_clicked(self):
+    def on_tasksFixmeColourButton_clicked(self):
         """
         Private slot to set the colour for standard tasks.
         """
@@ -68,7 +79,7 @@
             self.selectColour(self.tasksColourButton, self.tasksColours["TasksColour"])
         
     @pyqtSlot()
-    def on_tasksBugfixColourButton_clicked(self):
+    def on_tasksWarningColourButton_clicked(self):
         """
         Private slot to set the colour for bugfix tasks.
         """
@@ -77,7 +88,7 @@
                 self.tasksColours["TasksBugfixColour"])
         
     @pyqtSlot()
-    def on_tasksBgColourButton_clicked(self):
+    def on_tasksTodoColourButton_clicked(self):
         """
         Private slot to set the background colour for global tasks.
         """
@@ -86,7 +97,7 @@
                 self.tasksColours["TasksBgColour"])
         
     @pyqtSlot()
-    def on_tasksProjectBgColourButton_clicked(self):
+    def on_tasksNoteColourButton_clicked(self):
         """
         Private slot to set the backgroundcolour for project tasks.
         """
--- a/Preferences/ConfigurationPages/TasksPage.ui	Sat Apr 28 17:00:32 2012 +0200
+++ b/Preferences/ConfigurationPages/TasksPage.ui	Sun Apr 29 16:42:02 2012 +0200
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>586</width>
-    <height>443</height>
+    <height>475</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -36,23 +36,16 @@
      <property name="title">
       <string>Tasks Markers</string>
      </property>
-     <layout class="QGridLayout">
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="tasksMarkerEdit">
-        <property name="toolTip">
-         <string>Enter the tasks markers separated by a space character.</string>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="textLabel5_3">
+        <property name="text">
+         <string>Bugfix tasks:</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="textLabel4_3">
-        <property name="text">
-         <string>Standard tasks:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="tasksMarkerBugfixEdit">
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="tasksMarkerFixmeEdit">
         <property name="toolTip">
          <string>Enter the tasks markers separated by a space character.</string>
         </property>
@@ -62,9 +55,44 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="textLabel5_3">
+       <widget class="QLabel" name="textLabel4_4">
+        <property name="text">
+         <string>Warning tasks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="tasksMarkerWarningEdit">
+        <property name="toolTip">
+         <string>Enter the tasks markers separated by a space character.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="textLabel4_3">
         <property name="text">
-         <string>Bugfix tasks:</string>
+         <string>Todo tasks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="tasksMarkerTodoEdit">
+        <property name="toolTip">
+         <string>Enter the tasks markers separated by a space character.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="textLabel4_5">
+        <property name="text">
+         <string>Note tasks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="tasksMarkerNoteEdit">
+        <property name="toolTip">
+         <string>Enter the tasks markers separated by a space character.</string>
         </property>
        </widget>
       </item>
@@ -74,43 +102,18 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
-      <string>Tasks Colours</string>
+      <string>Tasks Background Colours</string>
      </property>
-     <layout class="QGridLayout">
-      <item row="3" column="1">
-       <widget class="QPushButton" name="tasksProjectBgColourButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the background colour for project tasks.</string>
-        </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="textLabel2_8">
         <property name="text">
-         <string/>
+         <string>Bugfix tasks:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="tasksBgColourButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the background colour for global tasks.</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="tasksBugfixColourButton">
+      <item row="0" column="1">
+       <widget class="QPushButton" name="tasksFixmeColourButton">
         <property name="minimumSize">
          <size>
           <width>100</width>
@@ -118,58 +121,14 @@
          </size>
         </property>
         <property name="toolTip">
-         <string>Select the colour for bugfix tasks.</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="tasksColourButton">
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the colour for standard tasks.</string>
+         <string>Select the background colour for these tasks.</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="textLabel2_8">
-        <property name="text">
-         <string>Bugfix tasks foreground colour:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="textLabel6_3">
-        <property name="text">
-         <string>Global tasks background colour:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="textLabel3_4">
-        <property name="text">
-         <string>Project tasks background colour:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="textLabel1_3">
-        <property name="text">
-         <string>Standard tasks foreground colour:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
+      <item row="0" column="2">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -182,6 +141,75 @@
         </property>
        </spacer>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="textLabel6_3">
+        <property name="text">
+         <string>Warning tasks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="tasksWarningColourButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the background colour for these tasks.</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="textLabel1_3">
+        <property name="text">
+         <string>Todo tasks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="tasksTodoColourButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the background colour for these tasks.</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="textLabel3_4">
+        <property name="text">
+         <string>Note tasks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QPushButton" name="tasksNoteColourButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the background colour for these tasks.</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -220,12 +248,15 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>tasksMarkerEdit</tabstop>
-  <tabstop>tasksMarkerBugfixEdit</tabstop>
-  <tabstop>tasksColourButton</tabstop>
-  <tabstop>tasksBugfixColourButton</tabstop>
-  <tabstop>tasksBgColourButton</tabstop>
-  <tabstop>tasksProjectBgColourButton</tabstop>
+  <tabstop>tasksMarkerFixmeEdit</tabstop>
+  <tabstop>tasksMarkerWarningEdit</tabstop>
+  <tabstop>tasksMarkerTodoEdit</tabstop>
+  <tabstop>tasksMarkerNoteEdit</tabstop>
+  <tabstop>tasksFixmeColourButton</tabstop>
+  <tabstop>tasksWarningColourButton</tabstop>
+  <tabstop>tasksTodoColourButton</tabstop>
+  <tabstop>tasksNoteColourButton</tabstop>
+  <tabstop>clearCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
--- a/Preferences/__init__.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/Preferences/__init__.py	Sun Apr 29 16:42:02 2012 +0200
@@ -811,13 +811,15 @@
     
     # defaults for tasks related stuff
     tasksDefaults = {
-        "TasksMarkers": "TO" + "DO:",
-        "TasksMarkersBugfix": "FIX" + "ME:",
+        "TasksFixmeMarkers": "FIX" + "ME:",
+        "TasksWarningMarkers": "WARN" + "ING:",
+        "TasksTodoMarkers": "TO" + "DO:",
+        "TasksNoteMarkers": "NO" + "TE:",
         # needed to keep it from being recognized as a task
-        "TasksColour": QColor(Qt.black),
-        "TasksBugfixColour": QColor(Qt.red),
-        "TasksBgColour": QColor(Qt.white),
-        "TasksProjectBgColour": QColor(Qt.lightGray),
+        "TasksFixmeColor": QColor("#FFA0A0"),
+        "TasksWarningColor": QColor("#FFFFA0"),
+        "TasksTodoColor": QColor("#A0FFA0"),
+        "TasksNoteColor": QColor("#A0A0FF"),
         "ClearOnFileClose": True,
         "TasksProjectAutoSave": True,
     }
@@ -2300,8 +2302,8 @@
     @param prefClass preferences class used as the storage area
     @return the requested user setting
     """
-    if key in ["TasksColour", "TasksBugfixColour",
-               "TasksBgColour", "TasksProjectBgColour"]:
+    if key in ["TasksFixmeColor", "TasksWarningColor",
+               "TasksTodoColor", "TasksNoteColor"]:
         col = prefClass.settings.value("Tasks/" + key)
         if col is not None:
             return QColor(col)
@@ -2323,8 +2325,8 @@
     @param value the value to be set
     @param prefClass preferences class used as the storage area
     """
-    if key in ["TasksColour", "TasksBugfixColour",
-               "TasksBgColour", "TasksProjectBgColour"]:
+    if key in ["TasksFixmeColor", "TasksWarningColor",
+               "TasksTodoColor", "TasksNoteColor"]:
         prefClass.settings.setValue("Tasks/" + key, value.name())
     else:
         prefClass.settings.setValue("Tasks/" + key, value)
--- a/Project/CreateDialogCodeDialog.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/Project/CreateDialogCodeDialog.py	Sun Apr 29 16:42:02 2012 +0200
@@ -82,6 +82,8 @@
             except ImportError:
                 pass
         
+        # NOTE: improve parsing by recording unrecognized classes and allowing the
+        #       user to select one
         if self.__module is not None:
             self.filenameEdit.setText(self.srcFile)
             
--- a/QScintilla/Editor.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/QScintilla/Editor.py	Sun Apr 29 16:42:02 2012 +0200
@@ -34,6 +34,8 @@
 from DataViews.PyCoverageDialog import PyCoverageDialog
 from DataViews.PyProfileDialog import PyProfileDialog
 
+from Tasks.Task import Task
+
 from .Printer import Printer
 
 import Preferences
@@ -2311,8 +2313,12 @@
         """
         Public slot to extract all tasks.
         """
-        todoMarkers = Preferences.getTasks("TasksMarkers").split()
-        bugfixMarkers = Preferences.getTasks("TasksMarkersBugfix").split()
+        markers = {
+            Task.TypeWarning: Preferences.getTasks("TasksWarningMarkers").split(),
+            Task.TypeNote: Preferences.getTasks("TasksNoteMarkers").split(),
+            Task.TypeTodo: Preferences.getTasks("TasksTodoMarkers").split(),
+            Task.TypeFixme: Preferences.getTasks("TasksFixmeMarkers").split(),
+        }
         txtList = self.text().split(self.getLineSeparator())
         
         # clear all task markers and tasks
@@ -2324,28 +2330,20 @@
         lineIndex = -1
         for line in txtList:
             lineIndex += 1
-            shouldContinue = False
-            # normal tasks first
-            for tasksMarker in todoMarkers:
-                index = line.find(tasksMarker)
-                if index > -1:
-                    task = line[index:]
-                    self.markerAdd(lineIndex, self.taskmarker)
-                    self.taskViewer.addFileTask(task, self.fileName, lineIndex + 1, False)
-                    self.__hasTaskMarkers = True
-                    shouldContinue = True
-                    break
-            if shouldContinue:
-                continue
+            shouldBreak = False
             
-            # bugfix tasks second
-            for tasksMarker in bugfixMarkers:
-                index = line.find(tasksMarker)
-                if index > -1:
-                    task = line[index:]
-                    self.markerAdd(lineIndex, self.taskmarker)
-                    self.taskViewer.addFileTask(task, self.fileName, lineIndex + 1, True)
-                    self.__hasTaskMarkers = True
+            for taskType, taskMarkers in markers.items():
+                for taskMarker in taskMarkers:
+                    index = line.find(taskMarker)
+                    if index > -1:
+                        task = line[index:]
+                        self.markerAdd(lineIndex, self.taskmarker)
+                        self.taskViewer.addFileTask(task, self.fileName, lineIndex + 1,
+                                                    taskType)
+                        self.__hasTaskMarkers = True
+                        shouldBreak = True
+                        break
+                if shouldBreak:
                     break
         self.taskMarkersUpdated.emit(self)
     
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Tasks/Task.py	Sun Apr 29 16:42:02 2012 +0200
@@ -0,0 +1,222 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2005 - 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a class to store task data.
+"""
+
+import os
+import time
+
+from PyQt4.QtCore import Qt
+from PyQt4.QtGui import QTreeWidgetItem
+
+import UI.PixmapCache
+import Preferences
+
+
+class Task(QTreeWidgetItem):
+    """
+    Class implementing the task data structure.
+    """
+    TypeNone = -1
+    TypeFixme = 0
+    TypeTodo = 1
+    TypeWarning = 2
+    TypeNote = 3
+    
+    def __init__(self, description, priority=1, filename="", lineno=0,
+                 completed=False, _time=0, isProjectTask=False,
+                 taskType=TypeTodo, project=None, longtext=""):
+        """
+        Constructor
+        
+        @param parent parent widget of the task (QWidget)
+        @param description descriptive text of the task (string)
+        @param priority priority of the task (0=high, 1=normal, 2=low)
+        @param filename filename containing the task (string)
+        @param lineno line number containing the task (integer)
+        @param completed flag indicating completion status (boolean)
+        @param _time creation time of the task (float, if 0 use current time)
+        @param isProjectTask flag indicating a task related to the current project
+            (boolean)
+        @param taskType type of the task (one of TypeFixme, TypeTodo,
+            TypeWarning, TypeNote)
+        @param project reference to the project object (Project)
+        @param longtext explanatory text of the task (string)
+        """
+        super().__init__()
+        
+        self.description = description
+        self.longtext = longtext
+        if priority in [0, 1, 2]:
+            self.priority = priority
+        else:
+            self.priority = 1
+        self.filename = filename
+        self.lineno = lineno
+        self.completed = completed
+        self.created = _time and _time or time.time()
+        self._isProjectTask = isProjectTask
+        self.taskType = taskType
+        self.project = project
+        
+        if isProjectTask:
+            self.filename = self.project.getRelativePath(self.filename)
+            
+        self.setData(0, Qt.DisplayRole, "")
+        self.setData(1, Qt.DisplayRole, "")
+        self.setData(2, Qt.DisplayRole, self.description)
+        self.setData(3, Qt.DisplayRole, self.filename)
+        self.setData(4, Qt.DisplayRole, self.lineno or "")
+        
+        if self.completed:
+            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png"))
+            strikeOut = True
+        else:
+            self.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
+            strikeOut = False
+        for column in range(2, 5):
+            f = self.font(column)
+            f.setStrikeOut(strikeOut)
+            self.setFont(column, f)
+        
+        if self.priority == 1:
+            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+        elif self.priority == 0:
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png"))
+        elif self.priority == 2:
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png"))
+        else:
+            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+        
+        if self.taskType == Task.TypeFixme:
+            self.setIcon(2, UI.PixmapCache.getIcon("taskFixme.png"))
+        elif self.taskType == Task.TypeWarning:
+            self.setIcon(2, UI.PixmapCache.getIcon("taskWarning.png"))
+        elif self.taskType == Task.TypeTodo:
+            self.setIcon(2, UI.PixmapCache.getIcon("taskTodo.png"))
+        else:
+            self.setIcon(2, UI.PixmapCache.getIcon("taskNote.png"))
+        
+        self.colorizeTask()
+        self.setTextAlignment(4, Qt.AlignRight)
+    
+    def colorizeTask(self):
+        """
+        Public slot to set the colors of the task item.
+        """
+        boldFont = self.font(0)
+        boldFont.setBold(True)
+        for col in range(5):
+            if self.taskType == Task.TypeFixme:
+                self.setBackgroundColor(col, Preferences.getTasks("TasksFixmeColor"))
+            elif self.taskType == Task.TypeWarning:
+                self.setBackgroundColor(col, Preferences.getTasks("TasksWarningColor"))
+            elif self.taskType == Task.TypeTodo:
+                self.setBackgroundColor(col, Preferences.getTasks("TasksTodoColor"))
+            else:
+                self.setBackgroundColor(col, Preferences.getTasks("TasksNoteColor"))
+            if self._isProjectTask:
+                self.setFont(col, boldFont)
+    
+    def setDescription(self, description):
+        """
+        Public slot to update the description.
+        
+        @param longtext explanatory text of the task (string)
+        """
+        self.description = description
+        self.setText(2, self.description)
+    
+    def setLongText(self, longtext):
+        """
+        Public slot to update the longtext field.
+        
+        @param longtext descriptive text of the task (string)
+        """
+        self.longtext = longtext
+    
+    def setPriority(self, priority):
+        """
+        Public slot to update the priority.
+        
+        @param priority priority of the task (0=high, 1=normal, 2=low)
+        """
+        if priority in [0, 1, 2]:
+            self.priority = priority
+        else:
+            self.priority = 1
+        
+        if self.priority == 1:
+            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+        elif self.priority == 0:
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png"))
+        elif self.priority == 2:
+            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png"))
+        else:
+            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
+    
+    def setCompleted(self, completed):
+        """
+        Public slot to update the completed flag.
+        
+        @param completed flag indicating completion status (boolean)
+        """
+        self.completed = completed
+        if self.completed:
+            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png"))
+            strikeOut = True
+        else:
+            self.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
+            strikeOut = False
+        for column in range(2, 5):
+            f = self.font(column)
+            f.setStrikeOut(strikeOut)
+            self.setFont(column, f)
+    
+    def isCompleted(self):
+        """
+        Public slot to return the completion status.
+        
+        @return flag indicating the completion status (boolean)
+        """
+        return self.completed
+    
+    def getFilename(self):
+        """
+        Public method to retrieve the tasks filename.
+        
+        @return filename (string)
+        """
+        if self._isProjectTask and self.filename:
+            return os.path.join(self.project.getProjectPath(), self.filename)
+        else:
+            return self.filename
+    
+    def getLineno(self):
+        """
+        Public method to retrieve the tasks linenumber.
+        
+        @return linenumber (integer)
+        """
+        return self.lineno
+    
+    def setProjectTask(self, pt):
+        """
+        Public method to set the project relation flag.
+        
+        @param pt flag indicating a project task (boolean)
+        """
+        self._isProjectTask = pt
+        self.colorizeTask()
+    
+    def isProjectTask(self):
+        """
+        Public slot to return the project relation status.
+        
+        @return flag indicating the project relation status (boolean)
+        """
+        return self._isProjectTask
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Tasks/TaskFilter.py	Sun Apr 29 16:42:02 2012 +0200
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2005 - 2012 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a class to store task data.
+"""
+
+from PyQt4.QtCore import QRegExp
+
+from .Task import Task
+
+
+class TaskFilter(object):
+    """
+    Class implementing a filter for tasks.
+    """
+    def __init__(self):
+        """
+        Constructor
+        """
+        self.active = False
+        
+        self.descriptionFilter = None
+        self.filenameFilter = None
+        self.typeFilter = Task.TypeNone     # task type
+        self.scopeFilter = None             # global (False) or project (True)
+        self.statusFilter = None            # uncompleted (False) or completed (True)
+        self.prioritiesFilter = None        # list of priorities
+                                            # [0 (high), 1 (normal), 2 (low)]
+    
+    def setActive(self, enabled):
+        """
+        Public method to activate the filter.
+        
+        @param enabled flag indicating the activation state (boolean)
+        """
+        self.active = enabled
+    
+    def setDescriptionFilter(self, filter):
+        """
+        Public method to set the description filter.
+        
+        @param filter a regular expression for the description filter
+            to set (string) or None
+        """
+        if not filter:
+            self.descriptionFilter = None
+        else:
+            self.descriptionFilter = QRegExp(filter)
+    
+    def setFileNameFilter(self, filter):
+        """
+        Public method to set the filename filter.
+        
+        @param filter a wildcard expression for the filename filter
+            to set (string) or None
+        """
+        if not filter:
+            self.filenameFilter = None
+        else:
+            self.filenameFilter = QRegExp(filter)
+            self.filenameFilter.setPatternSyntax(QRegExp.Wildcard)
+    
+    def setTypeFilter(self, taskType):
+        """
+        Public method to set the type filter.
+        
+        @param taskType type of the task (one of Task.TypeNone, Task.TypeFixme,
+            Task.TypeTodo, Task.TypeWarning, Task.TypeNote)
+        """
+        self.typeFilter = taskType
+        
+    def setScopeFilter(self, scope):
+        """
+        Public method to set the scope filter.
+        
+        @param scope flag indicating a project task (boolean) or None
+        """
+        self.scopeFilter = scope
+        
+    def setStatusFilter(self, status):
+        """
+        Public method to set the status filter.
+        
+        @param status flag indicating a completed task (boolean) or None
+        """
+        self.statusFilter = status
+        
+    def setPrioritiesFilter(self, priorities):
+        """
+        Public method to set the priorities filter.
+        
+        @param priorities list of task priorities (list of integer) or None
+        """
+        self.prioritiesFilter = priorities
+        
+    def hasActiveFilter(self):
+        """
+        Public method to check for active filters.
+        
+        @return flag indicating an active filter was found (boolean)
+        """
+        return self.descriptionFilter is not None or \
+               self.filenameFilter is not None or \
+               self.typeFilter != Task.TypeNone or \
+               self.scopeFilter is not None or \
+               self.statusFilter is not None or \
+               self.prioritiesFilter is not None
+        
+    def showTask(self, task):
+        """
+        Public method to check, if a task should be shown.
+        
+        @param task reference to the task object to check (Task)
+        @return flag indicating whether the task should be shown (boolean)
+        """
+        if not self.active:
+            return True
+        
+        if self.descriptionFilter and \
+           self.descriptionFilter.indexIn(task.description) == -1:
+            return False
+        
+        if self.filenameFilter and \
+           not self.filenameFilter.exactMatch(task.filename):
+            return False
+        
+        if self.typeFilter != Task.TypeNone and \
+           self.typeFilter != task.taskType:
+            return False
+        
+        if self.scopeFilter is not None and \
+           self.scopeFilter != task._isProjectTask:
+            return False
+        
+        if self.statusFilter is not None and \
+           self.statusFilter != task.completed:
+            return False
+        
+        if self.prioritiesFilter is not None and \
+           not task.priority in self.prioritiesFilter:
+            return False
+        
+        return True
--- a/Tasks/TaskFilterConfigDialog.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/Tasks/TaskFilterConfigDialog.py	Sun Apr 29 16:42:02 2012 +0200
@@ -9,6 +9,8 @@
 
 from PyQt4.QtGui import QDialog
 
+from .Task import Task
+
 from .Ui_TaskFilterConfigDialog import Ui_TaskFilterConfigDialog
 
 
@@ -26,6 +28,12 @@
         super().__init__(parent)
         self.setupUi(self)
         
+        self.typeCombo.addItem("", Task.TypeNone)
+        self.typeCombo.addItem(self.trUtf8("Bugfix"), Task.TypeFixme)
+        self.typeCombo.addItem(self.trUtf8("Warning"), Task.TypeWarning)
+        self.typeCombo.addItem(self.trUtf8("ToDo"), Task.TypeTodo)
+        self.typeCombo.addItem(self.trUtf8("Note"), Task.TypeNote)
+        
         if taskFilter.descriptionFilter is None or \
            not taskFilter.descriptionFilter.pattern():
             self.descriptionGroup.setChecked(False)
@@ -42,15 +50,12 @@
             self.filenameGroup.setChecked(True)
             self.filenameEdit.setText(taskFilter.filenameFilter.pattern())
         
-        if taskFilter.typeFilter is None:
+        if taskFilter.typeFilter == Task.TypeNone:
             self.typeGroup.setChecked(False)
-            self.standardRadioButton.setChecked(True)
+            self.typeCombo.setCurrentIndex(0)
         else:
             self.typeGroup.setChecked(True)
-            if taskFilter.typeFilter:
-                self.bugfixRadioButton.setChecked(True)
-            else:
-                self.standardRadioButton.setChecked(True)
+            self.typeCombo.setCurrentIndex(self.typeCombo.findData(taskFilter.typeFilter))
         
         if taskFilter.scopeFilter is None:
             self.scopeGroup.setChecked(False)
@@ -85,7 +90,7 @@
     
     def configureTaskFilter(self, taskFilter):
         """
-        Public method to set the parameters of the task filter object..
+        Public method to set the parameters of the task filter object.
         
         @param taskFilter the task filter object to be configured
         """
@@ -100,12 +105,10 @@
             taskFilter.setFileNameFilter(None)
         
         if self.typeGroup.isChecked():
-            if self.bugfixRadioButton.isChecked():
-                taskFilter.setTypeFilter(True)
-            else:
-                taskFilter.setTypeFilter(False)
+            taskFilter.setTypeFilter(
+                self.typeCombo.itemData(self.typeCombo.currentIndex()))
         else:
-            taskFilter.setTypeFilter(None)
+            taskFilter.setTypeFilter(Task.TypeNone)
         
         if self.scopeGroup.isChecked():
             if self.projectRadioButton.isChecked():
--- a/Tasks/TaskFilterConfigDialog.ui	Sat Apr 28 17:00:32 2012 +0200
+++ b/Tasks/TaskFilterConfigDialog.ui	Sun Apr 29 16:42:02 2012 +0200
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>TaskFilterConfigDialog</class>
- <widget class="QDialog" name="TaskFilterConfigDialog" >
-  <property name="geometry" >
+ <widget class="QDialog" name="TaskFilterConfigDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,44 +10,44 @@
     <height>470</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Task filter configuration</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an "&lt;b>and&lt;/b>" operation.</string>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an &quot;&lt;b&gt;and&lt;/b&gt;&quot; operation.</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="descriptionGroup" >
-     <property name="focusPolicy" >
+    <widget class="QGroupBox" name="descriptionGroup">
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Select to filter on the task description</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Description</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QLineEdit" name="descriptionEdit" >
-        <property name="toolTip" >
+       <widget class="QLineEdit" name="descriptionEdit">
+        <property name="toolTip">
          <string>Enter the description filter as a regular expression.</string>
         </property>
        </widget>
@@ -55,23 +56,23 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="filenameGroup" >
-     <property name="focusPolicy" >
+    <widget class="QGroupBox" name="filenameGroup">
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Select to filter on the task filename</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Filename</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QLineEdit" name="filenameEdit" >
-        <property name="toolTip" >
+       <widget class="QLineEdit" name="filenameEdit">
+        <property name="toolTip">
          <string>Enter the filename filter as a wildcard expression.</string>
         </property>
        </widget>
@@ -80,37 +81,24 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="typeGroup" >
-     <property name="focusPolicy" >
+    <widget class="QGroupBox" name="typeGroup">
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Select to filter on the task type</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Type</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QVBoxLayout" name="verticalLayout">
       <item>
-       <widget class="QRadioButton" name="standardRadioButton" >
-        <property name="toolTip" >
-         <string>Select to show standard tasks only</string>
-        </property>
-        <property name="text" >
-         <string>Standard tasks</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="bugfixRadioButton" >
-        <property name="toolTip" >
-         <string>Select to show bugfix tasks only</string>
-        </property>
-        <property name="text" >
-         <string>Bugfix tasks</string>
+       <widget class="QComboBox" name="typeCombo">
+        <property name="toolTip">
+         <string>Select the task type to be shown</string>
         </property>
        </widget>
       </item>
@@ -118,36 +106,36 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="scopeGroup" >
-     <property name="focusPolicy" >
+    <widget class="QGroupBox" name="scopeGroup">
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Select to filter on the task scope</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Scope</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout">
       <item>
-       <widget class="QRadioButton" name="globalRadioButton" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="globalRadioButton">
+        <property name="toolTip">
          <string>Select to show global tasks only</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Global tasks</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="projectRadioButton" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="projectRadioButton">
+        <property name="toolTip">
          <string>Select to show project tasks only</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Project tasks</string>
         </property>
        </widget>
@@ -156,36 +144,36 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="statusGroup" >
-     <property name="focusPolicy" >
+    <widget class="QGroupBox" name="statusGroup">
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Select to filter on the task completion status</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Completion status</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout">
       <item>
-       <widget class="QRadioButton" name="uncompletedRadioButton" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="uncompletedRadioButton">
+        <property name="toolTip">
          <string>Select to show uncompleted tasks only</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Uncompleted tasks</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="completedRadioButton" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="completedRadioButton">
+        <property name="toolTip">
          <string>Select to show completed tasks only</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Completed tasks</string>
         </property>
        </widget>
@@ -194,46 +182,46 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="priorityGroup" >
-     <property name="focusPolicy" >
+    <widget class="QGroupBox" name="priorityGroup">
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Select to filter on the task priority</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Priority</string>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>true</bool>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout">
       <item>
-       <widget class="QCheckBox" name="priorityHighCheckBox" >
-        <property name="toolTip" >
+       <widget class="QCheckBox" name="priorityHighCheckBox">
+        <property name="toolTip">
          <string>Select to show high priority tasks</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>High priority tasks</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="priorityNormalCheckBox" >
-        <property name="toolTip" >
+       <widget class="QCheckBox" name="priorityNormalCheckBox">
+        <property name="toolTip">
          <string>Select to show normal priority tasks</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Normal priority tasks</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="priorityLowCheckBox" >
-        <property name="toolTip" >
+       <widget class="QCheckBox" name="priorityLowCheckBox">
+        <property name="toolTip">
          <string>Select to show low priority tasks</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Low priority tasks</string>
         </property>
        </widget>
@@ -242,11 +230,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
@@ -259,8 +247,7 @@
   <tabstop>filenameGroup</tabstop>
   <tabstop>filenameEdit</tabstop>
   <tabstop>typeGroup</tabstop>
-  <tabstop>standardRadioButton</tabstop>
-  <tabstop>bugfixRadioButton</tabstop>
+  <tabstop>typeCombo</tabstop>
   <tabstop>scopeGroup</tabstop>
   <tabstop>globalRadioButton</tabstop>
   <tabstop>projectRadioButton</tabstop>
@@ -271,6 +258,7 @@
   <tabstop>priorityHighCheckBox</tabstop>
   <tabstop>priorityNormalCheckBox</tabstop>
   <tabstop>priorityLowCheckBox</tabstop>
+  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -280,11 +268,11 @@
    <receiver>TaskFilterConfigDialog</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>46</x>
      <y>425</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>46</x>
      <y>445</y>
     </hint>
@@ -296,11 +284,11 @@
    <receiver>TaskFilterConfigDialog</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>168</x>
      <y>432</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>168</x>
      <y>452</y>
     </hint>
--- a/Tasks/TaskViewer.py	Sat Apr 28 17:00:32 2012 +0200
+++ b/Tasks/TaskViewer.py	Sun Apr 29 16:42:02 2012 +0200
@@ -12,17 +12,18 @@
 """
 
 import os
-import time
 import fnmatch
 
-from PyQt4.QtCore import pyqtSignal, QRegExp, Qt
+from PyQt4.QtCore import pyqtSignal, Qt
 from PyQt4.QtGui import QHeaderView, QLineEdit, QTreeWidget, QDialog, QInputDialog, \
     QApplication, QMenu, QAbstractItemView, QProgressDialog, QTreeWidgetItem
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 
+from .Task import Task
 from .TaskPropertiesDialog import TaskPropertiesDialog
+from .TaskFilter import TaskFilter
 from .TaskFilterConfigDialog import TaskFilterConfigDialog
 
 import UI.PixmapCache
@@ -31,323 +32,6 @@
 import Utilities
 
 from Utilities.AutoSaver import AutoSaver
-
-
-class Task(QTreeWidgetItem):
-    """
-    Class implementing the task data structure.
-    """
-    def __init__(self, description, priority=1, filename="", lineno=0,
-                 completed=False, _time=0, isProjectTask=False,
-                 isBugfixTask=False, project=None, longtext=""):
-        """
-        Constructor
-        
-        @param parent parent widget of the task (QWidget)
-        @param description descriptive text of the task (string)
-        @param priority priority of the task (0=high, 1=normal, 2=low)
-        @param filename filename containing the task (string)
-        @param lineno line number containing the task (integer)
-        @param completed flag indicating completion status (boolean)
-        @param _time creation time of the task (float, if 0 use current time)
-        @param isProjectTask flag indicating a task related to the current project
-            (boolean)
-        @param isBugfixTask flag indicating a bugfix task (boolean)
-        @param project reference to the project object (Project)
-        @param longtext explanatory text of the task (string)
-        """
-        super().__init__()
-        
-        self.description = description
-        self.longtext = longtext
-        if priority in [0, 1, 2]:
-            self.priority = priority
-        else:
-            self.priority = 1
-        self.filename = filename
-        self.lineno = lineno
-        self.completed = completed
-        self.created = _time and _time or time.time()
-        self._isProjectTask = isProjectTask
-        self.isBugfixTask = isBugfixTask
-        self.project = project
-        
-        if isProjectTask:
-            self.filename = self.project.getRelativePath(self.filename)
-            
-        self.setData(0, Qt.DisplayRole, "")
-        self.setData(1, Qt.DisplayRole, "")
-        self.setData(2, Qt.DisplayRole, self.description)
-        self.setData(3, Qt.DisplayRole, self.filename)
-        self.setData(4, Qt.DisplayRole, self.lineno or "")
-        
-        if self.completed:
-            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png"))
-            strikeOut = True
-        else:
-            self.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
-            strikeOut = False
-        for column in range(2, 5):
-            f = self.font(column)
-            f.setStrikeOut(strikeOut)
-            self.setFont(column, f)
-        
-        if self.priority == 1:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
-        elif self.priority == 0:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png"))
-        elif self.priority == 2:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png"))
-        else:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
-        
-        self.colorizeTask()
-        self.setTextAlignment(4, Qt.AlignRight)
-    
-    def colorizeTask(self):
-        """
-        Public slot to set the colors of the task item.
-        """
-        for col in range(5):
-            if self.isBugfixTask:
-                self.setTextColor(col, Preferences.getTasks("TasksBugfixColour"))
-            else:
-                self.setTextColor(col, Preferences.getTasks("TasksColour"))
-            if self._isProjectTask:
-                self.setBackgroundColor(col, Preferences.getTasks("TasksProjectBgColour"))
-            else:
-                self.setBackgroundColor(col, Preferences.getTasks("TasksBgColour"))
-    
-    def setDescription(self, description):
-        """
-        Public slot to update the description.
-        
-        @param longtext explanatory text of the task (string)
-        """
-        self.description = description
-        self.setText(2, self.description)
-    
-    def setLongText(self, longtext):
-        """
-        Public slot to update the longtext field.
-        
-        @param longtext descriptive text of the task (string)
-        """
-        self.longtext = longtext
-    
-    def setPriority(self, priority):
-        """
-        Public slot to update the priority.
-        
-        @param priority priority of the task (0=high, 1=normal, 2=low)
-        """
-        if priority in [0, 1, 2]:
-            self.priority = priority
-        else:
-            self.priority = 1
-        
-        if self.priority == 1:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
-        elif self.priority == 0:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioHigh.png"))
-        elif self.priority == 2:
-            self.setIcon(1, UI.PixmapCache.getIcon("taskPrioLow.png"))
-        else:
-            self.setIcon(1, UI.PixmapCache.getIcon("empty.png"))
-    
-    def setCompleted(self, completed):
-        """
-        Public slot to update the completed flag.
-        
-        @param completed flag indicating completion status (boolean)
-        """
-        self.completed = completed
-        if self.completed:
-            self.setIcon(0, UI.PixmapCache.getIcon("taskCompleted.png"))
-            strikeOut = True
-        else:
-            self.setIcon(0, UI.PixmapCache.getIcon("empty.png"))
-            strikeOut = False
-        for column in range(2, 5):
-            f = self.font(column)
-            f.setStrikeOut(strikeOut)
-            self.setFont(column, f)
-    
-    def isCompleted(self):
-        """
-        Public slot to return the completion status.
-        
-        @return flag indicating the completion status (boolean)
-        """
-        return self.completed
-    
-    def getFilename(self):
-        """
-        Public method to retrieve the tasks filename.
-        
-        @return filename (string)
-        """
-        if self._isProjectTask and self.filename:
-            return os.path.join(self.project.getProjectPath(), self.filename)
-        else:
-            return self.filename
-    
-    def getLineno(self):
-        """
-        Public method to retrieve the tasks linenumber.
-        
-        @return linenumber (integer)
-        """
-        return self.lineno
-    
-    def setProjectTask(self, pt):
-        """
-        Public method to set the project relation flag.
-        
-        @param pt flag indicating a project task (boolean)
-        """
-        self._isProjectTask = pt
-        self.colorizeTask()
-    
-    def isProjectTask(self):
-        """
-        Public slot to return the project relation status.
-        
-        @return flag indicating the project relation status (boolean)
-        """
-        return self._isProjectTask
-
-
-class TaskFilter(object):
-    """
-    Class implementing a filter for tasks.
-    """
-    def __init__(self):
-        """
-        Constructor
-        """
-        self.active = False
-        
-        self.descriptionFilter = None
-        self.filenameFilter = None
-        self.typeFilter = None        # standard (False) or bugfix (True)
-        self.scopeFilter = None       # global (False) or project (True)
-        self.statusFilter = None      # uncompleted (False) or completed (True)
-        self.prioritiesFilter = None  # list of priorities [0 (high), 1 (normal), 2 (low)]
-    
-    def setActive(self, enabled):
-        """
-        Public method to activate the filter.
-        
-        @param enabled flag indicating the activation state (boolean)
-        """
-        self.active = enabled
-    
-    def setDescriptionFilter(self, filter):
-        """
-        Public method to set the description filter.
-        
-        @param filter a regular expression for the description filter
-            to set (string) or None
-        """
-        if not filter:
-            self.descriptionFilter = None
-        else:
-            self.descriptionFilter = QRegExp(filter)
-    
-    def setFileNameFilter(self, filter):
-        """
-        Public method to set the filename filter.
-        
-        @param filter a wildcard expression for the filename filter
-            to set (string) or None
-        """
-        if not filter:
-            self.filenameFilter = None
-        else:
-            self.filenameFilter = QRegExp(filter)
-            self.filenameFilter.setPatternSyntax(QRegExp.Wildcard)
-    
-    def setTypeFilter(self, type_):
-        """
-        Public method to set the type filter.
-        
-        @param type_ flag indicating a bugfix task (boolean) or None
-        """
-        self.typeFilter = type_
-        
-    def setScopeFilter(self, scope):
-        """
-        Public method to set the scope filter.
-        
-        @param scope flag indicating a project task (boolean) or None
-        """
-        self.scopeFilter = scope
-        
-    def setStatusFilter(self, status):
-        """
-        Public method to set the status filter.
-        
-        @param status flag indicating a completed task (boolean) or None
-        """
-        self.statusFilter = status
-        
-    def setPrioritiesFilter(self, priorities):
-        """
-        Public method to set the priorities filter.
-        
-        @param priorities list of task priorities (list of integer) or None
-        """
-        self.prioritiesFilter = priorities
-        
-    def hasActiveFilter(self):
-        """
-        Public method to check for active filters.
-        
-        @return flag indicating an active filter was found (boolean)
-        """
-        return self.descriptionFilter is not None or \
-               self.filenameFilter is not None or \
-               self.typeFilter is not None or \
-               self.scopeFilter is not None or \
-               self.statusFilter is not None or \
-               self.prioritiesFilter is not None
-        
-    def showTask(self, task):
-        """
-        Public method to check, if a task should be shown.
-        
-        @param task reference to the task object to check (Task)
-        @return flag indicating whether the task should be shown (boolean)
-        """
-        if not self.active:
-            return True
-        
-        if self.descriptionFilter and \
-           self.descriptionFilter.indexIn(task.description) == -1:
-            return False
-        
-        if self.filenameFilter and \
-           not self.filenameFilter.exactMatch(task.filename):
-            return False
-        
-        if self.typeFilter is not None and \
-           self.typeFilter != task.isBugfixTask:
-            return False
-        
-        if self.scopeFilter is not None and \
-           self.scopeFilter != task._isProjectTask:
-            return False
-        
-        if self.statusFilter is not None and \
-           self.statusFilter != task.completed:
-            return False
-        
-        if self.prioritiesFilter is not None and \
-           not task.priority in self.prioritiesFilter:
-            return False
-        
-        return True
     
 
 class TaskViewer(QTreeWidget):
@@ -546,7 +230,7 @@
     
     def addTask(self, description, priority=1, filename="", lineno=0,
                 completed=False, _time=0, isProjectTask=False,
-                isBugfixTask=False, longtext=""):
+                taskType=Task.TypeTodo, longtext=""):
         """
         Public slot to add a task.
         
@@ -558,11 +242,12 @@
         @param _time creation time of the task (float, if 0 use current time)
         @param isProjectTask flag indicating a task related to the current
             project (boolean)
-        @param isBugfixTask flag indicating a bugfix task (boolean)
+        @param taskType type of the task (one of Task.TypeFixme, Task.TypeTodo,
+            Task.TypeWarning, Task.TypeNote)
         @param longtext explanatory text of the task (string)
         """
         task = Task(description, priority, filename, lineno, completed,
-                   _time, isProjectTask, isBugfixTask,
+                   _time, isProjectTask, taskType,
                    self.project, longtext)
         self.tasks.append(task)
         if self.taskFilter.showTask(task):
@@ -573,7 +258,7 @@
         if isProjectTask:
             self.__projectTasksSaveTimer.changeOccurred()
     
-    def addFileTask(self, description, filename, lineno, isBugfixTask=False,
+    def addFileTask(self, description, filename, lineno, taskType=Task.TypeTodo,
                     longtext=""):
         """
         Public slot to add a file related task.
@@ -581,13 +266,14 @@
         @param description descriptive text of the task (string)
         @param filename filename containing the task (string)
         @param lineno line number containing the task (integer)
-        @param isBugfixTask flag indicating a bugfix task (boolean)
+        @param taskType type of the task (one of Task.TypeFixme, Task.TypeTodo,
+            Task.TypeWarning, Task.TypeNote)
         @param longtext explanatory text of the task (string)
         """
         self.addTask(description, filename=filename, lineno=lineno,
                      isProjectTask=(
                         self.project and self.project.isProjectSource(filename)),
-                     isBugfixTask=isBugfixTask, longtext=longtext)
+                     taskType=taskType, longtext=longtext)
         
     def getProjectTasks(self):
         """
@@ -806,8 +492,12 @@
         """
         Private slot to handle the "Regenerated project tasks" context menu entry.
         """
-        todoMarkers = Preferences.getTasks("TasksMarkers").split()
-        bugfixMarkers = Preferences.getTasks("TasksMarkersBugfix").split()
+        markers = {
+            Task.TypeWarning: Preferences.getTasks("TasksWarningMarkers").split(),
+            Task.TypeNote: Preferences.getTasks("TasksNoteMarkers").split(),
+            Task.TypeTodo: Preferences.getTasks("TasksTodoMarkers").split(),
+            Task.TypeFixme: Preferences.getTasks("TasksFixmeMarkers").split(),
+        }
         files = self.project.pdata["SOURCES"]
         
         # apply file filter
@@ -848,25 +538,17 @@
             lineIndex = 0
             for line in lines:
                 lineIndex += 1
-                shouldContinue = False
-                # normal tasks first
-                for tasksMarker in todoMarkers:
-                    index = line.find(tasksMarker)
-                    if index > -1:
-                        task = line[index:]
-                        self.addFileTask(task, fn, lineIndex, False)
-                        shouldContinue = True
-                        break
-                if shouldContinue:
-                    continue
+                shouldBreak = False
                 
-                # bugfix tasks second
-                for tasksMarker in bugfixMarkers:
-                    index = line.find(tasksMarker)
-                    if index > -1:
-                        task = line[index:]
-                        self.addFileTask(task, fn, lineIndex, True)
-                        shouldContinue = True
+                for taskType, taskMarkers in markers.items():
+                    for taskMarker in taskMarkers:
+                        index = line.find(taskMarker)
+                        if index > -1:
+                            task = line[index:]
+                            self.addFileTask(task, fn, lineIndex, taskType)
+                            shouldBreak = True
+                            break
+                    if shouldBreak:
                         break
             
             count += 1
--- a/changelog	Sat Apr 28 17:00:32 2012 +0200
+++ b/changelog	Sun Apr 29 16:42:02 2012 +0200
@@ -8,6 +8,8 @@
 - Project
   -- added capability to save project tasks automatically (configurable on
      project configuration page of configuration dialog)
+- Tasks
+  -- changed the tasks handling to allow for more fine grained task designations
 - Tools
   -- added a tool to take screenshots (fullscreen, selected screen, rectangular
      selection, elliptical selection or freehand selection)
--- a/eric5.e4p	Sat Apr 28 17:00:32 2012 +0200
+++ b/eric5.e4p	Sun Apr 29 16:42:02 2012 +0200
@@ -1009,6 +1009,8 @@
     <Source>Snapshot/SnapshotPreview.py</Source>
     <Source>Snapshot/SnapshotTimer.py</Source>
     <Source>Snapshot/SnapshotFreehandGrabber.py</Source>
+    <Source>Tasks/Task.py</Source>
+    <Source>Tasks/TaskFilter.py</Source>
   </Sources>
   <Forms>
     <Form>PyUnit/UnittestDialog.ui</Form>
--- a/i18n/eric5_cs.ts	Sat Apr 28 17:00:32 2012 +0200
+++ b/i18n/eric5_cs.ts	Sun Apr 29 16:42:02 2012 +0200
@@ -4110,42 +4110,42 @@
         <translation>&amp;Filtr pro:</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>Code Generation</source>
         <translation>Generování kódu</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>uic error</source>
         <translation>uic chyba</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>Create Dialog Code</source>
         <translation>Vytvořit Dialog Code</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>The file &lt;b&gt;{0}&lt;/b&gt; exists but does not contain any classes.</source>
         <translation>Soubor &lt;b&gt;{0}&lt;/b&gt; existuje ale neobsahuje žádné třídy.</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>&lt;p&gt;There was an error loading the form &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Byla nalezena chyba načtená z &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="324"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="326"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Template soubor &lt;b&gt;{0}&lt;/b&gt; nelze otevřít.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="357"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="359"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze ovevřít source soubor &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nelze zapsat do source souboru &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -7336,482 +7336,482 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="589"/>
+        <location filename="QScintilla/Editor.py" line="591"/>
         <source>Undo</source>
         <translation>Vrátit</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="592"/>
+        <location filename="QScintilla/Editor.py" line="594"/>
         <source>Redo</source>
         <translation>Znovu použít</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="595"/>
+        <location filename="QScintilla/Editor.py" line="597"/>
         <source>Revert to last saved state</source>
         <translation>Vrátit k poslednímu uloženému stavu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="599"/>
+        <location filename="QScintilla/Editor.py" line="601"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="602"/>
-        <source>Copy</source>
-        <translation>Kopírovat</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="604"/>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="606"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="608"/>
-        <source>Indent</source>
-        <translation>Odsadit</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="610"/>
+        <source>Indent</source>
+        <translation>Odsadit</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="612"/>
         <source>Unindent</source>
         <translation>Zrušit odsazení</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="613"/>
+        <location filename="QScintilla/Editor.py" line="615"/>
         <source>Comment</source>
         <translation>Vytvořit komentář</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="616"/>
+        <location filename="QScintilla/Editor.py" line="618"/>
         <source>Uncomment</source>
         <translation>Zrušit komentář</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="619"/>
+        <location filename="QScintilla/Editor.py" line="621"/>
         <source>Stream Comment</source>
         <translation>Proudový komentář</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="622"/>
+        <location filename="QScintilla/Editor.py" line="624"/>
         <source>Box Comment</source>
         <translation>Obdélníkový komentář</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="625"/>
-        <source>Select to brace</source>
-        <translation>Vybrat až po závorku</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="627"/>
+        <source>Select to brace</source>
+        <translation>Vybrat až po závorku</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="629"/>
         <source>Select all</source>
         <translation>Vybrat vše</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="628"/>
+        <location filename="QScintilla/Editor.py" line="630"/>
         <source>Deselect all</source>
         <translation>Zrušit celý výběr</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="641"/>
+        <location filename="QScintilla/Editor.py" line="643"/>
         <source>Shorten empty lines</source>
         <translation>Zkrátit prázdné řádky</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="649"/>
+        <location filename="QScintilla/Editor.py" line="651"/>
         <source>Use Monospaced Font</source>
         <translation>Použít neporoporcionální font</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="654"/>
+        <location filename="QScintilla/Editor.py" line="656"/>
         <source>Autosave enabled</source>
         <translation>Zapnout autosave</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="666"/>
+        <location filename="QScintilla/Editor.py" line="668"/>
         <source>Autocompletion enabled</source>
         <translation>Zapnout autodoplňování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="683"/>
+        <location filename="QScintilla/Editor.py" line="685"/>
         <source>New view</source>
         <translation>Nový pohled</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="684"/>
+        <location filename="QScintilla/Editor.py" line="686"/>
         <source>New view (with new split)</source>
         <translation>Nový pohled (s novým rozdělením)</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="688"/>
+        <location filename="QScintilla/Editor.py" line="690"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="692"/>
-        <source>Save</source>
-        <translation>Uložit</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="694"/>
+        <source>Save</source>
+        <translation>Uložit</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="696"/>
         <source>Save As...</source>
         <translation>Uložit jako...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="705"/>
+        <location filename="QScintilla/Editor.py" line="707"/>
         <source>Print</source>
         <translation>Tisk</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="722"/>
+        <location filename="QScintilla/Editor.py" line="724"/>
         <source>Autocomplete</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="728"/>
+        <location filename="QScintilla/Editor.py" line="730"/>
         <source>from Document</source>
         <translation>z dokumentu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="731"/>
+        <location filename="QScintilla/Editor.py" line="733"/>
         <source>from APIs</source>
         <translation>z API</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="734"/>
+        <location filename="QScintilla/Editor.py" line="736"/>
         <source>from Document and APIs</source>
         <translation>z dokumentu a API</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="748"/>
+        <location filename="QScintilla/Editor.py" line="750"/>
         <source>Check</source>
         <translation>Zkontrolovat</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="756"/>
-        <source>Show</source>
-        <translation>Zobrazit</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="758"/>
-        <source>Code metrics...</source>
-        <translation>Metrika kódu...</translation>
+        <source>Show</source>
+        <translation>Zobrazit</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="760"/>
-        <source>Code coverage...</source>
-        <translation>Pokrytí kódu...</translation>
+        <source>Code metrics...</source>
+        <translation>Metrika kódu...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="762"/>
+        <source>Code coverage...</source>
+        <translation>Pokrytí kódu...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="764"/>
         <source>Show code coverage annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="765"/>
+        <location filename="QScintilla/Editor.py" line="767"/>
         <source>Hide code coverage annotations</source>
         <translation>Skrýt poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="768"/>
+        <location filename="QScintilla/Editor.py" line="770"/>
         <source>Profile data...</source>
         <translation>Profilovat data...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="778"/>
-        <source>Diagrams</source>
-        <translation>Diagramy</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="780"/>
-        <source>Class Diagram...</source>
-        <translation>Diagram třídy...</translation>
+        <source>Diagrams</source>
+        <translation>Diagramy</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="782"/>
-        <source>Package Diagram...</source>
-        <translation>Diagram balíčku...</translation>
+        <source>Class Diagram...</source>
+        <translation>Diagram třídy...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="784"/>
+        <source>Package Diagram...</source>
+        <translation>Diagram balíčku...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="786"/>
         <source>Imports Diagram...</source>
         <translation>Diagram importů...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="787"/>
+        <location filename="QScintilla/Editor.py" line="789"/>
         <source>Application Diagram...</source>
         <translation>Diagram aplikace...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="798"/>
+        <location filename="QScintilla/Editor.py" line="800"/>
         <source>Languages</source>
         <translation>Jazyky</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="801"/>
+        <location filename="QScintilla/Editor.py" line="803"/>
         <source>No Language</source>
         <translation>Žádný jazyk</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1010"/>
+        <location filename="QScintilla/Editor.py" line="1012"/>
         <source>Toggle bookmark</source>
         <translation>Přepnout záložku</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1013"/>
+        <location filename="QScintilla/Editor.py" line="1015"/>
         <source>Next bookmark</source>
         <translation>Následující záložka</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1016"/>
+        <location filename="QScintilla/Editor.py" line="1018"/>
         <source>Previous bookmark</source>
         <translation>Předchozí záložka</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1019"/>
+        <location filename="QScintilla/Editor.py" line="1021"/>
         <source>Clear all bookmarks</source>
         <translation>Zrušit všechny záložky</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1023"/>
+        <location filename="QScintilla/Editor.py" line="1025"/>
         <source>Goto syntax error</source>
         <translation>Jít na chybu syntaxe</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1026"/>
+        <location filename="QScintilla/Editor.py" line="1028"/>
         <source>Show syntax error message</source>
         <translation>Zobrazit hlášení syntaktické chyby</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1029"/>
+        <location filename="QScintilla/Editor.py" line="1031"/>
         <source>Clear syntax error</source>
         <translation>Zrušit chybu syntaxe</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1046"/>
+        <location filename="QScintilla/Editor.py" line="1048"/>
         <source>Toggle breakpoint</source>
         <translation>Přepnout breakpoint</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1049"/>
+        <location filename="QScintilla/Editor.py" line="1051"/>
         <source>Toggle temporary breakpoint</source>
         <translation>Přepnout dočasný breakpoint</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1052"/>
+        <location filename="QScintilla/Editor.py" line="1054"/>
         <source>Edit breakpoint...</source>
         <translation>Editovat breakpoint...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4303"/>
+        <location filename="QScintilla/Editor.py" line="4301"/>
         <source>Enable breakpoint</source>
         <translation>Aktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1058"/>
+        <location filename="QScintilla/Editor.py" line="1060"/>
         <source>Next breakpoint</source>
         <translation>Následující breakpoint</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1061"/>
+        <location filename="QScintilla/Editor.py" line="1063"/>
         <source>Previous breakpoint</source>
         <translation>Předchozí breakpoint</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1064"/>
+        <location filename="QScintilla/Editor.py" line="1066"/>
         <source>Clear all breakpoints</source>
         <translation>Zrušit všechny breakpointy</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1068"/>
+        <location filename="QScintilla/Editor.py" line="1070"/>
         <source>Next uncovered line</source>
         <translation>Následující odkrytá řádka</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1071"/>
+        <location filename="QScintilla/Editor.py" line="1073"/>
         <source>Previous uncovered line</source>
         <translation>Předchozí odkrytá řádka</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1075"/>
+        <location filename="QScintilla/Editor.py" line="1077"/>
         <source>Next task</source>
         <translation>Následující úloha</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1078"/>
+        <location filename="QScintilla/Editor.py" line="1080"/>
         <source>Previous task</source>
         <translation>Předchozí úloha</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1082"/>
+        <location filename="QScintilla/Editor.py" line="1084"/>
         <source>LMB toggles bookmarks</source>
         <translation>LMB přepínač záložek</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1087"/>
+        <location filename="QScintilla/Editor.py" line="1089"/>
         <source>LMB toggles breakpoints</source>
         <translation>LMB přepínač breakpointů</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
+        <location filename="QScintilla/Editor.py" line="1570"/>
         <source>Modification of Read Only file</source>
         <translation>Modifikace souboru otevřeného jen pro čtení</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
+        <location filename="QScintilla/Editor.py" line="1570"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2215"/>
+        <location filename="QScintilla/Editor.py" line="2217"/>
         <source>Printing...</source>
         <translation>Tisk...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2232"/>
-        <source>Printing completed</source>
-        <translation>Tisk je hotov</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="2234"/>
+        <source>Printing completed</source>
+        <translation>Tisk je hotov</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="2236"/>
         <source>Error while printing</source>
         <translation>Chyba během tisku</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2237"/>
+        <location filename="QScintilla/Editor.py" line="2239"/>
         <source>Printing aborted</source>
         <translation>Tisk byl zrušen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2589"/>
+        <location filename="QScintilla/Editor.py" line="2587"/>
         <source>Save File</source>
         <translation>Uložit soubor</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2388"/>
+        <location filename="QScintilla/Editor.py" line="2386"/>
         <source>File Modified</source>
         <translation>Soubor je modifikován</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3813"/>
+        <location filename="QScintilla/Editor.py" line="3811"/>
         <source>Autocompletion</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3813"/>
+        <location filename="QScintilla/Editor.py" line="3811"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4306"/>
+        <location filename="QScintilla/Editor.py" line="4304"/>
         <source>Disable breakpoint</source>
         <translation>Deaktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4623"/>
+        <location filename="QScintilla/Editor.py" line="4621"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4623"/>
+        <location filename="QScintilla/Editor.py" line="4621"/>
         <source>Please select a coverage file</source>
         <translation>Prosím, vyberte soubor s pokrytím kódu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4669"/>
+        <location filename="QScintilla/Editor.py" line="4667"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4665"/>
+        <location filename="QScintilla/Editor.py" line="4663"/>
         <source>All lines have been covered.</source>
         <translation>Všechny řádky byly pokryty.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4669"/>
+        <location filename="QScintilla/Editor.py" line="4667"/>
         <source>There is no coverage file available.</source>
         <translation>Soubor s pokrytím není dostupný.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4761"/>
+        <location filename="QScintilla/Editor.py" line="4759"/>
         <source>Profile Data</source>
         <translation>Profilovat data</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4761"/>
+        <location filename="QScintilla/Editor.py" line="4759"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4891"/>
+        <location filename="QScintilla/Editor.py" line="4889"/>
         <source>Syntax Error</source>
         <translation>Chyba syntaxe</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4891"/>
+        <location filename="QScintilla/Editor.py" line="4889"/>
         <source>No syntax error message available.</source>
         <translation>Hlášení syntaktické chyby není dostupné.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5116"/>
+        <location filename="QScintilla/Editor.py" line="5114"/>
         <source>Macro Name</source>
         <translation>Název makra</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5116"/>
+        <location filename="QScintilla/Editor.py" line="5114"/>
         <source>Select a macro name:</source>
         <translation>Vyberte název makra:</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5144"/>
+        <location filename="QScintilla/Editor.py" line="5142"/>
         <source>Load macro file</source>
         <translation>Načíst soubor makra</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5184"/>
+        <location filename="QScintilla/Editor.py" line="5182"/>
         <source>Macro files (*.macro)</source>
         <translation>Macro soubory (*.macro)</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5165"/>
+        <location filename="QScintilla/Editor.py" line="5163"/>
         <source>Error loading macro</source>
         <translation>Chyba při načítání makra</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5184"/>
+        <location filename="QScintilla/Editor.py" line="5182"/>
         <source>Save macro file</source>
         <translation>Uložit soubor s makrem</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5201"/>
+        <location filename="QScintilla/Editor.py" line="5199"/>
         <source>Save macro</source>
         <translation>Uložit makro</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5216"/>
+        <location filename="QScintilla/Editor.py" line="5214"/>
         <source>Error saving macro</source>
         <translation>Chyba při ukládání makra</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5227"/>
+        <location filename="QScintilla/Editor.py" line="5225"/>
         <source>Start Macro Recording</source>
         <translation>Spustit záznam makra</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5227"/>
+        <location filename="QScintilla/Editor.py" line="5225"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Nahrávání makra již probíhá. Spustit nové?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5252"/>
+        <location filename="QScintilla/Editor.py" line="5250"/>
         <source>Macro Recording</source>
         <translation>Záznam makra</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5252"/>
+        <location filename="QScintilla/Editor.py" line="5250"/>
         <source>Enter name of the macro:</source>
         <translation>Vložte název makra:</translation>
     </message>
@@ -7821,227 +7821,227 @@
         <translation type="obsolete">&lt;br&gt;&lt;b&gt;Pozor:&lt;/b&gt; Ztratíte všechny změny pokud jej znovu otevřete.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5381"/>
+        <location filename="QScintilla/Editor.py" line="5379"/>
         <source>File changed</source>
         <translation>Soubor změněn</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5638"/>
+        <location filename="QScintilla/Editor.py" line="5636"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="5654"/>
+        <source>Resources</source>
+        <translation>Zdroje</translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="5656"/>
-        <source>Resources</source>
-        <translation>Zdroje</translation>
+        <source>Add file...</source>
+        <translation>Přidat soubor...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5658"/>
-        <source>Add file...</source>
-        <translation>Přidat soubor...</translation>
+        <source>Add files...</source>
+        <translation>Přidat soubory...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5660"/>
-        <source>Add files...</source>
-        <translation>Přidat soubory...</translation>
+        <source>Add aliased file...</source>
+        <translation>Přidat zástupce souboru...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5662"/>
-        <source>Add aliased file...</source>
-        <translation>Přidat zástupce souboru...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5664"/>
         <source>Add localized resource...</source>
         <translation>Přidat lokalizované resource...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5667"/>
+        <location filename="QScintilla/Editor.py" line="5665"/>
         <source>Add resource frame</source>
         <translation>Přidat resource frame</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5685"/>
+        <location filename="QScintilla/Editor.py" line="5683"/>
         <source>Add file resource</source>
         <translation>Přidat soubor resource</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5701"/>
+        <location filename="QScintilla/Editor.py" line="5699"/>
         <source>Add file resources</source>
         <translation>Přidat soubory resource</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5728"/>
+        <location filename="QScintilla/Editor.py" line="5726"/>
         <source>Add aliased file resource</source>
         <translation>Přidat zástupce souboru resource</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5789"/>
+        <location filename="QScintilla/Editor.py" line="5787"/>
         <source>Package Diagram</source>
         <translation>Diagram balíčku</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5789"/>
+        <location filename="QScintilla/Editor.py" line="5787"/>
         <source>Include class attributes?</source>
         <translation>Včetně atributů třídy?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5818"/>
+        <location filename="QScintilla/Editor.py" line="5816"/>
         <source>Application Diagram</source>
         <translation>Diagram aplikace</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5818"/>
+        <location filename="QScintilla/Editor.py" line="5816"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="891"/>
+        <location filename="QScintilla/Editor.py" line="893"/>
         <source>Export as</source>
         <translation>Exportovat jako</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>Export source</source>
         <translation>Export zdroj</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>No export format given. Aborting...</source>
         <translation>Nebyl zadán forám exportu. Zrušeno....</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5806"/>
+        <location filename="QScintilla/Editor.py" line="5804"/>
         <source>Imports Diagram</source>
         <translation>Importovat diagram</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5806"/>
+        <location filename="QScintilla/Editor.py" line="5804"/>
         <source>Include imports from external modules?</source>
         <translation>Zahrnout importy z externích modulů?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="725"/>
+        <location filename="QScintilla/Editor.py" line="727"/>
         <source>dynamic</source>
         <translation>dynamický</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="738"/>
+        <location filename="QScintilla/Editor.py" line="740"/>
         <source>Calltip</source>
         <translation>Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="703"/>
+        <location filename="QScintilla/Editor.py" line="705"/>
         <source>Print Preview</source>
         <translation>Náhled tisku</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="345"/>
+        <location filename="QScintilla/Editor.py" line="347"/>
         <source>&lt;b&gt;A Source Editor Window&lt;/b&gt;&lt;p&gt;This window is used to display and edit a source file.  You can open as many of these as you like. The name of the file is displayed in the window&apos;s titlebar.&lt;/p&gt;&lt;p&gt;In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.&lt;/p&gt;&lt;p&gt;In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.&lt;/p&gt;&lt;p&gt;These actions can be reversed via the context menu.&lt;/p&gt;&lt;p&gt;Ctrl clicking on a syntax error marker shows some info about this error.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Okno editoru zdrojového kódu&lt;/b&gt;&lt;p&gt;V tomto okně se zobrazuje a edituje soubor se zdrojovým kódem. Můžete otevřít oken podle libosti. Jméno souboru se zobrazuje v titlebaru okna.&lt;/p&gt;&lt;p&gt;Kliknutím do prostoru mezi čísly řádku a značkami skládání nastavíte breakpoint. Přes kontextové menu je pak lze editovat.&lt;/p&gt;&lt;p&gt;Záložka se vkládá kliknutím na stejné místo se stisknutou klávesou Shift.&lt;/p&gt;&lt;p&gt;Tyto akce mohou být navráceny zpět i opětovným kliknutím nebo přes kontextové menu.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="659"/>
+        <location filename="QScintilla/Editor.py" line="661"/>
         <source>Typing aids enabled</source>
         <translation>Pomůcky při psaní zapnuty</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="860"/>
+        <location filename="QScintilla/Editor.py" line="862"/>
         <source>End-of-Line Type</source>
         <translation>Typ Konec-řádku</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="864"/>
+        <location filename="QScintilla/Editor.py" line="866"/>
         <source>Unix</source>
         <translation>Unix</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="870"/>
+        <location filename="QScintilla/Editor.py" line="872"/>
         <source>Windows</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="876"/>
+        <location filename="QScintilla/Editor.py" line="878"/>
         <source>Macintosh</source>
         <translation>Macintosh</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="838"/>
+        <location filename="QScintilla/Editor.py" line="840"/>
         <source>Encodings</source>
         <translation>Kódování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="820"/>
+        <location filename="QScintilla/Editor.py" line="822"/>
         <source>Guessed</source>
         <translation>Odhadem</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1133"/>
+        <location filename="QScintilla/Editor.py" line="1135"/>
         <source>Alternatives</source>
         <translation>Alternativy</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1149"/>
+        <location filename="QScintilla/Editor.py" line="1151"/>
         <source>Pygments Lexer</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1149"/>
+        <location filename="QScintilla/Editor.py" line="1151"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Použít Pygments lexer.</translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="6077"/>
+        <source>Check spelling...</source>
+        <translation>Zatrhnout kontrolu...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="636"/>
+        <source>Check spelling of selection...</source>
+        <translation>Zatrhnout výběr kontroly...</translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="6079"/>
-        <source>Check spelling...</source>
-        <translation>Zatrhnout kontrolu...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="634"/>
-        <source>Check spelling of selection...</source>
-        <translation>Zatrhnout výběr kontroly...</translation>
+        <source>Add to dictionary</source>
+        <translation>Přidat do slovníku</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="6081"/>
-        <source>Add to dictionary</source>
-        <translation>Přidat do slovníku</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="6083"/>
         <source>Ignore All</source>
         <translation>Ignorovat vše</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="638"/>
+        <location filename="QScintilla/Editor.py" line="640"/>
         <source>Remove from dictionary</source>
         <translation>Odebrat ze slovníku</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="293"/>
+        <location filename="QScintilla/Editor.py" line="295"/>
         <source>&lt;p&gt;The size of the file &lt;b&gt;{0}&lt;/b&gt; is &lt;b&gt;{1} KB&lt;/b&gt;. Do you really want to load it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Velikost souboru &lt;b&gt;{0}&lt;/b&gt; je &lt;b&gt;{1} KB&lt;/b&gt;. Opravdu jej chcete načíst?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1114"/>
+        <location filename="QScintilla/Editor.py" line="1116"/>
         <source>&lt;p&gt;No exporter available for the export format &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pro formát exportu &lt;b&gt;{0}&lt;/b&gt; není exportér dostupný. Zrušeno.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1129"/>
+        <location filename="QScintilla/Editor.py" line="1131"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativy ({0})</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2388"/>
+        <location filename="QScintilla/Editor.py" line="2386"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; obsahuje neuložené změny.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2537"/>
+        <location filename="QScintilla/Editor.py" line="2535"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nemůže být přejmenován.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -8051,12 +8051,12 @@
         <translation type="obsolete">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5158"/>
+        <location filename="QScintilla/Editor.py" line="5156"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5165"/>
+        <location filename="QScintilla/Editor.py" line="5163"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; je poškozen.&lt;/p&gt;</translation>
     </message>
@@ -8066,107 +8066,107 @@
         <translation type="obsolete">&lt;p&gt;Soubor s makrem &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5216"/>
+        <location filename="QScintilla/Editor.py" line="5214"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;So souboru s makrem &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5372"/>
+        <location filename="QScintilla/Editor.py" line="5370"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric5. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; byl změněn po té co již byl načten do eric5. Znovu načíst?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5519"/>
+        <location filename="QScintilla/Editor.py" line="5517"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5638"/>
+        <location filename="QScintilla/Editor.py" line="5636"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5728"/>
+        <location filename="QScintilla/Editor.py" line="5726"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Zástupce pro soubor &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1033"/>
+        <location filename="QScintilla/Editor.py" line="1035"/>
         <source>Next warning</source>
         <translation>Následující varování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1036"/>
+        <location filename="QScintilla/Editor.py" line="1038"/>
         <source>Previous warning</source>
         <translation>Předchozí varování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1039"/>
+        <location filename="QScintilla/Editor.py" line="1041"/>
         <source>Show warning message</source>
         <translation>Zobrazit varování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1042"/>
+        <location filename="QScintilla/Editor.py" line="1044"/>
         <source>Clear warnings</source>
         <translation>Vyčistit varování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5017"/>
+        <location filename="QScintilla/Editor.py" line="5015"/>
         <source>py3flakes Warning</source>
         <translation>py3flakes varování</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5017"/>
+        <location filename="QScintilla/Editor.py" line="5015"/>
         <source>No py3flakes warning message available.</source>
         <translation>Varování py3flakes není dostupné.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2589"/>
+        <location filename="QScintilla/Editor.py" line="2587"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;&lt;p&gt;Má se přepsat?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5201"/>
+        <location filename="QScintilla/Editor.py" line="5199"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5060"/>
+        <location filename="QScintilla/Editor.py" line="5058"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5066"/>
+        <location filename="QScintilla/Editor.py" line="5064"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5377"/>
+        <location filename="QScintilla/Editor.py" line="5375"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3909"/>
+        <location filename="QScintilla/Editor.py" line="3907"/>
         <source>Activating Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3909"/>
+        <location filename="QScintilla/Editor.py" line="3907"/>
         <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4094"/>
+        <location filename="QScintilla/Editor.py" line="4092"/>
         <source>Activating Calltip Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4094"/>
+        <location filename="QScintilla/Editor.py" line="4092"/>
         <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="700"/>
+        <location filename="QScintilla/Editor.py" line="702"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29417,27 +29417,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="999"/>
+        <location filename="Preferences/__init__.py" line="1001"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1026"/>
+        <location filename="Preferences/__init__.py" line="1028"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1026"/>
+        <location filename="Preferences/__init__.py" line="1028"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1119"/>
+        <location filename="Preferences/__init__.py" line="1121"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1119"/>
+        <location filename="Preferences/__init__.py" line="1121"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -44863,175 +44863,200 @@
 <context>
     <name>TaskFilterConfigDialog</name>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="13"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="14"/>
         <source>Task filter configuration</source>
         <translation>Konfigurace filtru úlohy</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="22"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="23"/>
         <source>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an &quot;&lt;b&gt;and&lt;/b&gt;&quot; operation.</source>
         <translation>Vybrat kategorie, ve kterých mají být úlohy filtrovány. V každé kategorii zadejte vybraná kritéria. Aktivní kategorie je možné kombinovat použitím operátoru &quot;&lt;b&gt;and&lt;/b&gt;&quot;.</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="38"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/>
         <source>Select to filter on the task description</source>
         <translation>Vybrat pro filtrování popisu úlohy</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="41"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="50"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/>
         <source>Enter the description filter as a regular expression.</source>
         <translation>Zadání popisu filtru jako regulární výraz.</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="63"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/>
         <source>Select to filter on the task filename</source>
         <translation>Vybrat pro filtrování jmen souborů úloh</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="66"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="67"/>
         <source>Filename</source>
         <translation>Jméno souboru</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="75"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="76"/>
         <source>Enter the filename filter as a wildcard expression.</source>
         <translation>Zadejte jméno souboru jako výraz s divokými znaky.</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="88"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="89"/>
         <source>Select to filter on the task type</source>
         <translation>Vybrat pro filtrování typů úloh</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="91"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="92"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="100"/>
         <source>Select to show standard tasks only</source>
-        <translation>Vybrat pro zobrazení jen standardních úloh</translation>
+        <translation type="obsolete">Vybrat pro zobrazení jen standardních úloh</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="103"/>
         <source>Standard tasks</source>
-        <translation>Standardní úlohy</translation>
+        <translation type="obsolete">Standardní úlohy</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="110"/>
         <source>Select to show bugfix tasks only</source>
-        <translation>Vybrat jen pro zobrazení bugfix úloh</translation>
+        <translation type="obsolete">Vybrat jen pro zobrazení bugfix úloh</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="113"/>
         <source>Bugfix tasks</source>
-        <translation>Bugfix úlohy</translation>
+        <translation type="obsolete">Bugfix úlohy</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="114"/>
+        <source>Select to filter on the task scope</source>
+        <translation>Vybrat pro filtrování v rozsahu platnosti</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="117"/>
+        <source>Scope</source>
+        <translation>Rozsah platnosti</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="126"/>
-        <source>Select to filter on the task scope</source>
-        <translation>Vybrat pro filtrování v rozsahu platnosti</translation>
+        <source>Select to show global tasks only</source>
+        <translation>Vybrat pro zobrazení jen globálních úloh</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="129"/>
-        <source>Scope</source>
-        <translation>Rozsah platnosti</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="138"/>
-        <source>Select to show global tasks only</source>
-        <translation>Vybrat pro zobrazení jen globálních úloh</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="141"/>
         <source>Global tasks</source>
         <translation>Globální úlohy</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="148"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="136"/>
         <source>Select to show project tasks only</source>
         <translation>Vybrat pro zobrazení jen úloh projektu</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="151"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="139"/>
         <source>Project tasks</source>
         <translation>Úlohy projektu</translation>
     </message>
     <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="152"/>
+        <source>Select to filter on the task completion status</source>
+        <translation>Vybrat pro filtrování podle statusu dokončení úlohy</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="155"/>
+        <source>Completion status</source>
+        <translation>Status dokončení</translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="164"/>
-        <source>Select to filter on the task completion status</source>
-        <translation>Vybrat pro filtrování podle statusu dokončení úlohy</translation>
+        <source>Select to show uncompleted tasks only</source>
+        <translation>Vybrat pro zobrazení jen nedokončených úloh</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="167"/>
-        <source>Completion status</source>
-        <translation>Status dokončení</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="176"/>
-        <source>Select to show uncompleted tasks only</source>
-        <translation>Vybrat pro zobrazení jen nedokončených úloh</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="179"/>
         <source>Uncompleted tasks</source>
         <translation>Nedokončené úlohy</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="186"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="174"/>
         <source>Select to show completed tasks only</source>
         <translation>Vybrat pro zobrazení jen dokončených úloh</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="189"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="177"/>
         <source>Completed tasks</source>
         <translation>Dokončené úlohy</translation>
     </message>
     <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="190"/>
+        <source>Select to filter on the task priority</source>
+        <translation>Vybrat pro filtrování podle priority úloh</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="193"/>
+        <source>Priority</source>
+        <translation>Priorita</translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="202"/>
-        <source>Select to filter on the task priority</source>
-        <translation>Vybrat pro filtrování podle priority úloh</translation>
+        <source>Select to show high priority tasks</source>
+        <translation>Vybrat pro zobrazení úloh s vysokou prioritou</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="205"/>
-        <source>Priority</source>
-        <translation>Priorita</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="214"/>
-        <source>Select to show high priority tasks</source>
-        <translation>Vybrat pro zobrazení úloh s vysokou prioritou</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="217"/>
         <source>High priority tasks</source>
         <translation>Úlohy s vysokou prioritou</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="224"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="212"/>
         <source>Select to show normal priority tasks</source>
         <translation>Vybrat pro zobrazení úloh s normální prioritou</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="227"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="215"/>
         <source>Normal priority tasks</source>
         <translation>Úlohy s normální prioritou</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="234"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="222"/>
         <source>Select to show low priority tasks</source>
         <translation>Vybrat pro zobrazení úloh s nízkou prioritou</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="237"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="225"/>
         <source>Low priority tasks</source>
         <translation>Úlohy s nízkou prioritou</translation>
     </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="101"/>
+        <source>Select the task type to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="32"/>
+        <source>Bugfix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="33"/>
+        <source>Warning</source>
+        <translation type="unfinished">Varování</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="34"/>
+        <source>ToDo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="35"/>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskPropertiesDialog</name>
@@ -45124,128 +45149,128 @@
 <context>
     <name>TaskViewer</name>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Filename</source>
         <translation>Jméno souboru</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Line</source>
         <translation>Řádek</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="434"/>
+        <location filename="Tasks/TaskViewer.py" line="118"/>
         <source>&amp;New Task...</source>
         <translation>&amp;Nová úloha...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="409"/>
+        <location filename="Tasks/TaskViewer.py" line="93"/>
         <source>&amp;Go To</source>
         <translation>&amp;Jít na</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="411"/>
+        <location filename="Tasks/TaskViewer.py" line="95"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopírovat</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="438"/>
+        <location filename="Tasks/TaskViewer.py" line="122"/>
         <source>&amp;Paste</source>
         <translation>V&amp;ložit</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="413"/>
+        <location filename="Tasks/TaskViewer.py" line="97"/>
         <source>&amp;Delete</source>
         <translation>Sma&amp;zat</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="415"/>
+        <location filename="Tasks/TaskViewer.py" line="99"/>
         <source>&amp;Mark Completed</source>
         <translation>Značka &amp;Hotovo</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="441"/>
+        <location filename="Tasks/TaskViewer.py" line="125"/>
         <source>Delete Completed &amp;Tasks</source>
         <translation>Smaza&amp;t hotové úlohy</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="420"/>
+        <location filename="Tasks/TaskViewer.py" line="104"/>
         <source>P&amp;roperties...</source>
         <translation>&amp;Natavení...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="445"/>
+        <location filename="Tasks/TaskViewer.py" line="129"/>
         <source>&amp;Filtered display</source>
         <translation>&amp;Filtrovaný výstup</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="449"/>
+        <location filename="Tasks/TaskViewer.py" line="133"/>
         <source>Filter c&amp;onfiguration...</source>
         <translation>Konfigura&amp;ce filtru...</translation>
     </message>
     <message>
+        <location filename="Tasks/TaskViewer.py" line="136"/>
+        <source>Resi&amp;ze columns</source>
+        <translation>&amp;Změnit šířky sloupců</translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskViewer.py" line="452"/>
-        <source>Resi&amp;ze columns</source>
-        <translation>&amp;Změnit šířky sloupců</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskViewer.py" line="766"/>
         <source>Activate task filter</source>
         <translation>Aktivovat filtr úloh</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="766"/>
+        <location filename="Tasks/TaskViewer.py" line="452"/>
         <source>The task filter doesn&apos;t have any active filters. Do you want to configure the filter settings?</source>
         <translation>Filtr úloh nemá žádný aktivní. Chcete konfigurovat nastavení filtru?</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="396"/>
+        <location filename="Tasks/TaskViewer.py" line="80"/>
         <source>&amp;Regenerate project tasks</source>
         <translation>Znovu vygene&amp;rovat úlohy projektu</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="824"/>
+        <location filename="Tasks/TaskViewer.py" line="514"/>
         <source>Extracting project tasks...</source>
         <translation>Extrahovat úlohy projektu...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="824"/>
+        <location filename="Tasks/TaskViewer.py" line="514"/>
         <source>Abort</source>
         <translation>Přerušit</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Summary</source>
         <translation>Souhrn</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="454"/>
+        <location filename="Tasks/TaskViewer.py" line="138"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="830"/>
+        <location filename="Tasks/TaskViewer.py" line="520"/>
         <source>Extracting project tasks...
 {0}</source>
         <translation>Extrahování úloh projektu....{0}</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="400"/>
+        <location filename="Tasks/TaskViewer.py" line="84"/>
         <source>&amp;Configure scan options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="795"/>
+        <location filename="Tasks/TaskViewer.py" line="481"/>
         <source>Scan Filter Patterns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="795"/>
+        <location filename="Tasks/TaskViewer.py" line="481"/>
         <source>Enter filename patterns of files to be excluded separated by a comma:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="394"/>
+        <location filename="Tasks/TaskViewer.py" line="78"/>
         <source>P&amp;roject Tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45263,80 +45288,105 @@
         <translation>Značky úloh</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="57"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="95"/>
         <source>Enter the tasks markers separated by a space character.</source>
         <translation>Zadejte značky úloh oddělené mezerami.</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="50"/>
         <source>Standard tasks:</source>
-        <translation>Standardní úlohy:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="67"/>
+        <translation type="obsolete">Standardní úlohy:</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="111"/>
         <source>Bugfix tasks:</source>
         <translation>Bugfix úlohy:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="77"/>
         <source>Tasks Colours</source>
-        <translation>Bary úloh</translation>
+        <translation type="obsolete">Bary úloh</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="89"/>
         <source>Select the background colour for project tasks.</source>
-        <translation>Vybrat barvu pozadí pro úlohy projektu..</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro úlohy projektu..</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
         <source>Select the background colour for global tasks.</source>
-        <translation>Vybrat barvu pozadí pro globální úlohy.</translation>
+        <translation type="obsolete">Vybrat barvu pozadí pro globální úlohy.</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="121"/>
         <source>Select the colour for bugfix tasks.</source>
-        <translation>Vybrat barvu pro bugfix úlohy.</translation>
+        <translation type="obsolete">Vybrat barvu pro bugfix úlohy.</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="137"/>
         <source>Select the colour for standard tasks.</source>
-        <translation>Vybrat barvu pro standardní úlohy.</translation>
+        <translation type="obsolete">Vybrat barvu pro standardní úlohy.</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="147"/>
         <source>Bugfix tasks foreground colour:</source>
-        <translation>Vybrat barvu pro bugfix úlohy:</translation>
+        <translation type="obsolete">Vybrat barvu pro bugfix úlohy:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="154"/>
         <source>Global tasks background colour:</source>
-        <translation>Barva pozadí globálních úloh:</translation>
+        <translation type="obsolete">Barva pozadí globálních úloh:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="161"/>
         <source>Project tasks background colour:</source>
-        <translation>Barva pozadí úloh projektu:</translation>
+        <translation type="obsolete">Barva pozadí úloh projektu:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="168"/>
         <source>Standard tasks foreground colour:</source>
-        <translation>Barva standardních úloh:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="191"/>
+        <translation type="obsolete">Barva standardních úloh:</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="219"/>
         <source>Tasks Handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="197"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="225"/>
         <source>Select to clear global file tasks when the file is closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="200"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="228"/>
         <source>Clear global file task when file is closed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="147"/>
+        <source>Warning tasks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="170"/>
+        <source>Todo tasks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="193"/>
+        <source>Note tasks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
+        <source>Tasks Background Colours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
+        <source>Select the background colour for these tasks.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TemplateGroup</name>
Binary file i18n/eric5_de.qm has changed
--- a/i18n/eric5_de.ts	Sat Apr 28 17:00:32 2012 +0200
+++ b/i18n/eric5_de.ts	Sun Apr 29 16:42:02 2012 +0200
@@ -4026,42 +4026,42 @@
         <translation>&amp;Filtere mit:</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>Code Generation</source>
         <translation>Code Erzeugung</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="324"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="326"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Codevorlagedatei &quot;{0}&quot; konnte nicht geöffnet werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="357"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="359"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Quelltextdatei &quot;{0}&quot; konnte nicht geöffnet werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Quelltextdatei &quot;{0}&quot; konnte nicht geschrieben werden.&lt;/p&gt;&lt;p&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>uic error</source>
         <translation>uic Fehler</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>&lt;p&gt;There was an error loading the form &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Es gab einen Fehler beim Laden des Formulars &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>Create Dialog Code</source>
         <translation>Formularcode Generator</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>The file &lt;b&gt;{0}&lt;/b&gt; exists but does not contain any classes.</source>
         <translation>Die datei &lt;b&gt;{0}&lt;/b&gt; existiert, enthält jedoch keine Klassen.</translation>
     </message>
@@ -7140,822 +7140,822 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2589"/>
+        <location filename="QScintilla/Editor.py" line="2587"/>
         <source>Save File</source>
         <translation>Datei sichern</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="589"/>
+        <location filename="QScintilla/Editor.py" line="591"/>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="592"/>
+        <location filename="QScintilla/Editor.py" line="594"/>
         <source>Redo</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="599"/>
+        <location filename="QScintilla/Editor.py" line="601"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="602"/>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="604"/>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="606"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="608"/>
-        <source>Indent</source>
-        <translation>Einrücken</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="610"/>
+        <source>Indent</source>
+        <translation>Einrücken</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="612"/>
         <source>Unindent</source>
         <translation>Einrücken rückgängig</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="613"/>
+        <location filename="QScintilla/Editor.py" line="615"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="616"/>
+        <location filename="QScintilla/Editor.py" line="618"/>
         <source>Uncomment</source>
         <translation>Kommentar entfernen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="688"/>
+        <location filename="QScintilla/Editor.py" line="690"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="692"/>
-        <source>Save</source>
-        <translation>Speichern</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="694"/>
+        <source>Save</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="696"/>
         <source>Save As...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="629"/>
+        <source>Select all</source>
+        <translation>Alles auswählen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="630"/>
+        <source>Deselect all</source>
+        <translation>Auswahl aufheben</translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="627"/>
-        <source>Select all</source>
-        <translation>Alles auswählen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="628"/>
-        <source>Deselect all</source>
-        <translation>Auswahl aufheben</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="625"/>
         <source>Select to brace</source>
         <translation>Zur Klammer auswählen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="705"/>
+        <location filename="QScintilla/Editor.py" line="707"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2215"/>
+        <location filename="QScintilla/Editor.py" line="2217"/>
         <source>Printing...</source>
         <translation>Drucke...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2232"/>
-        <source>Printing completed</source>
-        <translation>Drucken beendet</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="2234"/>
+        <source>Printing completed</source>
+        <translation>Drucken beendet</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="2236"/>
         <source>Error while printing</source>
         <translation>Fehler beim Drucken</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2237"/>
+        <location filename="QScintilla/Editor.py" line="2239"/>
         <source>Printing aborted</source>
         <translation>Drucken abgebrochen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5381"/>
+        <location filename="QScintilla/Editor.py" line="5379"/>
         <source>File changed</source>
         <translation>Datei geändert</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="748"/>
+        <location filename="QScintilla/Editor.py" line="750"/>
         <source>Check</source>
         <translation>Prüfen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2388"/>
+        <location filename="QScintilla/Editor.py" line="2386"/>
         <source>File Modified</source>
         <translation>Datei geändert</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="758"/>
-        <source>Code metrics...</source>
-        <translation>Quelltext Metriken...</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="760"/>
-        <source>Code coverage...</source>
-        <translation>Quelltext Abdeckung...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="768"/>
-        <source>Profile data...</source>
-        <translation>Profildaten...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="756"/>
-        <source>Show</source>
-        <translation>Zeige</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="619"/>
-        <source>Stream Comment</source>
-        <translation>Stream Kommentar</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="622"/>
-        <source>Box Comment</source>
-        <translation>Box Kommentar</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
-        <source>Modification of Read Only file</source>
-        <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
-        <source>You are attempting to change a read only file. Please save to a different file first.</source>
-        <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern sie sie zuerst in eine andere Datei.</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="798"/>
-        <source>Languages</source>
-        <translation>Sprachen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="595"/>
-        <source>Revert to last saved state</source>
-        <translation>Zurück zum letzten gesichert Zustand</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5116"/>
-        <source>Macro Name</source>
-        <translation>Makro Name</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5116"/>
-        <source>Select a macro name:</source>
-        <translation>Wähle einen Makro Namen:</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5184"/>
-        <source>Macro files (*.macro)</source>
-        <translation>Makro Dateien (*.macro)</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5144"/>
-        <source>Load macro file</source>
-        <translation>Lade Makro Datei</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5165"/>
-        <source>Error loading macro</source>
-        <translation>Fehler beim Makro Laden</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5184"/>
-        <source>Save macro file</source>
-        <translation>Makro Datei schreiben</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5201"/>
-        <source>Save macro</source>
-        <translation>Makro speichern</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5216"/>
-        <source>Error saving macro</source>
-        <translation>Fehler beim Makro speichern</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5227"/>
-        <source>Start Macro Recording</source>
-        <translation>Makroaufzeichnung starten</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5252"/>
-        <source>Macro Recording</source>
-        <translation>Makroaufzeichnung</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5252"/>
-        <source>Enter name of the macro:</source>
-        <translation>Gib einen Namen für das Makro ein:</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1010"/>
-        <source>Toggle bookmark</source>
-        <translation>Lesezeichen setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1013"/>
-        <source>Next bookmark</source>
-        <translation>Nächstes Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1016"/>
-        <source>Previous bookmark</source>
-        <translation>Vorheriges Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1019"/>
-        <source>Clear all bookmarks</source>
-        <translation>Alle Lesezeichen löschen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1046"/>
-        <source>Toggle breakpoint</source>
-        <translation>Haltepunkt setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1082"/>
-        <source>LMB toggles bookmarks</source>
-        <translation>LMK schaltet Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1087"/>
-        <source>LMB toggles breakpoints</source>
-        <translation>LMK schaltet Haltepunkte</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1058"/>
-        <source>Next breakpoint</source>
-        <translation>Nächster Haltepunkt</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1061"/>
-        <source>Previous breakpoint</source>
-        <translation>Vorheriger Haltepunkt</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1064"/>
-        <source>Clear all breakpoints</source>
-        <translation>Alle Haltepunkte löschen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1052"/>
-        <source>Edit breakpoint...</source>
-        <translation>Haltepunkt bearbeiten...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4303"/>
-        <source>Enable breakpoint</source>
-        <translation>Haltepunkt aktivieren</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4306"/>
-        <source>Disable breakpoint</source>
-        <translation>Haltepunkt deaktivieren</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4623"/>
-        <source>Code Coverage</source>
-        <translation>Quelltext Abdeckung</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4623"/>
-        <source>Please select a coverage file</source>
-        <translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4761"/>
-        <source>Profile Data</source>
-        <translation>Profildaten</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4761"/>
-        <source>Please select a profile file</source>
-        <translation>Bitte wählen sie eine Datei mit Profildaten</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="666"/>
-        <source>Autocompletion enabled</source>
-        <translation>Autom. Vervollständigung aktiv</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="3813"/>
-        <source>Autocompletion</source>
-        <translation>Autom. Vervollständigung</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="3813"/>
-        <source>Autocompletion is not available because there is no autocompletion source set.</source>
-        <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="649"/>
-        <source>Use Monospaced Font</source>
-        <translation>Benutze Monospace Font</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="641"/>
-        <source>Shorten empty lines</source>
-        <translation>Leere Zeilen verkürzen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="683"/>
-        <source>New view</source>
-        <translation>Neue Ansicht</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1023"/>
-        <source>Goto syntax error</source>
-        <translation>Zu Syntaxfehler gehen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1029"/>
-        <source>Clear syntax error</source>
-        <translation>Syntaxfehler löschen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="654"/>
-        <source>Autosave enabled</source>
-        <translation>Autom. Speicherung aktiv</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5638"/>
-        <source>Drop Error</source>
-        <translation>Drop Fehler</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1026"/>
-        <source>Show syntax error message</source>
-        <translation>Zeige Syntaxfehlermeldung</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4891"/>
-        <source>Syntax Error</source>
-        <translation>Syntaxfehler</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="4891"/>
-        <source>No syntax error message available.</source>
-        <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="1049"/>
-        <source>Toggle temporary breakpoint</source>
-        <translation>Temporären Haltepunkt setzen/löschen</translation>
+        <source>Code metrics...</source>
+        <translation>Quelltext Metriken...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="762"/>
+        <source>Code coverage...</source>
+        <translation>Quelltext Abdeckung...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="770"/>
+        <source>Profile data...</source>
+        <translation>Profildaten...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="758"/>
+        <source>Show</source>
+        <translation>Zeige</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="621"/>
+        <source>Stream Comment</source>
+        <translation>Stream Kommentar</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="624"/>
+        <source>Box Comment</source>
+        <translation>Box Kommentar</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1570"/>
+        <source>Modification of Read Only file</source>
+        <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1570"/>
+        <source>You are attempting to change a read only file. Please save to a different file first.</source>
+        <translation>Sie versuchen, eine schreibgeschützte Datei zu ändern. Bitte speichern sie sie zuerst in eine andere Datei.</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="800"/>
+        <source>Languages</source>
+        <translation>Sprachen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="597"/>
+        <source>Revert to last saved state</source>
+        <translation>Zurück zum letzten gesichert Zustand</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5114"/>
+        <source>Macro Name</source>
+        <translation>Makro Name</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5114"/>
+        <source>Select a macro name:</source>
+        <translation>Wähle einen Makro Namen:</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5182"/>
+        <source>Macro files (*.macro)</source>
+        <translation>Makro Dateien (*.macro)</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5142"/>
+        <source>Load macro file</source>
+        <translation>Lade Makro Datei</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5163"/>
+        <source>Error loading macro</source>
+        <translation>Fehler beim Makro Laden</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5182"/>
+        <source>Save macro file</source>
+        <translation>Makro Datei schreiben</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5199"/>
+        <source>Save macro</source>
+        <translation>Makro speichern</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5214"/>
+        <source>Error saving macro</source>
+        <translation>Fehler beim Makro speichern</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5225"/>
+        <source>Start Macro Recording</source>
+        <translation>Makroaufzeichnung starten</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5250"/>
+        <source>Macro Recording</source>
+        <translation>Makroaufzeichnung</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5250"/>
+        <source>Enter name of the macro:</source>
+        <translation>Gib einen Namen für das Makro ein:</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1012"/>
+        <source>Toggle bookmark</source>
+        <translation>Lesezeichen setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1015"/>
+        <source>Next bookmark</source>
+        <translation>Nächstes Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1018"/>
+        <source>Previous bookmark</source>
+        <translation>Vorheriges Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1021"/>
+        <source>Clear all bookmarks</source>
+        <translation>Alle Lesezeichen löschen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1048"/>
+        <source>Toggle breakpoint</source>
+        <translation>Haltepunkt setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1084"/>
+        <source>LMB toggles bookmarks</source>
+        <translation>LMK schaltet Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1089"/>
+        <source>LMB toggles breakpoints</source>
+        <translation>LMK schaltet Haltepunkte</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1060"/>
+        <source>Next breakpoint</source>
+        <translation>Nächster Haltepunkt</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1063"/>
+        <source>Previous breakpoint</source>
+        <translation>Vorheriger Haltepunkt</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1066"/>
+        <source>Clear all breakpoints</source>
+        <translation>Alle Haltepunkte löschen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1054"/>
+        <source>Edit breakpoint...</source>
+        <translation>Haltepunkt bearbeiten...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4301"/>
+        <source>Enable breakpoint</source>
+        <translation>Haltepunkt aktivieren</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4304"/>
+        <source>Disable breakpoint</source>
+        <translation>Haltepunkt deaktivieren</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4621"/>
+        <source>Code Coverage</source>
+        <translation>Quelltext Abdeckung</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4621"/>
+        <source>Please select a coverage file</source>
+        <translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4759"/>
+        <source>Profile Data</source>
+        <translation>Profildaten</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4759"/>
+        <source>Please select a profile file</source>
+        <translation>Bitte wählen sie eine Datei mit Profildaten</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="668"/>
+        <source>Autocompletion enabled</source>
+        <translation>Autom. Vervollständigung aktiv</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="3811"/>
+        <source>Autocompletion</source>
+        <translation>Autom. Vervollständigung</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="3811"/>
+        <source>Autocompletion is not available because there is no autocompletion source set.</source>
+        <translation>Die automatische Vervollständigung ist nicht verfügbar, da keine Quelle gesetzt ist.</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="651"/>
+        <source>Use Monospaced Font</source>
+        <translation>Benutze Monospace Font</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="643"/>
+        <source>Shorten empty lines</source>
+        <translation>Leere Zeilen verkürzen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="685"/>
+        <source>New view</source>
+        <translation>Neue Ansicht</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1025"/>
+        <source>Goto syntax error</source>
+        <translation>Zu Syntaxfehler gehen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1031"/>
+        <source>Clear syntax error</source>
+        <translation>Syntaxfehler löschen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="656"/>
+        <source>Autosave enabled</source>
+        <translation>Autom. Speicherung aktiv</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="5636"/>
+        <source>Drop Error</source>
+        <translation>Drop Fehler</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1028"/>
+        <source>Show syntax error message</source>
+        <translation>Zeige Syntaxfehlermeldung</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4889"/>
+        <source>Syntax Error</source>
+        <translation>Syntaxfehler</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="4889"/>
+        <source>No syntax error message available.</source>
+        <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="1051"/>
+        <source>Toggle temporary breakpoint</source>
+        <translation>Temporären Haltepunkt setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="764"/>
         <source>Show code coverage annotations</source>
         <translation>Markiere Zeilen ohne Abdeckung</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="765"/>
+        <location filename="QScintilla/Editor.py" line="767"/>
         <source>Hide code coverage annotations</source>
         <translation>Lösche Abdeckungsmarkierungen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1068"/>
+        <location filename="QScintilla/Editor.py" line="1070"/>
         <source>Next uncovered line</source>
         <translation>Nächste nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1071"/>
+        <location filename="QScintilla/Editor.py" line="1073"/>
         <source>Previous uncovered line</source>
         <translation>Vorige nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4669"/>
+        <location filename="QScintilla/Editor.py" line="4667"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zeilen ohne Abdeckung Markieren</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4665"/>
+        <location filename="QScintilla/Editor.py" line="4663"/>
         <source>All lines have been covered.</source>
         <translation>Alle Zeilen sind abgedeckt.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4669"/>
+        <location filename="QScintilla/Editor.py" line="4667"/>
         <source>There is no coverage file available.</source>
         <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2388"/>
+        <location filename="QScintilla/Editor.py" line="2386"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; enthält ungesicherte Änderungen.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5158"/>
+        <location filename="QScintilla/Editor.py" line="5156"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makro Datei &lt;b&gt;{0}&lt;/b&gt; kann nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5165"/>
+        <location filename="QScintilla/Editor.py" line="5163"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makro Datei &lt;b&gt;{0}&lt;/b&gt; ist zerstört.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5216"/>
+        <location filename="QScintilla/Editor.py" line="5214"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makro Datei &lt;b&gt;{0}&lt;/b&gt; kann nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5638"/>
+        <location filename="QScintilla/Editor.py" line="5636"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="684"/>
+        <location filename="QScintilla/Editor.py" line="686"/>
         <source>New view (with new split)</source>
         <translation>Neue Ansicht (in neuem Abschnitt)</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="293"/>
+        <location filename="QScintilla/Editor.py" line="295"/>
         <source>&lt;p&gt;The size of the file &lt;b&gt;{0}&lt;/b&gt; is &lt;b&gt;{1} KB&lt;/b&gt;. Do you really want to load it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Größe der Datei &lt;b&gt;{0}&lt;/b&gt; ist &lt;b&gt;{1} KB&lt;7B&gt;. Soll sie wirklich geladen werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="778"/>
-        <source>Diagrams</source>
-        <translation>Diagramme</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="780"/>
-        <source>Class Diagram...</source>
-        <translation>Klassendiagramm...</translation>
+        <source>Diagrams</source>
+        <translation>Diagramme</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="782"/>
-        <source>Package Diagram...</source>
-        <translation>Package Diagramm...</translation>
+        <source>Class Diagram...</source>
+        <translation>Klassendiagramm...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="784"/>
+        <source>Package Diagram...</source>
+        <translation>Package Diagramm...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="786"/>
         <source>Imports Diagram...</source>
         <translation>Imports-Diagramm...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="787"/>
+        <location filename="QScintilla/Editor.py" line="789"/>
         <source>Application Diagram...</source>
         <translation>Applikations-Diagramm...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="801"/>
+        <location filename="QScintilla/Editor.py" line="803"/>
         <source>No Language</source>
         <translation>Keine Sprache</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5519"/>
+        <location filename="QScintilla/Editor.py" line="5517"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="5654"/>
+        <source>Resources</source>
+        <translation>Resourcen</translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="5656"/>
-        <source>Resources</source>
-        <translation>Resourcen</translation>
+        <source>Add file...</source>
+        <translation>Datei hinzufügen...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5658"/>
-        <source>Add file...</source>
-        <translation>Datei hinzufügen...</translation>
+        <source>Add files...</source>
+        <translation>Dateien hinzufügen...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5660"/>
-        <source>Add files...</source>
-        <translation>Dateien hinzufügen...</translation>
+        <source>Add aliased file...</source>
+        <translation>Aliased Datei hinzufügen...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5662"/>
-        <source>Add aliased file...</source>
-        <translation>Aliased Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5664"/>
         <source>Add localized resource...</source>
         <translation>Lokalisierte Resource hinzufügen...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5685"/>
+        <location filename="QScintilla/Editor.py" line="5683"/>
         <source>Add file resource</source>
         <translation>Dateiresource hinzufügen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5701"/>
+        <location filename="QScintilla/Editor.py" line="5699"/>
         <source>Add file resources</source>
         <translation>Dateiresourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5728"/>
+        <location filename="QScintilla/Editor.py" line="5726"/>
         <source>Add aliased file resource</source>
         <translation>Aliased Dateiresourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5728"/>
+        <location filename="QScintilla/Editor.py" line="5726"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation>Alias für Datei &lt;b&gt;{0}&lt;/b&gt;:</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5789"/>
+        <location filename="QScintilla/Editor.py" line="5787"/>
         <source>Package Diagram</source>
         <translation>Package-Diagramm</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5789"/>
+        <location filename="QScintilla/Editor.py" line="5787"/>
         <source>Include class attributes?</source>
         <translation>Klassenattribute anzeigen?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5818"/>
+        <location filename="QScintilla/Editor.py" line="5816"/>
         <source>Application Diagram</source>
         <translation>Applikations-Diagramm</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5818"/>
+        <location filename="QScintilla/Editor.py" line="5816"/>
         <source>Include module names?</source>
         <translation>Modulnamen anzeigen?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5667"/>
+        <location filename="QScintilla/Editor.py" line="5665"/>
         <source>Add resource frame</source>
         <translation>Resource Rahmen hinzufügen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5227"/>
+        <location filename="QScintilla/Editor.py" line="5225"/>
         <source>Macro recording is already active. Start new?</source>
         <translation>Eine Makroaufzeichnung ist bereits aktiv. Neu starten?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1075"/>
+        <location filename="QScintilla/Editor.py" line="1077"/>
         <source>Next task</source>
         <translation>Nächste Aufgabe</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1078"/>
+        <location filename="QScintilla/Editor.py" line="1080"/>
         <source>Previous task</source>
         <translation>Vorherige Aufgabe</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="722"/>
+        <location filename="QScintilla/Editor.py" line="724"/>
         <source>Autocomplete</source>
         <translation>Vervollständigen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="728"/>
+        <location filename="QScintilla/Editor.py" line="730"/>
         <source>from Document</source>
         <translation>vom Dokument</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="731"/>
+        <location filename="QScintilla/Editor.py" line="733"/>
         <source>from APIs</source>
         <translation>von APIs</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="734"/>
+        <location filename="QScintilla/Editor.py" line="736"/>
         <source>from Document and APIs</source>
         <translation>vom Dokument und von APIs</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="891"/>
+        <location filename="QScintilla/Editor.py" line="893"/>
         <source>Export as</source>
         <translation>Exportieren als</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>Export source</source>
         <translation>Quelltext exportieren</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1114"/>
+        <location filename="QScintilla/Editor.py" line="1116"/>
         <source>&lt;p&gt;No exporter available for the export format &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Für das Exportformat &lt;b&gt;{0}&lt;/b&gt; steht kein Exporter zur Verfügung. Abbruch...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>No export format given. Aborting...</source>
         <translation>Kein Exportformat angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5806"/>
+        <location filename="QScintilla/Editor.py" line="5804"/>
         <source>Imports Diagram</source>
         <translation>Imports Diagramm</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5806"/>
+        <location filename="QScintilla/Editor.py" line="5804"/>
         <source>Include imports from external modules?</source>
         <translation>Imports externer Module anzeigen?</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="725"/>
+        <location filename="QScintilla/Editor.py" line="727"/>
         <source>dynamic</source>
         <translation>dynamisch</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="738"/>
+        <location filename="QScintilla/Editor.py" line="740"/>
         <source>Calltip</source>
         <translation>Calltip</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="703"/>
+        <location filename="QScintilla/Editor.py" line="705"/>
         <source>Print Preview</source>
         <translation>Seitenansicht</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="345"/>
+        <location filename="QScintilla/Editor.py" line="347"/>
         <source>&lt;b&gt;A Source Editor Window&lt;/b&gt;&lt;p&gt;This window is used to display and edit a source file.  You can open as many of these as you like. The name of the file is displayed in the window&apos;s titlebar.&lt;/p&gt;&lt;p&gt;In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.&lt;/p&gt;&lt;p&gt;In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.&lt;/p&gt;&lt;p&gt;These actions can be reversed via the context menu.&lt;/p&gt;&lt;p&gt;Ctrl clicking on a syntax error marker shows some info about this error.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Quelltext Editor Fenster&lt;/b&gt;&lt;p&gt;Dieses Fenster wird zum Bearbeiten von Quelltexten benutzt. Sie können beliebig viele dieser Fenster öffnen. Der Name der Datei wird im Titel des Fensters dargestellt.&lt;/p&gt;&lt;p&gt;Um Haltepunkte zu setzen, klicken sie in den Raum zwischen den Zeilennummern und der Faltungsspalte. Über das Kontextmenü des Bereiches links des Editors können Haltepunkte bearbeitet werden.&lt;/p&gt;&lt;p&gt;Um Lesezeichen zu setzen, drücken sie die Shift-Taste und klicken in den Raum zwischen den Zeilennummern und der Faltungsspalte.&lt;/p&gt;&lt;p&gt;Diese Aktionen können über das Kontextmenü umgedreht werden.&lt;/p&gt;&lt;p&gt;Ein Klick auf einen Syntaxfehler-Marker mit gedrückter Strg-Taste zeigt die zugehörige Fehlermeldung an.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="659"/>
+        <location filename="QScintilla/Editor.py" line="661"/>
         <source>Typing aids enabled</source>
         <translation>Eingabehilfen aktiv</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="860"/>
+        <location filename="QScintilla/Editor.py" line="862"/>
         <source>End-of-Line Type</source>
         <translation>Zeilenendemarkierung</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="864"/>
+        <location filename="QScintilla/Editor.py" line="866"/>
         <source>Unix</source>
         <translation>Unix</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="870"/>
+        <location filename="QScintilla/Editor.py" line="872"/>
         <source>Windows</source>
         <translation>Windows</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="876"/>
+        <location filename="QScintilla/Editor.py" line="878"/>
         <source>Macintosh</source>
         <translation>Macintosh</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="838"/>
+        <location filename="QScintilla/Editor.py" line="840"/>
         <source>Encodings</source>
         <translation>Kodierungen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="820"/>
+        <location filename="QScintilla/Editor.py" line="822"/>
         <source>Guessed</source>
         <translation>Ermittelt</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1133"/>
+        <location filename="QScintilla/Editor.py" line="1135"/>
         <source>Alternatives</source>
         <translation>Alternativen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1129"/>
+        <location filename="QScintilla/Editor.py" line="1131"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativen ({0})</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1149"/>
+        <location filename="QScintilla/Editor.py" line="1151"/>
         <source>Pygments Lexer</source>
         <translation>Pygments Lexer</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1149"/>
+        <location filename="QScintilla/Editor.py" line="1151"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="6077"/>
+        <source>Check spelling...</source>
+        <translation>Rechtschreibprüfung...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="636"/>
+        <source>Check spelling of selection...</source>
+        <translation>Rechtschreibprüfung für Auswahl...</translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="6079"/>
-        <source>Check spelling...</source>
-        <translation>Rechtschreibprüfung...</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="634"/>
-        <source>Check spelling of selection...</source>
-        <translation>Rechtschreibprüfung für Auswahl...</translation>
+        <source>Add to dictionary</source>
+        <translation>Zum Wörterbuch hinzufügen</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="6081"/>
-        <source>Add to dictionary</source>
-        <translation>Zum Wörterbuch hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="6083"/>
         <source>Ignore All</source>
         <translation>Alle ignorieren</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="638"/>
+        <location filename="QScintilla/Editor.py" line="640"/>
         <source>Remove from dictionary</source>
         <translation>Aus dem Wörterbuch entfernen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geöffnet werden.&lt;br /&gt;Ursache: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2537"/>
+        <location filename="QScintilla/Editor.py" line="2535"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gesichert werden.&lt;br/&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5372"/>
+        <location filename="QScintilla/Editor.py" line="5370"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric5. Reread it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; wurde geändert, während sie in eric5 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1033"/>
+        <location filename="QScintilla/Editor.py" line="1035"/>
         <source>Next warning</source>
         <translation>Nächste Warnung</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1036"/>
+        <location filename="QScintilla/Editor.py" line="1038"/>
         <source>Previous warning</source>
         <translation>Vorherige Warnung</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1039"/>
+        <location filename="QScintilla/Editor.py" line="1041"/>
         <source>Show warning message</source>
         <translation>Zeige Warnung</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1042"/>
+        <location filename="QScintilla/Editor.py" line="1044"/>
         <source>Clear warnings</source>
         <translation>Warnungen löschen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5017"/>
+        <location filename="QScintilla/Editor.py" line="5015"/>
         <source>py3flakes Warning</source>
         <translation>py3flakes Warnung</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5017"/>
+        <location filename="QScintilla/Editor.py" line="5015"/>
         <source>No py3flakes warning message available.</source>
         <translation>Keine Py3flakes Warnung verfügbar.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2589"/>
+        <location filename="QScintilla/Editor.py" line="2587"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5201"/>
+        <location filename="QScintilla/Editor.py" line="5199"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Makro Datei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5060"/>
+        <location filename="QScintilla/Editor.py" line="5058"/>
         <source>Warning: {0}</source>
         <translation>Warnung: {0}</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5066"/>
+        <location filename="QScintilla/Editor.py" line="5064"/>
         <source>Error: {0}</source>
         <translation>Fehler: {0}</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5377"/>
+        <location filename="QScintilla/Editor.py" line="5375"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation>&lt;br&gt;&lt;b&gt;Warnung:&lt;/b&gt; Vorgenommenen Änderungen gehen beim neu einlesen verloren.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3909"/>
+        <location filename="QScintilla/Editor.py" line="3907"/>
         <source>Activating Auto-Completion Provider</source>
         <translation>Aktivierung eines Providers für automatische Vervollständigungen</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3909"/>
+        <location filename="QScintilla/Editor.py" line="3907"/>
         <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation>Ein Providers für automatische Vervollständigungen kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen sie ihre Konfiguration.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4094"/>
+        <location filename="QScintilla/Editor.py" line="4092"/>
         <source>Activating Calltip Provider</source>
         <translation>Aktivierung eines Providers für Calltips</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4094"/>
+        <location filename="QScintilla/Editor.py" line="4092"/>
         <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation>Ein Providers für Calltips kann nicht angebunden werden, da bereits ein anderer aktiv ist. Bitte überprüfen sie ihre Konfiguration.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="700"/>
+        <location filename="QScintilla/Editor.py" line="702"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation>Öffne &quot;Ablehnungs&quot;-Datei</translation>
     </message>
@@ -28545,27 +28545,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="999"/>
+        <location filename="Preferences/__init__.py" line="1001"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1026"/>
+        <location filename="Preferences/__init__.py" line="1028"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1026"/>
+        <location filename="Preferences/__init__.py" line="1028"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1119"/>
+        <location filename="Preferences/__init__.py" line="1121"/>
         <source>Select Python2 Interpreter</source>
         <translation>Wähle den Python2 Interpreter</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1119"/>
+        <location filename="Preferences/__init__.py" line="1121"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation>
     </message>
@@ -43718,175 +43718,180 @@
 <context>
     <name>TaskFilterConfigDialog</name>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="13"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="14"/>
         <source>Task filter configuration</source>
         <translation>Aufgabenfilter Konfiguration</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="22"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="23"/>
         <source>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an &quot;&lt;b&gt;and&lt;/b&gt;&quot; operation.</source>
         <translation>Wähle die Kategorien, nach denen die Aufgabenliste gefiltert werden soll. Gib das Filterkriterium in jeder Kategorie ein. Die aktivierten Kategorien werden &quot;&lt;b&gt;und&lt;/b&gt;&quot; verknüpft.</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="38"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/>
         <source>Select to filter on the task description</source>
         <translation>Auswählen, um über die Aufgabenbeschreibung zu filtern</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="41"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/>
         <source>Description</source>
         <translation>BeschreibungBeschreibung</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="50"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/>
         <source>Enter the description filter as a regular expression.</source>
         <translation>Gib den Beschreibungsfilter als regulären Ausdruck ein.</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="63"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/>
         <source>Select to filter on the task filename</source>
         <translation>Auswählen, um über den Dateinamen der Aufgabe zu filtern</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="66"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="67"/>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="75"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="76"/>
         <source>Enter the filename filter as a wildcard expression.</source>
         <translation>Gib den Dateinamen als Wildcard Ausdruck ein.</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="88"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="89"/>
         <source>Select to filter on the task type</source>
         <translation>Auswählen, um über den Aufgabentyp zu filtern</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="91"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="92"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="100"/>
-        <source>Select to show standard tasks only</source>
-        <translation>Auswählen, um nur normale Aufgaben anzuzeigen</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="103"/>
-        <source>Standard tasks</source>
-        <translation>Normale Aufgaben</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="110"/>
-        <source>Select to show bugfix tasks only</source>
-        <translation>Auswählen, um nur Fehlerbehebungsaufgaben anzuzeigen</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="113"/>
-        <source>Bugfix tasks</source>
-        <translation>Fehlerbehebungen</translation>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="114"/>
+        <source>Select to filter on the task scope</source>
+        <translation>Auswählen, um über den Anwendungsbereich zu filtern</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="117"/>
+        <source>Scope</source>
+        <translation>Anwendungsbereich</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="126"/>
-        <source>Select to filter on the task scope</source>
-        <translation>Auswählen, um über den Anwendungsbereich zu filtern</translation>
+        <source>Select to show global tasks only</source>
+        <translation>Auswählen, um nur globale Aufgaben anzuzeigen</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="129"/>
-        <source>Scope</source>
-        <translation>Anwendungsbereich</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="138"/>
-        <source>Select to show global tasks only</source>
-        <translation>Auswählen, um nur globale Aufgaben anzuzeigen</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="141"/>
         <source>Global tasks</source>
         <translation>Globale Aufgaben</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="148"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="136"/>
         <source>Select to show project tasks only</source>
         <translation>Auswählen, um nur Projektaufgaben anzuzeigen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="151"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="139"/>
         <source>Project tasks</source>
         <translation>Projektaufgaben</translation>
     </message>
     <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="152"/>
+        <source>Select to filter on the task completion status</source>
+        <translation>Auswählen, um über den Fertigstellungsgrad zu filtern</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="155"/>
+        <source>Completion status</source>
+        <translation>Fertigstellungsgrad</translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="164"/>
-        <source>Select to filter on the task completion status</source>
-        <translation>Auswählen, um über den Fertigstellungsgrad zu filtern</translation>
+        <source>Select to show uncompleted tasks only</source>
+        <translation>Auswählen, um nur offene Aufgaben anzuzeigen</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="167"/>
-        <source>Completion status</source>
-        <translation>Fertigstellungsgrad</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="176"/>
-        <source>Select to show uncompleted tasks only</source>
-        <translation>Auswählen, um nur offene Aufgaben anzuzeigen</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="179"/>
         <source>Uncompleted tasks</source>
         <translation>Offene Aufgaben</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="186"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="174"/>
         <source>Select to show completed tasks only</source>
         <translation>Auswählen, um nur fertiggestellte Aufgaben anzuzeigen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="189"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="177"/>
         <source>Completed tasks</source>
         <translation>Fertige Aufgaben</translation>
     </message>
     <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="190"/>
+        <source>Select to filter on the task priority</source>
+        <translation>Auswählen, um über die Priorität zu filtern</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="193"/>
+        <source>Priority</source>
+        <translation>Priorität</translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="202"/>
-        <source>Select to filter on the task priority</source>
-        <translation>Auswählen, um über die Priorität zu filtern</translation>
+        <source>Select to show high priority tasks</source>
+        <translation>Auswählen, um Aufgaben hoher Priorität anzuzeigen</translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="205"/>
-        <source>Priority</source>
-        <translation>Priorität</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="214"/>
-        <source>Select to show high priority tasks</source>
-        <translation>Auswählen, um Aufgaben hoher Priorität anzuzeigen</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="217"/>
         <source>High priority tasks</source>
         <translation>Hoch</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="224"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="212"/>
         <source>Select to show normal priority tasks</source>
         <translation>Auswählen, um Aufgaben normaler Priorität anzuzeigen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="227"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="215"/>
         <source>Normal priority tasks</source>
         <translation>Normal</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="234"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="222"/>
         <source>Select to show low priority tasks</source>
         <translation>Auswählen, um Aufgaben niedriger Priorität anzuzeigen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="237"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="225"/>
         <source>Low priority tasks</source>
         <translation>Niedrig</translation>
     </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="101"/>
+        <source>Select the task type to be shown</source>
+        <translation>Wähle den anzuzeigenden Aufgabentypen aus</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="32"/>
+        <source>Bugfix</source>
+        <translation>Fehlerbehebung</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="33"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="34"/>
+        <source>ToDo</source>
+        <translation>Aufgabe</translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="35"/>
+        <source>Note</source>
+        <translation>Hinweis</translation>
+    </message>
 </context>
 <context>
     <name>TaskPropertiesDialog</name>
@@ -43979,129 +43984,129 @@
 <context>
     <name>TaskViewer</name>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Filename</source>
         <translation>Dateiname</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Line</source>
         <translation>Zeile</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="409"/>
+        <location filename="Tasks/TaskViewer.py" line="93"/>
         <source>&amp;Go To</source>
         <translation>&amp;Gehe zu</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="411"/>
+        <location filename="Tasks/TaskViewer.py" line="95"/>
         <source>&amp;Copy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="438"/>
+        <location filename="Tasks/TaskViewer.py" line="122"/>
         <source>&amp;Paste</source>
         <translation>Ein&amp;fügen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="413"/>
+        <location filename="Tasks/TaskViewer.py" line="97"/>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="415"/>
+        <location filename="Tasks/TaskViewer.py" line="99"/>
         <source>&amp;Mark Completed</source>
         <translation>Als &amp;beendet markieren</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="441"/>
+        <location filename="Tasks/TaskViewer.py" line="125"/>
         <source>Delete Completed &amp;Tasks</source>
         <translation>Lösche beendete &amp;Aufgaben</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="434"/>
+        <location filename="Tasks/TaskViewer.py" line="118"/>
         <source>&amp;New Task...</source>
         <translation>&amp;Neue Aufgabe...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="420"/>
+        <location filename="Tasks/TaskViewer.py" line="104"/>
         <source>P&amp;roperties...</source>
         <translation>&amp;Eigenschaften...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="445"/>
+        <location filename="Tasks/TaskViewer.py" line="129"/>
         <source>&amp;Filtered display</source>
         <translation>Gef&amp;ilterte Anzeige</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="449"/>
+        <location filename="Tasks/TaskViewer.py" line="133"/>
         <source>Filter c&amp;onfiguration...</source>
         <translation>Fil&amp;terkonfiguration...</translation>
     </message>
     <message>
+        <location filename="Tasks/TaskViewer.py" line="136"/>
+        <source>Resi&amp;ze columns</source>
+        <translation>Spaltenbreite an&amp;passen</translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskViewer.py" line="452"/>
-        <source>Resi&amp;ze columns</source>
-        <translation>Spaltenbreite an&amp;passen</translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskViewer.py" line="766"/>
         <source>Activate task filter</source>
         <translation>Aufgabenfilter aktivieren</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="766"/>
+        <location filename="Tasks/TaskViewer.py" line="452"/>
         <source>The task filter doesn&apos;t have any active filters. Do you want to configure the filter settings?</source>
         <translation>Der Aufgabenfilter hat keinen aktiven Filter. Soll die Filterkonfiguration erstellt werden?</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="396"/>
+        <location filename="Tasks/TaskViewer.py" line="80"/>
         <source>&amp;Regenerate project tasks</source>
         <translation>Projektaufgaben &amp;regenerieren</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="824"/>
+        <location filename="Tasks/TaskViewer.py" line="514"/>
         <source>Extracting project tasks...</source>
         <translation>Extrahiere Projektaufgaben...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="824"/>
+        <location filename="Tasks/TaskViewer.py" line="514"/>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="830"/>
+        <location filename="Tasks/TaskViewer.py" line="520"/>
         <source>Extracting project tasks...
 {0}</source>
         <translation>Extrahiere Projektaufgaben...
 {0}</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Summary</source>
         <translation>Zusammenfassung</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="454"/>
+        <location filename="Tasks/TaskViewer.py" line="138"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="400"/>
+        <location filename="Tasks/TaskViewer.py" line="84"/>
         <source>&amp;Configure scan options</source>
         <translation>Scanoptionen &amp;konfigurieren</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="795"/>
+        <location filename="Tasks/TaskViewer.py" line="481"/>
         <source>Scan Filter Patterns</source>
         <translation>Scanfiltermuster</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="795"/>
+        <location filename="Tasks/TaskViewer.py" line="481"/>
         <source>Enter filename patterns of files to be excluded separated by a comma:</source>
         <translation>Gib Dateimuster getrennt durch Komma von Dateien ein, die ignoriert werden sollen:</translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="394"/>
+        <location filename="Tasks/TaskViewer.py" line="78"/>
         <source>P&amp;roject Tasks</source>
         <translation>&amp;Projektaufgaben</translation>
     </message>
@@ -44114,64 +44119,14 @@
         <translation>Aufgaben Indikator</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="57"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="95"/>
         <source>Enter the tasks markers separated by a space character.</source>
         <translation>Gib die Aufgabenindikatoren durch ein Leerzeichen getrennt ein.</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="50"/>
-        <source>Standard tasks:</source>
-        <translation>Standardaufgaben:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="67"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="111"/>
         <source>Bugfix tasks:</source>
-        <translation>Fehlerbehebungsaufgaben:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="77"/>
-        <source>Tasks Colours</source>
-        <translation>Farben für Aufgaben</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="89"/>
-        <source>Select the background colour for project tasks.</source>
-        <translation>Wähle die Hintergrundfarbe für Projektaufgaben.</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Select the background colour for global tasks.</source>
-        <translation>Wähle die Hintergrundfarbe für globale Aufgaben.</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="121"/>
-        <source>Select the colour for bugfix tasks.</source>
-        <translation>Wähle die Farbe für Fehlerbehebungsaufgaben.</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="137"/>
-        <source>Select the colour for standard tasks.</source>
-        <translation>Wähle die Farbe für Standardaufgaben.</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="147"/>
-        <source>Bugfix tasks foreground colour:</source>
-        <translation>Vordergrundfarbe für Fehlerbehebungsaufgaben:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="154"/>
-        <source>Global tasks background colour:</source>
-        <translation>Hintergrundfarbe für globale Aufgaben:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="161"/>
-        <source>Project tasks background colour:</source>
-        <translation>Hintergrundfarbe für Projektaufgaben:</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="168"/>
-        <source>Standard tasks foreground colour:</source>
-        <translation>Vordergrundfarbe für Standardaufgaben:</translation>
+        <translation>Fehlerbehebung:</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="17"/>
@@ -44179,20 +44134,45 @@
         <translation>&lt;b&gt;Aufgaben Einstellungen&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="191"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="219"/>
         <source>Tasks Handling</source>
         <translation>Aufgabenbehandlung</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="197"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="225"/>
         <source>Select to clear global file tasks when the file is closed</source>
         <translation>Auswählen, um globale, dateibasierte Aufgaben zu löschen, wenn die Datei geschlossen wird</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="200"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="228"/>
         <source>Clear global file task when file is closed</source>
         <translation>Globale, dateibasierte Aufgaben löschen, wenn Datei geschlossen wird</translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="147"/>
+        <source>Warning tasks:</source>
+        <translation>Warnung:</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="170"/>
+        <source>Todo tasks:</source>
+        <translation>Aufgabe:</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="193"/>
+        <source>Note tasks:</source>
+        <translation>Hinweis:</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
+        <source>Tasks Background Colours</source>
+        <translation>Hintergrundfarbe für Aufgaben</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
+        <source>Select the background colour for these tasks.</source>
+        <translation>Wähle die Hintergrundfarbe für diesen Aufgabentyp.</translation>
+    </message>
 </context>
 <context>
     <name>TemplateGroup</name>
--- a/i18n/eric5_en.ts	Sat Apr 28 17:00:32 2012 +0200
+++ b/i18n/eric5_en.ts	Sun Apr 29 16:42:02 2012 +0200
@@ -3989,42 +3989,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>Create Dialog Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>The file &lt;b&gt;{0}&lt;/b&gt; exists but does not contain any classes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>uic error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>&lt;p&gt;There was an error loading the form &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>Code Generation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="324"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="326"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="357"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="359"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7067,822 +7067,822 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="293"/>
+        <location filename="QScintilla/Editor.py" line="295"/>
         <source>&lt;p&gt;The size of the file &lt;b&gt;{0}&lt;/b&gt; is &lt;b&gt;{1} KB&lt;/b&gt;. Do you really want to load it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="345"/>
+        <location filename="QScintilla/Editor.py" line="347"/>
         <source>&lt;b&gt;A Source Editor Window&lt;/b&gt;&lt;p&gt;This window is used to display and edit a source file.  You can open as many of these as you like. The name of the file is displayed in the window&apos;s titlebar.&lt;/p&gt;&lt;p&gt;In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.&lt;/p&gt;&lt;p&gt;In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.&lt;/p&gt;&lt;p&gt;These actions can be reversed via the context menu.&lt;/p&gt;&lt;p&gt;Ctrl clicking on a syntax error marker shows some info about this error.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="589"/>
+        <location filename="QScintilla/Editor.py" line="591"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="592"/>
+        <location filename="QScintilla/Editor.py" line="594"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="595"/>
+        <location filename="QScintilla/Editor.py" line="597"/>
         <source>Revert to last saved state</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="599"/>
+        <location filename="QScintilla/Editor.py" line="601"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="602"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="604"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="606"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="608"/>
-        <source>Indent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="610"/>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="612"/>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="613"/>
+        <location filename="QScintilla/Editor.py" line="615"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="616"/>
+        <location filename="QScintilla/Editor.py" line="618"/>
         <source>Uncomment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="619"/>
+        <location filename="QScintilla/Editor.py" line="621"/>
         <source>Stream Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="622"/>
+        <location filename="QScintilla/Editor.py" line="624"/>
         <source>Box Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="625"/>
-        <source>Select to brace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="627"/>
+        <source>Select to brace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="629"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="628"/>
+        <location filename="QScintilla/Editor.py" line="630"/>
         <source>Deselect all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="6079"/>
+        <location filename="QScintilla/Editor.py" line="6077"/>
         <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="634"/>
+        <location filename="QScintilla/Editor.py" line="636"/>
         <source>Check spelling of selection...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="638"/>
+        <location filename="QScintilla/Editor.py" line="640"/>
         <source>Remove from dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="641"/>
+        <location filename="QScintilla/Editor.py" line="643"/>
         <source>Shorten empty lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="649"/>
+        <location filename="QScintilla/Editor.py" line="651"/>
         <source>Use Monospaced Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="654"/>
+        <location filename="QScintilla/Editor.py" line="656"/>
         <source>Autosave enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="659"/>
+        <location filename="QScintilla/Editor.py" line="661"/>
         <source>Typing aids enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="666"/>
+        <location filename="QScintilla/Editor.py" line="668"/>
         <source>Autocompletion enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="683"/>
+        <location filename="QScintilla/Editor.py" line="685"/>
         <source>New view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="684"/>
+        <location filename="QScintilla/Editor.py" line="686"/>
         <source>New view (with new split)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="688"/>
+        <location filename="QScintilla/Editor.py" line="690"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="692"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="694"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="696"/>
         <source>Save As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="703"/>
-        <source>Print Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="705"/>
+        <source>Print Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="707"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="722"/>
+        <location filename="QScintilla/Editor.py" line="724"/>
         <source>Autocomplete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="725"/>
+        <location filename="QScintilla/Editor.py" line="727"/>
         <source>dynamic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="728"/>
+        <location filename="QScintilla/Editor.py" line="730"/>
         <source>from Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="731"/>
+        <location filename="QScintilla/Editor.py" line="733"/>
         <source>from APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="734"/>
+        <location filename="QScintilla/Editor.py" line="736"/>
         <source>from Document and APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="738"/>
+        <location filename="QScintilla/Editor.py" line="740"/>
         <source>Calltip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="748"/>
+        <location filename="QScintilla/Editor.py" line="750"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="756"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="758"/>
-        <source>Code metrics...</source>
+        <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="760"/>
-        <source>Code coverage...</source>
+        <source>Code metrics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="762"/>
+        <source>Code coverage...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="764"/>
         <source>Show code coverage annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="765"/>
+        <location filename="QScintilla/Editor.py" line="767"/>
         <source>Hide code coverage annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="768"/>
+        <location filename="QScintilla/Editor.py" line="770"/>
         <source>Profile data...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="778"/>
-        <source>Diagrams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="780"/>
-        <source>Class Diagram...</source>
+        <source>Diagrams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="782"/>
-        <source>Package Diagram...</source>
+        <source>Class Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="784"/>
+        <source>Package Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="786"/>
         <source>Imports Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="787"/>
+        <location filename="QScintilla/Editor.py" line="789"/>
         <source>Application Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="798"/>
+        <location filename="QScintilla/Editor.py" line="800"/>
         <source>Languages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="801"/>
+        <location filename="QScintilla/Editor.py" line="803"/>
         <source>No Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="820"/>
+        <location filename="QScintilla/Editor.py" line="822"/>
         <source>Guessed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1133"/>
+        <location filename="QScintilla/Editor.py" line="1135"/>
         <source>Alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="838"/>
+        <location filename="QScintilla/Editor.py" line="840"/>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="860"/>
+        <location filename="QScintilla/Editor.py" line="862"/>
         <source>End-of-Line Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="864"/>
+        <location filename="QScintilla/Editor.py" line="866"/>
         <source>Unix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="870"/>
+        <location filename="QScintilla/Editor.py" line="872"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="876"/>
+        <location filename="QScintilla/Editor.py" line="878"/>
         <source>Macintosh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="891"/>
+        <location filename="QScintilla/Editor.py" line="893"/>
         <source>Export as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1010"/>
+        <location filename="QScintilla/Editor.py" line="1012"/>
         <source>Toggle bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1013"/>
+        <location filename="QScintilla/Editor.py" line="1015"/>
         <source>Next bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1016"/>
+        <location filename="QScintilla/Editor.py" line="1018"/>
         <source>Previous bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1019"/>
+        <location filename="QScintilla/Editor.py" line="1021"/>
         <source>Clear all bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1046"/>
+        <location filename="QScintilla/Editor.py" line="1048"/>
         <source>Toggle breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1049"/>
+        <location filename="QScintilla/Editor.py" line="1051"/>
         <source>Toggle temporary breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1052"/>
+        <location filename="QScintilla/Editor.py" line="1054"/>
         <source>Edit breakpoint...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4303"/>
+        <location filename="QScintilla/Editor.py" line="4301"/>
         <source>Enable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1058"/>
+        <location filename="QScintilla/Editor.py" line="1060"/>
         <source>Next breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1061"/>
+        <location filename="QScintilla/Editor.py" line="1063"/>
         <source>Previous breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1064"/>
+        <location filename="QScintilla/Editor.py" line="1066"/>
         <source>Clear all breakpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1023"/>
+        <location filename="QScintilla/Editor.py" line="1025"/>
         <source>Goto syntax error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1026"/>
+        <location filename="QScintilla/Editor.py" line="1028"/>
         <source>Show syntax error message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1029"/>
+        <location filename="QScintilla/Editor.py" line="1031"/>
         <source>Clear syntax error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1033"/>
+        <location filename="QScintilla/Editor.py" line="1035"/>
         <source>Next warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1036"/>
+        <location filename="QScintilla/Editor.py" line="1038"/>
         <source>Previous warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1039"/>
+        <location filename="QScintilla/Editor.py" line="1041"/>
         <source>Show warning message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1042"/>
+        <location filename="QScintilla/Editor.py" line="1044"/>
         <source>Clear warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1068"/>
+        <location filename="QScintilla/Editor.py" line="1070"/>
         <source>Next uncovered line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1071"/>
+        <location filename="QScintilla/Editor.py" line="1073"/>
         <source>Previous uncovered line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1075"/>
+        <location filename="QScintilla/Editor.py" line="1077"/>
         <source>Next task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1078"/>
+        <location filename="QScintilla/Editor.py" line="1080"/>
         <source>Previous task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1082"/>
+        <location filename="QScintilla/Editor.py" line="1084"/>
         <source>LMB toggles bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1087"/>
+        <location filename="QScintilla/Editor.py" line="1089"/>
         <source>LMB toggles breakpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1114"/>
+        <location filename="QScintilla/Editor.py" line="1116"/>
         <source>&lt;p&gt;No exporter available for the export format &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>No export format given. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1129"/>
+        <location filename="QScintilla/Editor.py" line="1131"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1149"/>
+        <location filename="QScintilla/Editor.py" line="1151"/>
         <source>Pygments Lexer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1149"/>
+        <location filename="QScintilla/Editor.py" line="1151"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
+        <location filename="QScintilla/Editor.py" line="1570"/>
         <source>Modification of Read Only file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
+        <location filename="QScintilla/Editor.py" line="1570"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2215"/>
+        <location filename="QScintilla/Editor.py" line="2217"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2232"/>
-        <source>Printing completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="2234"/>
+        <source>Printing completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="2236"/>
         <source>Error while printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2237"/>
+        <location filename="QScintilla/Editor.py" line="2239"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2388"/>
+        <location filename="QScintilla/Editor.py" line="2386"/>
         <source>File Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2388"/>
+        <location filename="QScintilla/Editor.py" line="2386"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be opened.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2589"/>
+        <location filename="QScintilla/Editor.py" line="2587"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2537"/>
+        <location filename="QScintilla/Editor.py" line="2535"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br/&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2589"/>
+        <location filename="QScintilla/Editor.py" line="2587"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3813"/>
+        <location filename="QScintilla/Editor.py" line="3811"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3813"/>
+        <location filename="QScintilla/Editor.py" line="3811"/>
         <source>Autocompletion is not available because there is no autocompletion source set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4306"/>
+        <location filename="QScintilla/Editor.py" line="4304"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4623"/>
+        <location filename="QScintilla/Editor.py" line="4621"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4623"/>
+        <location filename="QScintilla/Editor.py" line="4621"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4669"/>
+        <location filename="QScintilla/Editor.py" line="4667"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4665"/>
+        <location filename="QScintilla/Editor.py" line="4663"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4669"/>
+        <location filename="QScintilla/Editor.py" line="4667"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4761"/>
+        <location filename="QScintilla/Editor.py" line="4759"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4761"/>
+        <location filename="QScintilla/Editor.py" line="4759"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4891"/>
+        <location filename="QScintilla/Editor.py" line="4889"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4891"/>
+        <location filename="QScintilla/Editor.py" line="4889"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5017"/>
+        <location filename="QScintilla/Editor.py" line="5015"/>
         <source>py3flakes Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5017"/>
+        <location filename="QScintilla/Editor.py" line="5015"/>
         <source>No py3flakes warning message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5116"/>
+        <location filename="QScintilla/Editor.py" line="5114"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5116"/>
+        <location filename="QScintilla/Editor.py" line="5114"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5144"/>
+        <location filename="QScintilla/Editor.py" line="5142"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5184"/>
+        <location filename="QScintilla/Editor.py" line="5182"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5165"/>
+        <location filename="QScintilla/Editor.py" line="5163"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5158"/>
+        <location filename="QScintilla/Editor.py" line="5156"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5165"/>
+        <location filename="QScintilla/Editor.py" line="5163"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5184"/>
+        <location filename="QScintilla/Editor.py" line="5182"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5201"/>
+        <location filename="QScintilla/Editor.py" line="5199"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5201"/>
+        <location filename="QScintilla/Editor.py" line="5199"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5216"/>
+        <location filename="QScintilla/Editor.py" line="5214"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5216"/>
+        <location filename="QScintilla/Editor.py" line="5214"/>
         <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5227"/>
+        <location filename="QScintilla/Editor.py" line="5225"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5227"/>
+        <location filename="QScintilla/Editor.py" line="5225"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5252"/>
+        <location filename="QScintilla/Editor.py" line="5250"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5252"/>
+        <location filename="QScintilla/Editor.py" line="5250"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5372"/>
+        <location filename="QScintilla/Editor.py" line="5370"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric5. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5381"/>
+        <location filename="QScintilla/Editor.py" line="5379"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5519"/>
+        <location filename="QScintilla/Editor.py" line="5517"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5638"/>
+        <location filename="QScintilla/Editor.py" line="5636"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5638"/>
+        <location filename="QScintilla/Editor.py" line="5636"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="5654"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="5656"/>
-        <source>Resources</source>
+        <source>Add file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5658"/>
-        <source>Add file...</source>
+        <source>Add files...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5660"/>
-        <source>Add files...</source>
+        <source>Add aliased file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="5662"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="5664"/>
         <source>Add localized resource...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5667"/>
+        <location filename="QScintilla/Editor.py" line="5665"/>
         <source>Add resource frame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5685"/>
+        <location filename="QScintilla/Editor.py" line="5683"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5701"/>
+        <location filename="QScintilla/Editor.py" line="5699"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5728"/>
+        <location filename="QScintilla/Editor.py" line="5726"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5728"/>
+        <location filename="QScintilla/Editor.py" line="5726"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5789"/>
+        <location filename="QScintilla/Editor.py" line="5787"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5789"/>
+        <location filename="QScintilla/Editor.py" line="5787"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5806"/>
+        <location filename="QScintilla/Editor.py" line="5804"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5806"/>
+        <location filename="QScintilla/Editor.py" line="5804"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5818"/>
+        <location filename="QScintilla/Editor.py" line="5816"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5818"/>
+        <location filename="QScintilla/Editor.py" line="5816"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="QScintilla/Editor.py" line="6079"/>
+        <source>Add to dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="QScintilla/Editor.py" line="6081"/>
-        <source>Add to dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="QScintilla/Editor.py" line="6083"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5060"/>
+        <location filename="QScintilla/Editor.py" line="5058"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5066"/>
+        <location filename="QScintilla/Editor.py" line="5064"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="5377"/>
+        <location filename="QScintilla/Editor.py" line="5375"/>
         <source>&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; You will lose your changes upon reopening it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3909"/>
+        <location filename="QScintilla/Editor.py" line="3907"/>
         <source>Activating Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="3909"/>
+        <location filename="QScintilla/Editor.py" line="3907"/>
         <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4094"/>
+        <location filename="QScintilla/Editor.py" line="4092"/>
         <source>Activating Calltip Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4094"/>
+        <location filename="QScintilla/Editor.py" line="4092"/>
         <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="700"/>
+        <location filename="QScintilla/Editor.py" line="702"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28384,27 +28384,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="999"/>
+        <location filename="Preferences/__init__.py" line="1001"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1026"/>
+        <location filename="Preferences/__init__.py" line="1028"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1026"/>
+        <location filename="Preferences/__init__.py" line="1028"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1119"/>
+        <location filename="Preferences/__init__.py" line="1121"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1119"/>
+        <location filename="Preferences/__init__.py" line="1121"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -33395,9 +33395,6 @@
     </message>
 </context>
 <context>
-    <name>QRegExpWizardDialog</name>
-</context>
-<context>
     <name>QRegExpWizardRepeatDialog</name>
     <message>
         <location filename="Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.ui" line="13"/>
@@ -43295,175 +43292,180 @@
 <context>
     <name>TaskFilterConfigDialog</name>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="13"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="14"/>
         <source>Task filter configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="22"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="23"/>
         <source>Select the categories, the tasks list should be filtered on. Within each category, enter the selection criteria. The enabled categories are combined using an &quot;&lt;b&gt;and&lt;/b&gt;&quot; operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="38"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="39"/>
         <source>Select to filter on the task description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="41"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="42"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="50"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="51"/>
         <source>Enter the description filter as a regular expression.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="63"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="64"/>
         <source>Select to filter on the task filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="66"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="67"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="75"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="76"/>
         <source>Enter the filename filter as a wildcard expression.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="88"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="89"/>
         <source>Select to filter on the task type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="91"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="92"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="100"/>
-        <source>Select to show standard tasks only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="103"/>
-        <source>Standard tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="110"/>
-        <source>Select to show bugfix tasks only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="113"/>
-        <source>Bugfix tasks</source>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="114"/>
+        <source>Select to filter on the task scope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="117"/>
+        <source>Scope</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="126"/>
-        <source>Select to filter on the task scope</source>
+        <source>Select to show global tasks only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="129"/>
-        <source>Scope</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="138"/>
-        <source>Select to show global tasks only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="141"/>
         <source>Global tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="148"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="136"/>
         <source>Select to show project tasks only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="151"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="139"/>
         <source>Project tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="152"/>
+        <source>Select to filter on the task completion status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="155"/>
+        <source>Completion status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="164"/>
-        <source>Select to filter on the task completion status</source>
+        <source>Select to show uncompleted tasks only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="167"/>
-        <source>Completion status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="176"/>
-        <source>Select to show uncompleted tasks only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="179"/>
         <source>Uncompleted tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="186"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="174"/>
         <source>Select to show completed tasks only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="189"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="177"/>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="190"/>
+        <source>Select to filter on the task priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="193"/>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="202"/>
-        <source>Select to filter on the task priority</source>
+        <source>Select to show high priority tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Tasks/TaskFilterConfigDialog.ui" line="205"/>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="214"/>
-        <source>Select to show high priority tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="217"/>
         <source>High priority tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="224"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="212"/>
         <source>Select to show normal priority tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="227"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="215"/>
         <source>Normal priority tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="234"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="222"/>
         <source>Select to show low priority tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskFilterConfigDialog.ui" line="237"/>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="225"/>
         <source>Low priority tasks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.ui" line="101"/>
+        <source>Select the task type to be shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="32"/>
+        <source>Bugfix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="33"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="34"/>
+        <source>ToDo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskFilterConfigDialog.py" line="35"/>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskPropertiesDialog</name>
@@ -43556,128 +43558,128 @@
 <context>
     <name>TaskViewer</name>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="374"/>
+        <location filename="Tasks/TaskViewer.py" line="58"/>
         <source>Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="434"/>
+        <location filename="Tasks/TaskViewer.py" line="118"/>
         <source>&amp;New Task...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="396"/>
+        <location filename="Tasks/TaskViewer.py" line="80"/>
         <source>&amp;Regenerate project tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="409"/>
+        <location filename="Tasks/TaskViewer.py" line="93"/>
         <source>&amp;Go To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="411"/>
+        <location filename="Tasks/TaskViewer.py" line="95"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="438"/>
+        <location filename="Tasks/TaskViewer.py" line="122"/>
         <source>&amp;Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="413"/>
+        <location filename="Tasks/TaskViewer.py" line="97"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="415"/>
+        <location filename="Tasks/TaskViewer.py" line="99"/>
         <source>&amp;Mark Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="441"/>
+        <location filename="Tasks/TaskViewer.py" line="125"/>
         <source>Delete Completed &amp;Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="420"/>
+        <location filename="Tasks/TaskViewer.py" line="104"/>
         <source>P&amp;roperties...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="445"/>
+        <location filename="Tasks/TaskViewer.py" line="129"/>
         <source>&amp;Filtered display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="449"/>
+        <location filename="Tasks/TaskViewer.py" line="133"/>
         <source>Filter c&amp;onfiguration...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="Tasks/TaskViewer.py" line="136"/>
+        <source>Resi&amp;ze columns</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Tasks/TaskViewer.py" line="138"/>
+        <source>Configure...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="Tasks/TaskViewer.py" line="452"/>
-        <source>Resi&amp;ze columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskViewer.py" line="454"/>
-        <source>Configure...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Tasks/TaskViewer.py" line="766"/>
         <source>Activate task filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="766"/>
+        <location filename="Tasks/TaskViewer.py" line="452"/>
         <source>The task filter doesn&apos;t have any active filters. Do you want to configure the filter settings?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="824"/>
+        <location filename="Tasks/TaskViewer.py" line="514"/>
         <source>Extracting project tasks...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="824"/>
+        <location filename="Tasks/TaskViewer.py" line="514"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="830"/>
+        <location filename="Tasks/TaskViewer.py" line="520"/>
         <source>Extracting project tasks...
 {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="400"/>
+        <location filename="Tasks/TaskViewer.py" line="84"/>
         <source>&amp;Configure scan options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="795"/>
+        <location filename="Tasks/TaskViewer.py" line="481"/>
         <source>Scan Filter Patterns</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="795"/>
+        <location filename="Tasks/TaskViewer.py" line="481"/>
         <source>Enter filename patterns of files to be excluded separated by a comma:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Tasks/TaskViewer.py" line="394"/>
+        <location filename="Tasks/TaskViewer.py" line="78"/>
         <source>P&amp;roject Tasks</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43695,78 +43697,53 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="57"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="95"/>
         <source>Enter the tasks markers separated by a space character.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="50"/>
-        <source>Standard tasks:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="67"/>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="111"/>
         <source>Bugfix tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="77"/>
-        <source>Tasks Colours</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="89"/>
-        <source>Select the background colour for project tasks.</source>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="219"/>
+        <source>Tasks Handling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="225"/>
+        <source>Select to clear global file tasks when the file is closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="228"/>
+        <source>Clear global file task when file is closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="147"/>
+        <source>Warning tasks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="170"/>
+        <source>Todo tasks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="193"/>
+        <source>Note tasks:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="105"/>
-        <source>Select the background colour for global tasks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="121"/>
-        <source>Select the colour for bugfix tasks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="137"/>
-        <source>Select the colour for standard tasks.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="147"/>
-        <source>Bugfix tasks foreground colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="154"/>
-        <source>Global tasks background colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="161"/>
-        <source>Project tasks background colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="168"/>
-        <source>Standard tasks foreground colour:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="191"/>
-        <source>Tasks Handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="197"/>
-        <source>Select to clear global file tasks when the file is closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="200"/>
-        <source>Clear global file task when file is closed</source>
+        <source>Tasks Background Colours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/TasksPage.ui" line="206"/>
+        <source>Select the background colour for these tasks.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
--- a/i18n/eric5_es.ts	Sat Apr 28 17:00:32 2012 +0200
+++ b/i18n/eric5_es.ts	Sun Apr 29 16:42:02 2012 +0200
@@ -4026,42 +4026,42 @@
         <translation>Filtrar c&amp;on:</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>uic error</source>
         <translation>error de uic</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>Code Generation</source>
         <translation>Generación de Código</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>Create Dialog Code</source>
         <translation>Generar código de Diálogo</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="99"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="101"/>
         <source>The file &lt;b&gt;{0}&lt;/b&gt; exists but does not contain any classes.</source>
         <translation>El archivo &lt;b&gt;{0}&lt;/b&gt; existe pero no contiene ninguna clase.</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="273"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="275"/>
         <source>&lt;p&gt;There was an error loading the form &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ha ocurrido un error al cargar el formulario &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="324"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="326"/>
         <source>&lt;p&gt;Could not open the code template file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido cargar el archivo con la plantilla de código &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="357"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="359"/>
         <source>&lt;p&gt;Could not open the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido abrir el archivo de codigo fuente &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="Project/CreateDialogCodeDialog.py" line="427"/>
+        <location filename="Project/CreateDialogCodeDialog.py" line="429"/>
         <source>&lt;p&gt;Could not write the source file &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;No se ha podido escribir en el archivo de codigo fuente &quot;{0}&quot;.&lt;/p&gt;&lt;p&gt;Razón: {1}&lt;/p&gt;</translation>
     </message>
@@ -7137,822 +7137,822 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="QScintilla/Editor.py" line="2436"/>
+        <location filename="QScintilla/Editor.py" line="2434"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="589"/>
+        <location filename="QScintilla/Editor.py" line="591"/>
         <source>Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="592"/>
+        <location filename="QScintilla/Editor.py" line="594"/>
         <source>Redo</source>
         <translation>Rehacer</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="595"/>
+        <location filename="QScintilla/Editor.py" line="597"/>
         <source>Revert to last saved state</source>
         <translation>Volver al último estado guardado</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="599"/>
+        <location filename="QScintilla/Editor.py" line="601"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="602"/>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="604"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="606"/>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="608"/>
-        <source>Indent</source>
-        <translation>Indentar</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="610"/>
+        <source>Indent</source>
+        <translation>Indentar</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="612"/>
         <source>Unindent</source>
         <translation>Desindentar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="613"/>
+        <location filename="QScintilla/Editor.py" line="615"/>
         <source>Comment</source>
         <translation>Pasar a comentario</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="616"/>
+        <location filename="QScintilla/Editor.py" line="618"/>
         <source>Uncomment</source>
         <translation>Sacar de comentario</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="619"/>
+        <location filename="QScintilla/Editor.py" line="621"/>
         <source>Stream Comment</source>
         <translation>Bloque de comentario</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="622"/>
+        <location filename="QScintilla/Editor.py" line="624"/>
         <source>Box Comment</source>
         <translation>Caja de comentario</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="625"/>
-        <source>Select to brace</source>
-        <translation>Seleccionar hasta la llave ( &apos;{&apos; o &apos;}&apos; )</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="627"/>
+        <source>Select to brace</source>
+        <translation>Seleccionar hasta la llave ( &apos;{&apos; o &apos;}&apos; )</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="629"/>
         <source>Select all</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="628"/>
+        <location filename="QScintilla/Editor.py" line="630"/>
         <source>Deselect all</source>
         <translation>Deseleccionar todo</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="641"/>
+        <location filename="QScintilla/Editor.py" line="643"/>
         <source>Shorten empty lines</source>
         <translation>Acortar las líneas vacías</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="649"/>
+        <location filename="QScintilla/Editor.py" line="651"/>
         <source>Use Monospaced Font</source>
         <translation>Usar fuente monoespaciada</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="654"/>
+        <location filename="QScintilla/Editor.py" line="656"/>
         <source>Autosave enabled</source>
         <translation>Autoguardar habilitado</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="666"/>
+        <location filename="QScintilla/Editor.py" line="668"/>
         <source>Autocompletion enabled</source>
         <translation>Autocompletar habilitado</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="683"/>
+        <location filename="QScintilla/Editor.py" line="685"/>
         <source>New view</source>
         <translation>Nueva vista</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="684"/>
+        <location filename="QScintilla/Editor.py" line="686"/>
         <source>New view (with new split)</source>
         <translation>Nueva vista (con nueva división)</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="688"/>
+        <location filename="QScintilla/Editor.py" line="690"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="692"/>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="694"/>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="696"/>
         <source>Save As...</source>
         <translation>Guardar como...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="705"/>
+        <location filename="QScintilla/Editor.py" line="707"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="722"/>
+        <location filename="QScintilla/Editor.py" line="724"/>
         <source>Autocomplete</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="728"/>
+        <location filename="QScintilla/Editor.py" line="730"/>
         <source>from Document</source>
         <translation>desde Documento</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="731"/>
+        <location filename="QScintilla/Editor.py" line="733"/>
         <source>from APIs</source>
         <translation>desde APIs</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="734"/>
+        <location filename="QScintilla/Editor.py" line="736"/>
         <source>from Document and APIs</source>
         <translation>desde Documento y APIs</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="748"/>
+        <location filename="QScintilla/Editor.py" line="750"/>
         <source>Check</source>
         <translation>Verificar</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="756"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="758"/>
-        <source>Code metrics...</source>
-        <translation>Métricas de código...</translation>
+        <source>Show</source>
+        <translation>Mostrar</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="760"/>
-        <source>Code coverage...</source>
-        <translation>Cobertura de código...</translation>
+        <source>Code metrics...</source>
+        <translation>Métricas de código...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="762"/>
+        <source>Code coverage...</source>
+        <translation>Cobertura de código...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="764"/>
         <source>Show code coverage annotations</source>
         <translation>Mostrar anotaciones de cobertura de codigo</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="765"/>
+        <location filename="QScintilla/Editor.py" line="767"/>
         <source>Hide code coverage annotations</source>
         <translation>Ocultar anotaciones de cobertura de codigo</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="768"/>
+        <location filename="QScintilla/Editor.py" line="770"/>
         <source>Profile data...</source>
         <translation>Datos de profiling...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="778"/>
-        <source>Diagrams</source>
-        <translation>Diagramas</translation>
-    </message>
-    <message>
         <location filename="QScintilla/Editor.py" line="780"/>
-        <source>Class Diagram...</source>
-        <translation>Diagrama de clases...</translation>
+        <source>Diagrams</source>
+        <translation>Diagramas</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="782"/>
-        <source>Package Diagram...</source>
-        <translation>Diagrama de paquetes...</translation>
+        <source>Class Diagram...</source>
+        <translation>Diagrama de clases...</translation>
     </message>
     <message>
         <location filename="QScintilla/Editor.py" line="784"/>
+        <source>Package Diagram...</source>
+        <translation>Diagrama de paquetes...</translation>
+    </message>
+    <message>
+        <location filename="QScintilla/Editor.py" line="786"/>
         <source>Imports Diagram...</source>
         <translation>Diagrama de imports...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="787"/>
+        <location filename="QScintilla/Editor.py" line="789"/>
         <source>Application Diagram...</source>
         <translation>Diagrama de aplicación...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="798"/>
+        <location filename="QScintilla/Editor.py" line="800"/>
         <source>Languages</source>
         <translation>Lenguajes</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="801"/>
+        <location filename="QScintilla/Editor.py" line="803"/>
         <source>No Language</source>
         <translation>Ningún Lenguaje</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="891"/>
+        <location filename="QScintilla/Editor.py" line="893"/>
         <source>Export as</source>
         <translation>Exportar como</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1010"/>
+        <location filename="QScintilla/Editor.py" line="1012"/>
         <source>Toggle bookmark</source>
         <translation>Alternar marcador</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1013"/>
+        <location filename="QScintilla/Editor.py" line="1015"/>
         <source>Next bookmark</source>
         <translation>Nuevo marcador</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1016"/>
+        <location filename="QScintilla/Editor.py" line="1018"/>
         <source>Previous bookmark</source>
         <translation>Marcador anterior</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1019"/>
+        <location filename="QScintilla/Editor.py" line="1021"/>
         <source>Clear all bookmarks</source>
         <translation>Borrar todos los marcadores</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1023"/>
+        <location filename="QScintilla/Editor.py" line="1025"/>
         <source>Goto syntax error</source>
         <translation>Ir al error de sintaxis</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1026"/>
+        <location filename="QScintilla/Editor.py" line="1028"/>
         <source>Show syntax error message</source>
         <translation>Ver el mensaje de error de sintaxis</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1029"/>
+        <location filename="QScintilla/Editor.py" line="1031"/>
         <source>Clear syntax error</source>
         <translation>Borrar error de sintaxis</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1046"/>
+        <location filename="QScintilla/Editor.py" line="1048"/>
         <source>Toggle breakpoint</source>
         <translation>Alternar punto de interrupción</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1049"/>
+        <location filename="QScintilla/Editor.py" line="1051"/>
         <source>Toggle temporary breakpoint</source>
         <translation>Alternar punto de interrupción temporal</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1052"/>
+        <location filename="QScintilla/Editor.py" line="1054"/>
         <source>Edit breakpoint...</source>
         <translation>Editar punto de interrupción...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="4303"/>
+        <location filename="QScintilla/Editor.py" line="4301"/>
         <source>Enable breakpoint</source>
         <translation>Activar punto de interrupción</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1058"/>
+        <location filename="QScintilla/Editor.py" line="1060"/>
         <source>Next breakpoint</source>
         <translation>Siguiente punto de interrupción</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1061"/>
+        <location filename="QScintilla/Editor.py" line="1063"/>
         <source>Previous breakpoint</source>
         <translation>Punto de interrupción anterior</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1064"/>
+        <location filename="QScintilla/Editor.py" line="1066"/>
         <source>Clear all breakpoints</source>
         <translation>Borrar todos los puntos de interrupción</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1068"/>
+        <location filename="QScintilla/Editor.py" line="1070"/>
         <source>Next uncovered line</source>
         <translation>Siguiente línea sin cobertura</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1071"/>
+        <location filename="QScintilla/Editor.py" line="1073"/>
         <source>Previous uncovered line</source>
         <translation>Anterior línea sin cobertura</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1075"/>
+        <location filename="QScintilla/Editor.py" line="1077"/>
         <source>Next task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1078"/>
+        <location filename="QScintilla/Editor.py" line="1080"/>
         <source>Previous task</source>
         <translation>Tarea anterior</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1082"/>
+        <location filename="QScintilla/Editor.py" line="1084"/>
         <source>LMB toggles bookmarks</source>
         <translation>LMB (botón izquierdo del ratón) alterna marcadores</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1087"/>
+        <location filename="QScintilla/Editor.py" line="1089"/>
         <source>LMB toggles breakpoints</source>
         <translation>LMB (botón izquierdo del ratón) alterna puntos de interrupción</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>Export source</source>
         <translation>Exportar fuente</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1120"/>
+        <location filename="QScintilla/Editor.py" line="1122"/>
         <source>No export format given. Aborting...</source>
         <translation>No se ha proporcionado un formato de exportación. Abortando...</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
+        <location filename="QScintilla/Editor.py" line="1570"/>
         <source>Modification of Read Only file</source>
         <translation>Modificación de un archivo de solo lectura</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="1568"/>
+        <location filename="QScintilla/Editor.py" line="1570"/>
         <source>You are attempting to change a read only file. Please save to a different file first.</source>
         <translation>Usted está intentando modificar un archivo solo lectura. Por favor guarde en otro archivo primero.</translation>
     </message>
     <message>
-        <location filename="QScintilla/Editor.py" line="2215"/>
+        <location filename="QScintilla/Editor.py" line="2217"/>
         <source>Printing...</source>
         <translation>Imprimiendo...</translation>
     </message>