Added VCS conflict markers to the types shown on the marker map.

Sat, 03 Feb 2018 18:41:49 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 03 Feb 2018 18:41:49 +0100
changeset 6111
d38b38117d83
parent 6110
a7b096ecf963
child 6112
cc1fc199643b

Added VCS conflict markers to the types shown on the marker map.

APIs/Python3/eric6.api 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/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.QScintilla.Editor.html file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorStylesPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorStylesPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
QScintilla/Editor.py file | annotate | diff | comparison | revisions
QScintilla/EditorMarkerMap.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.qm file | annotate | diff | comparison | revisions
i18n/eric6_de.ts file | annotate | diff | comparison | revisions
i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
i18n/eric6_en.ts file | annotate | diff | comparison | revisions
i18n/eric6_es.ts file | annotate | diff | comparison | revisions
i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
i18n/eric6_it.ts file | annotate | diff | comparison | revisions
i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Sat Feb 03 18:37:36 2018 +0100
+++ b/APIs/Python3/eric6.api	Sat Feb 03 18:41:49 2018 +0100
@@ -4203,7 +4203,7 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations._messages?8
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations._messages_sample_args?8
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.translations.getTranslatedMessage?4(message)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.VcsConflictMarkerRe?7
+eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.VcsConflictMarkerRegExpList?7
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.extractLineFlags?4(line, startComment=")
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initBatchService?4()
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.initService?4()
@@ -8189,6 +8189,7 @@
 eric6.QScintilla.Editor.Editor.StartEditToken?7
 eric6.QScintilla.Editor.Editor.SyncToken?7
 eric6.QScintilla.Editor.Editor.TemplateImageID?7
+eric6.QScintilla.Editor.Editor.VcsConflictMarkerLineRegExpList?7
 eric6.QScintilla.Editor.Editor.WarningCode?7
 eric6.QScintilla.Editor.Editor.WarningStyle?7
 eric6.QScintilla.Editor.Editor.addCallTipHook?4(key, func)
@@ -8283,6 +8284,7 @@
 eric6.QScintilla.Editor.Editor.getSyntaxErrorLines?4()
 eric6.QScintilla.Editor.Editor.getSyntaxErrors?4()
 eric6.QScintilla.Editor.Editor.getTaskLines?4()
+eric6.QScintilla.Editor.Editor.getVcsConflictMarkerLines?4()
 eric6.QScintilla.Editor.Editor.getWarningLines?4()
 eric6.QScintilla.Editor.Editor.getWarnings?4()
 eric6.QScintilla.Editor.Editor.getWord?4(line, index, direction=0, useWordChars=True)
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Feb 03 18:37:36 2018 +0100
+++ b/Documentation/Help/source.qhp	Sat Feb 03 18:41:49 2018 +0100
@@ -5383,6 +5383,7 @@
       <keyword name="Editor.getSyntaxErrorLines" id="Editor.getSyntaxErrorLines" ref="eric6.QScintilla.Editor.html#Editor.getSyntaxErrorLines" />
       <keyword name="Editor.getSyntaxErrors" id="Editor.getSyntaxErrors" ref="eric6.QScintilla.Editor.html#Editor.getSyntaxErrors" />
       <keyword name="Editor.getTaskLines" id="Editor.getTaskLines" ref="eric6.QScintilla.Editor.html#Editor.getTaskLines" />
+      <keyword name="Editor.getVcsConflictMarkerLines" id="Editor.getVcsConflictMarkerLines" ref="eric6.QScintilla.Editor.html#Editor.getVcsConflictMarkerLines" />
       <keyword name="Editor.getWarningLines" id="Editor.getWarningLines" ref="eric6.QScintilla.Editor.html#Editor.getWarningLines" />
       <keyword name="Editor.getWarnings" id="Editor.getWarnings" ref="eric6.QScintilla.Editor.html#Editor.getWarnings" />
       <keyword name="Editor.getWord" id="Editor.getWord" ref="eric6.QScintilla.Editor.html#Editor.getWord" />
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Sat Feb 03 18:37:36 2018 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Sat Feb 03 18:41:49 2018 +0100
@@ -25,7 +25,7 @@
 </p>
 <h3>Global Attributes</h3>
 <table>
-<tr><td>VcsConflictMarkerRe</td></tr>
+<tr><td>VcsConflictMarkerRegExpList</td></tr>
 </table>
 <h3>Classes</h3>
 <table>
--- a/Documentation/Source/eric6.QScintilla.Editor.html	Sat Feb 03 18:37:36 2018 +0100
+++ b/Documentation/Source/eric6.QScintilla.Editor.html	Sat Feb 03 18:41:49 2018 +0100
@@ -138,7 +138,7 @@
 QsciScintillaCompat
 <h3>Class Attributes</h3>
 <table>
-<tr><td>AttributeID</td></tr><tr><td>AttributePrivateID</td></tr><tr><td>AttributeProtectedID</td></tr><tr><td>CancelEditToken</td></tr><tr><td>ClassID</td></tr><tr><td>ClassPrivateID</td></tr><tr><td>ClassProtectedID</td></tr><tr><td>EndEditToken</td></tr><tr><td>EnumID</td></tr><tr><td>FromDocumentID</td></tr><tr><td>KeywordsID</td></tr><tr><td>MethodID</td></tr><tr><td>MethodPrivateID</td></tr><tr><td>MethodProtectedID</td></tr><tr><td>ModuleID</td></tr><tr><td>RequestSyncToken</td></tr><tr><td>Separator</td></tr><tr><td>StartEditToken</td></tr><tr><td>SyncToken</td></tr><tr><td>TemplateImageID</td></tr><tr><td>WarningCode</td></tr><tr><td>WarningStyle</td></tr>
+<tr><td>AttributeID</td></tr><tr><td>AttributePrivateID</td></tr><tr><td>AttributeProtectedID</td></tr><tr><td>CancelEditToken</td></tr><tr><td>ClassID</td></tr><tr><td>ClassPrivateID</td></tr><tr><td>ClassProtectedID</td></tr><tr><td>EndEditToken</td></tr><tr><td>EnumID</td></tr><tr><td>FromDocumentID</td></tr><tr><td>KeywordsID</td></tr><tr><td>MethodID</td></tr><tr><td>MethodPrivateID</td></tr><tr><td>MethodProtectedID</td></tr><tr><td>ModuleID</td></tr><tr><td>RequestSyncToken</td></tr><tr><td>Separator</td></tr><tr><td>StartEditToken</td></tr><tr><td>SyncToken</td></tr><tr><td>TemplateImageID</td></tr><tr><td>VcsConflictMarkerLineRegExpList</td></tr><tr><td>WarningCode</td></tr><tr><td>WarningStyle</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -888,6 +888,9 @@
 <td><a href="#Editor.getTaskLines">getTaskLines</a></td>
 <td>Public method to get the lines containing a task.</td>
 </tr><tr>
+<td><a href="#Editor.getVcsConflictMarkerLines">getVcsConflictMarkerLines</a></td>
+<td>Public method to determine the lines containing a VCS conflict marker.</td>
+</tr><tr>
 <td><a href="#Editor.getWarningLines">getWarningLines</a></td>
 <td>Public method to get the lines containing a warning.</td>
 </tr><tr>
@@ -3602,6 +3605,21 @@
 <dd>
 list of lines containing a task (list of integer)
 </dd>
+</dl><a NAME="Editor.getVcsConflictMarkerLines" ID="Editor.getVcsConflictMarkerLines"></a>
+<h4>Editor.getVcsConflictMarkerLines</h4>
+<b>getVcsConflictMarkerLines</b>(<i></i>)
+<p>
+        Public method to determine the lines containing a VCS conflict marker.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+list of line numbers containg a VCS conflict marker
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of int
+</dd>
 </dl><a NAME="Editor.getWarningLines" ID="Editor.getWarningLines"></a>
 <h4>Editor.getWarningLines</h4>
 <b>getWarningLines</b>(<i></i>)
--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sat Feb 03 18:37:36 2018 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Sat Feb 03 18:41:49 2018 +0100
@@ -251,6 +251,9 @@
         self.initColour("SearchMarkersMap",
                         self.searchMarkerMapButton,
                         Preferences.getEditorColour)
+        self.initColour("VcsConflictMarkersMap",
+                        self.conflictMarkerMapButton,
+                        Preferences.getEditorColour)
         self.initColour("MarkerMapBackground",
                         self.markerMapBackgroundButton,
                         Preferences.getEditorColour)
--- a/Preferences/ConfigurationPages/EditorStylesPage.ui	Sat Feb 03 18:37:36 2018 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.ui	Sat Feb 03 18:41:49 2018 +0100
@@ -1828,6 +1828,29 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="2">
+       <widget class="QLabel" name="label_16">
+        <property name="text">
+         <string>Conflict Marker Line:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3">
+       <widget class="QPushButton" name="conflictMarkerMapButton">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="toolTip">
+         <string>Select the colour for the conflict marker line marker</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item row="5" column="0">
        <widget class="QLabel" name="label_14">
         <property name="text">
@@ -1967,6 +1990,7 @@
   <tabstop>coverageMapButton</tabstop>
   <tabstop>currentMapButton</tabstop>
   <tabstop>searchMarkerMapButton</tabstop>
+  <tabstop>conflictMarkerMapButton</tabstop>
   <tabstop>markerMapBackgroundButton</tabstop>
   <tabstop>miniMenuCheckBox</tabstop>
   <tabstop>hideFormatButtonsCheckBox</tabstop>
--- a/Preferences/__init__.py	Sat Feb 03 18:37:36 2018 +0100
+++ b/Preferences/__init__.py	Sat Feb 03 18:41:49 2018 +0100
@@ -666,6 +666,7 @@
         "ChangesMap": QColor("#00b000"),
         "CurrentMap": QColor("#000000"),
         "SearchMarkersMap": QColor(Qt.blue),
+        "VcsConflictMarkersMap": QColor("#dd00dd"),
         "MarkerMapBackground": QColor("#e7e7e7"),
     }
     
--- a/QScintilla/Editor.py	Sat Feb 03 18:37:36 2018 +0100
+++ b/QScintilla/Editor.py	Sat Feb 03 18:41:49 2018 +0100
@@ -145,6 +145,14 @@
     RequestSyncToken = "REQUEST_SYNC"
     SyncToken = "SYNC"
     
+    VcsConflictMarkerLineRegExpList = (
+        r"""^<<<<<<< .*?$""",
+        r"""^\|\|\|\|\|\|\| .*?$""",
+        r"""^=======.*?$""",
+        r"""^>>>>>>> .*?$""",
+    )
+    
+    
     def __init__(self, dbs, fn="", vm=None,
                  filetype="", editor=None, tv=None):
         """
@@ -6105,6 +6113,30 @@
                 self.tr("No syntax error message available."))
     
     ###########################################################################
+    ## VCS conflict marker handling methods below
+    ###########################################################################
+
+    def getVcsConflictMarkerLines(self):
+        """
+        Public method to determine the lines containing a VCS conflict marker.
+        
+        @return list of line numbers containg a VCS conflict marker
+        @rtype list of int
+        """
+        conflictMarkerLines = []
+        
+        for searchRe in Editor.VcsConflictMarkerLineRegExpList:
+            ok = self.findFirstTarget(searchRe, True, False, False, 0, 0)
+            while ok:
+                spos = self.getFoundTarget()[0]
+                line = self.lineIndexFromPosition(spos)[0]
+                conflictMarkerLines.append(line)
+                
+                ok = self.findNextTarget()
+        
+        return conflictMarkerLines
+    
+    ###########################################################################
     ## Warning handling methods below
     ###########################################################################
     
--- a/QScintilla/EditorMarkerMap.py	Sat Feb 03 18:37:36 2018 +0100
+++ b/QScintilla/EditorMarkerMap.py	Sat Feb 03 18:41:49 2018 +0100
@@ -55,6 +55,8 @@
         self.__currentLineMarker = Preferences.getEditorColour("CurrentMap")
         self.__searchMarkerColor = Preferences.getEditorColour(
             "SearchMarkersMap")
+        self.__vcsConflictMarkerColor = Preferences.getEditorColour(
+            "VcsConflictMarkersMap")
         self.update()
     
     def __drawIndicator(self, line, painter, color):
@@ -107,7 +109,11 @@
         for line in self._master.getWarningLines():
             self.__drawIndicator(line, painter, self.__warningColor)
         
-        # 8. errors
+        # 8a. VCS conflict markers
+        for line in self._master.getVcsConflictMarkerLines():
+            self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor)
+        
+        # 8b. errors
         for line in self._master.getSyntaxErrorLines():
             self.__drawIndicator(line, painter, self.__errorColor)
         
--- a/changelog	Sat Feb 03 18:37:36 2018 +0100
+++ b/changelog	Sat Feb 03 18:41:49 2018 +0100
@@ -4,6 +4,7 @@
 - bug fixes
 - Editor
   -- added support for EditorConfig
+  -- added VCS conflict markers to the types shown on the marker map
 
 Version 18.02:
 - bug fixes
--- a/i18n/eric6_cs.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_cs.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -10195,97 +10195,97 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation>Vrátit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation>Znovu použít</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
+        <location filename="../QScintilla/Editor.py" line="761"/>
         <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="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation>Vložit</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation>Vložit</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation>Odsadit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation>Zrušit odsazení</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation>Vytvořit komentář</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation>Zrušit komentář</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
+        <location filename="../QScintilla/Editor.py" line="791"/>
         <source>Stream Comment</source>
         <translation>Proudový komentář</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
+        <location filename="../QScintilla/Editor.py" line="794"/>
         <source>Box Comment</source>
         <translation>Obdélníkový komentář</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation>Vybrat až po závorku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation>Vybrat vše</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
+        <location filename="../QScintilla/Editor.py" line="801"/>
         <source>Deselect all</source>
         <translation>Zrušit celý výběr</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="809"/>
+        <location filename="../QScintilla/Editor.py" line="817"/>
         <source>Shorten empty lines</source>
         <translation>Zkrátit prázdné řádky</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="816"/>
+        <location filename="../QScintilla/Editor.py" line="824"/>
         <source>Use Monospaced Font</source>
         <translation>Použít neporoporcionální font</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
+        <location filename="../QScintilla/Editor.py" line="829"/>
         <source>Autosave enabled</source>
         <translation>Zapnout autosave</translation>
     </message>
@@ -10295,22 +10295,22 @@
         <translation type="obsolete">Zapnout autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="864"/>
+        <location filename="../QScintilla/Editor.py" line="872"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
+        <location filename="../QScintilla/Editor.py" line="878"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
+        <location filename="../QScintilla/Editor.py" line="881"/>
         <source>Save As...</source>
         <translation>Uložit jako...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
+        <location filename="../QScintilla/Editor.py" line="897"/>
         <source>Print</source>
         <translation>Tisk</translation>
     </message>
@@ -10320,447 +10320,447 @@
         <translation type="obsolete">Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="918"/>
+        <location filename="../QScintilla/Editor.py" line="926"/>
         <source>Complete from Document</source>
         <translation type="unfinished">z dokumentu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="920"/>
+        <location filename="../QScintilla/Editor.py" line="928"/>
         <source>Complete from APIs</source>
         <translation type="unfinished">z API</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="922"/>
+        <location filename="../QScintilla/Editor.py" line="930"/>
         <source>Complete from Document and APIs</source>
         <translation type="unfinished">z dokumentu a API</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="944"/>
         <source>Check</source>
         <translation>Zkontrolovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
-        <source>Show</source>
-        <translation>Zobrazit</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
-        <source>Code metrics...</source>
-        <translation>Metrika kódu...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation>Pokrytí kódu...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
-        <source>Show code coverage annotations</source>
-        <translation>Zobrazit poznámky pokrytí kódu</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="964"/>
-        <source>Hide code coverage annotations</source>
-        <translation>Skrýt poznámky pokrytí kódu</translation>
+        <source>Show</source>
+        <translation>Zobrazit</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="966"/>
+        <source>Code metrics...</source>
+        <translation>Metrika kódu...</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation>Pokrytí kódu...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="969"/>
+        <source>Show code coverage annotations</source>
+        <translation>Zobrazit poznámky pokrytí kódu</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="972"/>
+        <source>Hide code coverage annotations</source>
+        <translation>Skrýt poznámky pokrytí kódu</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
         <source>Profile data...</source>
         <translation>Profilovat data...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="980"/>
-        <source>Diagrams</source>
-        <translation>Diagramy</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation>Diagram třídy...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation>Diagram balíčku...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation>Diagram importů...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="988"/>
+        <source>Diagrams</source>
+        <translation>Diagramy</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
+        <translation>Diagram třídy...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation>Diagram balíčku...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation>Diagram importů...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
         <source>Application Diagram...</source>
         <translation>Diagram aplikace...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1006"/>
+        <location filename="../QScintilla/Editor.py" line="1014"/>
         <source>Languages</source>
         <translation>Jazyky</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
         <source>No Language</source>
         <translation>Žádný jazyk</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1255"/>
+        <location filename="../QScintilla/Editor.py" line="1263"/>
         <source>Toggle bookmark</source>
         <translation>Přepnout záložku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
         <source>Next bookmark</source>
         <translation>Následující záložka</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
         <source>Previous bookmark</source>
         <translation>Předchozí záložka</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
         <source>Clear all bookmarks</source>
         <translation>Zrušit všechny záložky</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
         <source>Goto syntax error</source>
         <translation>Jít na chybu syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
         <source>Show syntax error message</source>
         <translation>Zobrazit hlášení syntaktické chyby</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
         <source>Clear syntax error</source>
         <translation>Zrušit chybu syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
         <source>Toggle breakpoint</source>
         <translation>Přepnout breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
-        <source>Toggle temporary breakpoint</source>
-        <translation>Přepnout dočasný breakpoint</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1286"/>
-        <source>Edit breakpoint...</source>
-        <translation>Editovat breakpoint...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
-        <source>Enable breakpoint</source>
-        <translation>Aktivovat breakpoint</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1291"/>
+        <source>Toggle temporary breakpoint</source>
+        <translation>Přepnout dočasný breakpoint</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
+        <source>Edit breakpoint...</source>
+        <translation>Editovat breakpoint...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
+        <source>Enable breakpoint</source>
+        <translation>Aktivovat breakpoint</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
         <source>Next breakpoint</source>
         <translation>Následující breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation>Předchozí breakpoint</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation>Zrušit všechny breakpointy</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
-        <source>Next uncovered line</source>
-        <translation>Následující odkrytá řádka</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1301"/>
-        <source>Previous uncovered line</source>
-        <translation>Předchozí odkrytá řádka</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1304"/>
-        <source>Next task</source>
-        <translation>Následující úloha</translation>
+        <source>Previous breakpoint</source>
+        <translation>Předchozí breakpoint</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation>Zrušit všechny breakpointy</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1306"/>
+        <source>Next uncovered line</source>
+        <translation>Následující odkrytá řádka</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1309"/>
+        <source>Previous uncovered line</source>
+        <translation>Předchozí odkrytá řádka</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1312"/>
+        <source>Next task</source>
+        <translation>Následující úloha</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1314"/>
         <source>Previous task</source>
         <translation>Předchozí úloha</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
         <source>LMB toggles bookmarks</source>
         <translation>LMB přepínač záložek</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
         <source>LMB toggles breakpoints</source>
         <translation>LMB přepínač breakpointů</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
         <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="1865"/>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
         <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="2556"/>
+        <location filename="../QScintilla/Editor.py" line="2564"/>
         <source>Printing...</source>
         <translation>Tisk...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
         <source>Printing completed</source>
         <translation>Tisk je hotov</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
         <source>Error while printing</source>
         <translation>Chyba během tisku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
         <source>Printing aborted</source>
         <translation>Tisk byl zrušen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <source>Save File</source>
         <translation>Uložit soubor</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <source>File Modified</source>
         <translation>Soubor je modifikován</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
         <source>Autocompletion</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
         <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="5409"/>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
         <source>Disable breakpoint</source>
         <translation>Deaktivovat breakpoint</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Code Coverage</source>
         <translation>Pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <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="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zobrazit poznámky pokrytí kódu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
         <source>All lines have been covered.</source>
         <translation>Všechny řádky byly pokryty.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>There is no coverage file available.</source>
         <translation>Soubor s pokrytím není dostupný.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
         <source>Profile Data</source>
         <translation>Profilovat data</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
         <source>Please select a profile file</source>
         <translation>Prosím, vyberte soubor s profilem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
         <source>Syntax Error</source>
         <translation>Chyba syntaxe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
         <source>No syntax error message available.</source>
         <translation>Hlášení syntaktické chyby není dostupné.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
         <source>Macro Name</source>
         <translation>Název makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
         <source>Select a macro name:</source>
         <translation>Vyberte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
         <source>Load macro file</source>
         <translation>Načíst soubor makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
         <source>Macro files (*.macro)</source>
         <translation>Macro soubory (*.macro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <source>Error loading macro</source>
         <translation>Chyba při načítání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
         <source>Save macro file</source>
         <translation>Uložit soubor s makrem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
         <source>Save macro</source>
         <translation>Uložit makro</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <source>Error saving macro</source>
         <translation>Chyba při ukládání makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <source>Start Macro Recording</source>
         <translation>Spustit záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <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="6582"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Macro Recording</source>
         <translation>Záznam makra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Enter name of the macro:</source>
         <translation>Vložte název makra:</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6720"/>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
         <source>File changed</source>
         <translation>Soubor změněn</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7045"/>
-        <source>Resources</source>
-        <translation>Zdroje</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation>Přidat soubor...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation>Přidat soubory...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation>Přidat zástupce souboru...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation>Přidat lokalizované resource...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
-        <source>Add resource frame</source>
-        <translation>Přidat resource frame</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation>Zdroje</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation>Přidat soubor...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation>Přidat soubory...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation>Přidat zástupce souboru...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation>Přidat lokalizované resource...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7090"/>
+        <source>Add resource frame</source>
+        <translation>Přidat resource frame</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
         <source>Add file resource</source>
         <translation>Přidat soubor resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
         <source>Add file resources</source>
         <translation>Přidat soubory resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Add aliased file resource</source>
         <translation>Přidat zástupce souboru resource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Package Diagram</source>
         <translation>Diagram balíčku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Include class attributes?</source>
         <translation>Včetně atributů třídy?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Application Diagram</source>
         <translation>Diagram aplikace</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Include module names?</source>
         <translation>Včetně jmen modulů?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1129"/>
+        <location filename="../QScintilla/Editor.py" line="1137"/>
         <source>Export as</source>
         <translation>Exportovat jako</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1358"/>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
         <source>Export source</source>
         <translation>Export zdroj</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1358"/>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
         <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="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Imports Diagram</source>
         <translation>Importovat diagram</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Include imports from external modules?</source>
         <translation>Zahrnout importy z externích modulů?</translation>
     </message>
@@ -10770,342 +10770,342 @@
         <translation type="obsolete">dynamický</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="840"/>
+        <location filename="../QScintilla/Editor.py" line="848"/>
         <source>Calltip</source>
         <translation>Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="886"/>
+        <location filename="../QScintilla/Editor.py" line="894"/>
         <source>Print Preview</source>
         <translation>Náhled tisku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="441"/>
+        <location filename="../QScintilla/Editor.py" line="449"/>
         <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="825"/>
+        <location filename="../QScintilla/Editor.py" line="833"/>
         <source>Typing aids enabled</source>
         <translation>Pomůcky při psaní zapnuty</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1093"/>
+        <location filename="../QScintilla/Editor.py" line="1101"/>
         <source>End-of-Line Type</source>
         <translation>Typ Konec-řádku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
+        <location filename="../QScintilla/Editor.py" line="1105"/>
         <source>Unix</source>
         <translation>Unix</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1104"/>
+        <location filename="../QScintilla/Editor.py" line="1112"/>
         <source>Windows</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1111"/>
+        <location filename="../QScintilla/Editor.py" line="1119"/>
         <source>Macintosh</source>
         <translation>Macintosh</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1052"/>
+        <location filename="../QScintilla/Editor.py" line="1060"/>
         <source>Encodings</source>
         <translation>Kódování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1032"/>
+        <location filename="../QScintilla/Editor.py" line="1040"/>
         <source>Guessed</source>
         <translation>Odhadem</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1373"/>
+        <location filename="../QScintilla/Editor.py" line="1381"/>
         <source>Alternatives</source>
         <translation>Alternativy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
         <source>Pygments Lexer</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation>Použít Pygments lexer.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7501"/>
+        <location filename="../QScintilla/Editor.py" line="7533"/>
         <source>Check spelling...</source>
         <translation>Zatrhnout kontrolu...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="801"/>
+        <location filename="../QScintilla/Editor.py" line="809"/>
         <source>Check spelling of selection...</source>
         <translation>Zatrhnout výběr kontroly...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7504"/>
+        <location filename="../QScintilla/Editor.py" line="7536"/>
         <source>Add to dictionary</source>
         <translation>Přidat do slovníku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7506"/>
+        <location filename="../QScintilla/Editor.py" line="7538"/>
         <source>Ignore All</source>
         <translation>Ignorovat vše</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
+        <location filename="../QScintilla/Editor.py" line="813"/>
         <source>Remove from dictionary</source>
         <translation>Odebrat ze slovníku</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="359"/>
+        <location filename="../QScintilla/Editor.py" line="367"/>
         <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="1350"/>
+        <location filename="../QScintilla/Editor.py" line="1358"/>
         <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="1369"/>
+        <location filename="../QScintilla/Editor.py" line="1377"/>
         <source>Alternatives ({0})</source>
         <translation>Alternativy ({0})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <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="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <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="3110"/>
+        <location filename="../QScintilla/Editor.py" line="3118"/>
         <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>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6481"/>
+        <location filename="../QScintilla/Editor.py" line="6513"/>
         <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="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <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>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <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="6884"/>
+        <location filename="../QScintilla/Editor.py" line="6916"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <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="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <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="1271"/>
+        <location filename="../QScintilla/Editor.py" line="1279"/>
         <source>Next warning</source>
         <translation>Následující varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <location filename="../QScintilla/Editor.py" line="1282"/>
         <source>Previous warning</source>
         <translation>Předchozí varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <location filename="../QScintilla/Editor.py" line="1284"/>
         <source>Show warning message</source>
         <translation>Zobrazit varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1278"/>
+        <location filename="../QScintilla/Editor.py" line="1286"/>
         <source>Clear warnings</source>
         <translation>Vyčistit varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <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="6527"/>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
         <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="6378"/>
+        <location filename="../QScintilla/Editor.py" line="6410"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6417"/>
         <source>Error: {0}</source>
         <translation type="unfinished">Chyby: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6716"/>
+        <location filename="../QScintilla/Editor.py" line="6748"/>
         <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="882"/>
+        <location filename="../QScintilla/Editor.py" line="890"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="992"/>
+        <location filename="../QScintilla/Editor.py" line="1000"/>
         <source>Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1309"/>
+        <location filename="../QScintilla/Editor.py" line="1317"/>
         <source>Next change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1312"/>
+        <location filename="../QScintilla/Editor.py" line="1320"/>
         <source>Previous change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
         <source>Warning</source>
         <translation type="unfinished">Varování</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6375"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="856"/>
+        <location filename="../QScintilla/Editor.py" line="864"/>
         <source>New Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="859"/>
+        <location filename="../QScintilla/Editor.py" line="867"/>
         <source>New Document View (with new split)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="946"/>
+        <location filename="../QScintilla/Editor.py" line="954"/>
         <source>Tools</source>
         <translation type="unfinished">Nástroje</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1074"/>
+        <location filename="../QScintilla/Editor.py" line="1082"/>
         <source>Re-Open With Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6710"/>
+        <location filename="../QScintilla/Editor.py" line="6742"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished">&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; {0}?} {6.?}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="832"/>
+        <location filename="../QScintilla/Editor.py" line="840"/>
         <source>Automatic Completion enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="912"/>
+        <location filename="../QScintilla/Editor.py" line="920"/>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="876"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Save Copy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="915"/>
+        <location filename="../QScintilla/Editor.py" line="923"/>
         <source>Clear Completions Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="842"/>
+        <location filename="../QScintilla/Editor.py" line="850"/>
         <source>Code Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1315"/>
+        <location filename="../QScintilla/Editor.py" line="1323"/>
         <source>Clear changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="767"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>Execute Selection In Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14019,7 +14019,7 @@
         <translation>Změnit barvu pozadí</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
         <source>Various</source>
         <translation>Různé</translation>
     </message>
@@ -14034,12 +14034,12 @@
         <translation>Zobrazit prázdné znaky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Vybrat pro zobrazení minimalistického kontextového menu</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
         <source>Show minimal context menu</source>
         <translation>Zobrazit minimální kontextové menu</translation>
     </message>
@@ -14469,12 +14469,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
         <source>Select the background colour for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14524,12 +14524,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14543,6 +14543,16 @@
         <source>Use background colours</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <source>Conflict Marker Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <source>Select the colour for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50307,27 +50317,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1650"/>
+        <location filename="../Preferences/__init__.py" line="1651"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_de.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -9840,902 +9840,902 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <source>Save File</source>
         <translation>Datei sichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation>Einfügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation>Einrücken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation>Einrücken rückgängig</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation>Kommentar entfernen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="864"/>
+        <location filename="../QScintilla/Editor.py" line="872"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
+        <location filename="../QScintilla/Editor.py" line="878"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
+        <location filename="../QScintilla/Editor.py" line="881"/>
         <source>Save As...</source>
         <translation>Speichern unter...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
+        <location filename="../QScintilla/Editor.py" line="801"/>
         <source>Deselect all</source>
         <translation>Auswahl aufheben</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation>Zur Klammer auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
+        <location filename="../QScintilla/Editor.py" line="897"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2556"/>
+        <location filename="../QScintilla/Editor.py" line="2564"/>
         <source>Printing...</source>
         <translation>Drucke...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
         <source>Printing completed</source>
         <translation>Drucken beendet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
         <source>Error while printing</source>
         <translation>Fehler beim Drucken</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
         <source>Printing aborted</source>
         <translation>Drucken abgebrochen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6720"/>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
         <source>File changed</source>
         <translation>Datei geändert</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="944"/>
         <source>Check</source>
         <translation>Prüfen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <source>File Modified</source>
         <translation>Datei geändert</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
+        <location filename="../QScintilla/Editor.py" line="966"/>
         <source>Code metrics...</source>
         <translation>Quelltextmetriken...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation>Quelltext Abdeckung...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation>Quelltext Abdeckung...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
         <source>Profile data...</source>
         <translation>Profildaten...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
-        <source>Show</source>
-        <translation>Zeige</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
-        <source>Stream Comment</source>
-        <translation>Stream Kommentar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
-        <source>Box Comment</source>
-        <translation>Box Kommentar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
-        <source>Modification of Read Only file</source>
-        <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
-        <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="1006"/>
-        <source>Languages</source>
-        <translation>Sprachen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
-        <source>Revert to last saved state</source>
-        <translation>Zurück zum letzten gesichert Zustand</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Macro Name</source>
-        <translation>Makro Name</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Select a macro name:</source>
-        <translation>Wähle einen Makro Namen:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Macro files (*.macro)</source>
-        <translation>Makrodateien (*.macro)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
-        <source>Load macro file</source>
-        <translation>Lade Makrodatei</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
-        <source>Error loading macro</source>
-        <translation>Fehler beim Makro Laden</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Save macro file</source>
-        <translation>Makrodatei schreiben</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
-        <source>Save macro</source>
-        <translation>Makro speichern</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
-        <source>Error saving macro</source>
-        <translation>Fehler beim Makro speichern</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
-        <source>Start Macro Recording</source>
-        <translation>Makroaufzeichnung starten</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <source>Macro Recording</source>
-        <translation>Makroaufzeichnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <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="1255"/>
-        <source>Toggle bookmark</source>
-        <translation>Lesezeichen setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
-        <source>Next bookmark</source>
-        <translation>Nächstes Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
-        <source>Previous bookmark</source>
-        <translation>Vorheriges Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
-        <source>Clear all bookmarks</source>
-        <translation>Alle Lesezeichen löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
-        <source>Toggle breakpoint</source>
-        <translation>Haltepunkt setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
-        <source>LMB toggles bookmarks</source>
-        <translation>LMK schaltet Lesezeichen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
-        <source>LMB toggles breakpoints</source>
-        <translation>LMK schaltet Haltepunkte</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1291"/>
-        <source>Next breakpoint</source>
-        <translation>Nächster Haltepunkt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation>Vorheriger Haltepunkt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation>Alle Haltepunkte löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1286"/>
-        <source>Edit breakpoint...</source>
-        <translation>Haltepunkt bearbeiten...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
-        <source>Enable breakpoint</source>
-        <translation>Haltepunkt aktivieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5409"/>
-        <source>Disable breakpoint</source>
-        <translation>Haltepunkt deaktivieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <source>Code Coverage</source>
-        <translation>Quelltext Abdeckung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <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="5964"/>
-        <source>Profile Data</source>
-        <translation>Profildaten</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
-        <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="4602"/>
-        <source>Autocompletion</source>
-        <translation>Automatische Vervollständigung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
-        <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="816"/>
-        <source>Use Monospaced Font</source>
-        <translation>Benutze Monospace Font</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="809"/>
-        <source>Shorten empty lines</source>
-        <translation>Leere Zeilen verkürzen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
-        <source>Goto syntax error</source>
-        <translation>Zu Syntaxfehler gehen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
-        <source>Clear syntax error</source>
-        <translation>Syntaxfehler löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
-        <source>Autosave enabled</source>
-        <translation>Autom. Speicherung aktiv</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
-        <source>Drop Error</source>
-        <translation>Drop Fehler</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
-        <source>Show syntax error message</source>
-        <translation>Zeige Syntaxfehlermeldung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>Syntax Error</source>
-        <translation>Syntaxfehler</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>No syntax error message available.</source>
-        <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
-        <source>Toggle temporary breakpoint</source>
-        <translation>Temporären Haltepunkt setzen/löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
-        <source>Show code coverage annotations</source>
-        <translation>Markiere Zeilen ohne Abdeckung</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="964"/>
-        <source>Hide code coverage annotations</source>
-        <translation>Lösche Abdeckungsmarkierungen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
-        <source>Next uncovered line</source>
-        <translation>Nächste nichtabgedeckte Zeile</translation>
+        <source>Show</source>
+        <translation>Zeige</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="791"/>
+        <source>Stream Comment</source>
+        <translation>Stream Kommentar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="794"/>
+        <source>Box Comment</source>
+        <translation>Box Kommentar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
+        <source>Modification of Read Only file</source>
+        <translation>Änderungsversuch für eine schreibgeschützte Datei</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
+        <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="1014"/>
+        <source>Languages</source>
+        <translation>Sprachen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="761"/>
+        <source>Revert to last saved state</source>
+        <translation>Zurück zum letzten gesichert Zustand</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Macro Name</source>
+        <translation>Makro Name</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Select a macro name:</source>
+        <translation>Wähle einen Makro Namen:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Macro files (*.macro)</source>
+        <translation>Makrodateien (*.macro)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
+        <source>Load macro file</source>
+        <translation>Lade Makrodatei</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
+        <source>Error loading macro</source>
+        <translation>Fehler beim Makro Laden</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Save macro file</source>
+        <translation>Makrodatei schreiben</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
+        <source>Save macro</source>
+        <translation>Makro speichern</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
+        <source>Error saving macro</source>
+        <translation>Fehler beim Makro speichern</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
+        <source>Start Macro Recording</source>
+        <translation>Makroaufzeichnung starten</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <source>Macro Recording</source>
+        <translation>Makroaufzeichnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <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="1263"/>
+        <source>Toggle bookmark</source>
+        <translation>Lesezeichen setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
+        <source>Next bookmark</source>
+        <translation>Nächstes Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
+        <source>Previous bookmark</source>
+        <translation>Vorheriges Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
+        <source>Clear all bookmarks</source>
+        <translation>Alle Lesezeichen löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
+        <source>Toggle breakpoint</source>
+        <translation>Haltepunkt setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
+        <source>LMB toggles bookmarks</source>
+        <translation>LMK schaltet Lesezeichen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
+        <source>LMB toggles breakpoints</source>
+        <translation>LMK schaltet Haltepunkte</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
+        <source>Next breakpoint</source>
+        <translation>Nächster Haltepunkt</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1301"/>
+        <source>Previous breakpoint</source>
+        <translation>Vorheriger Haltepunkt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation>Alle Haltepunkte löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
+        <source>Edit breakpoint...</source>
+        <translation>Haltepunkt bearbeiten...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
+        <source>Enable breakpoint</source>
+        <translation>Haltepunkt aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
+        <source>Disable breakpoint</source>
+        <translation>Haltepunkt deaktivieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <source>Code Coverage</source>
+        <translation>Quelltext Abdeckung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <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="5972"/>
+        <source>Profile Data</source>
+        <translation>Profildaten</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
+        <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="4610"/>
+        <source>Autocompletion</source>
+        <translation>Automatische Vervollständigung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
+        <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="824"/>
+        <source>Use Monospaced Font</source>
+        <translation>Benutze Monospace Font</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="817"/>
+        <source>Shorten empty lines</source>
+        <translation>Leere Zeilen verkürzen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
+        <source>Goto syntax error</source>
+        <translation>Zu Syntaxfehler gehen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <source>Clear syntax error</source>
+        <translation>Syntaxfehler löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="829"/>
+        <source>Autosave enabled</source>
+        <translation>Autom. Speicherung aktiv</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
+        <source>Drop Error</source>
+        <translation>Drop Fehler</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <source>Show syntax error message</source>
+        <translation>Zeige Syntaxfehlermeldung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>Syntax Error</source>
+        <translation>Syntaxfehler</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>No syntax error message available.</source>
+        <translation>Keine Syntaxfehlermeldung verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1291"/>
+        <source>Toggle temporary breakpoint</source>
+        <translation>Temporären Haltepunkt setzen/löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="969"/>
+        <source>Show code coverage annotations</source>
+        <translation>Markiere Zeilen ohne Abdeckung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="972"/>
+        <source>Hide code coverage annotations</source>
+        <translation>Lösche Abdeckungsmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1306"/>
+        <source>Next uncovered line</source>
+        <translation>Nächste nichtabgedeckte Zeile</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1309"/>
         <source>Previous uncovered line</source>
         <translation>Vorige nichtabgedeckte Zeile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Zeilen ohne Abdeckung Markieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
         <source>All lines have been covered.</source>
         <translation>Alle Zeilen sind abgedeckt.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>There is no coverage file available.</source>
         <translation>Es gibt keine Datei mit Abdeckungsinformationen.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <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="6481"/>
+        <location filename="../QScintilla/Editor.py" line="6513"/>
         <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 Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <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 Makrodatei &lt;b&gt;{0}&lt;/b&gt; ist zerstört.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <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 Makrodatei &lt;b&gt;{0}&lt;/b&gt; kann nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <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="359"/>
+        <location filename="../QScintilla/Editor.py" line="367"/>
         <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="980"/>
-        <source>Diagrams</source>
-        <translation>Diagramme</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation>Klassendiagramm...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation>Package Diagramm...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation>Imports-Diagramm...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="988"/>
+        <source>Diagrams</source>
+        <translation>Diagramme</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
+        <translation>Klassendiagramm...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation>Package Diagramm...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation>Imports-Diagramm...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
         <source>Application Diagram...</source>
         <translation>Applikations-Diagramm...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
         <source>No Language</source>
         <translation>Keine Sprache</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6884"/>
+        <location filename="../QScintilla/Editor.py" line="6916"/>
         <source>{0} (ro)</source>
         <translation>{0} (ro)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7045"/>
-        <source>Resources</source>
-        <translation>Ressourcen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation>Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation>Dateien hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation>Aliased-Datei hinzufügen...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation>Lokalisierte Ressource hinzufügen...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation>Ressourcen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation>Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation>Dateien hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation>Aliased-Datei hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation>Lokalisierte Ressource hinzufügen...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
         <source>Add file resource</source>
         <translation>Dateiressource hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
         <source>Add file resources</source>
         <translation>Dateiressourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Add aliased file resource</source>
         <translation>Aliased-Dateiressourcen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <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="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Package Diagram</source>
         <translation>Package-Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Include class attributes?</source>
         <translation>Klassenattribute anzeigen?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Application Diagram</source>
         <translation>Applikations-Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Include module names?</source>
         <translation>Modulnamen anzeigen?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
+        <location filename="../QScintilla/Editor.py" line="7090"/>
         <source>Add resource frame</source>
         <translation>Ressourcenrahmen hinzufügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <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="1304"/>
+        <location filename="../QScintilla/Editor.py" line="1312"/>
         <source>Next task</source>
         <translation>Nächste Aufgabe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1306"/>
+        <location filename="../QScintilla/Editor.py" line="1314"/>
         <source>Previous task</source>
         <translation>Vorherige Aufgabe</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="918"/>
+        <location filename="../QScintilla/Editor.py" line="926"/>
         <source>Complete from Document</source>
         <translation>Vervollständigung vom Dokument</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="920"/>
+        <location filename="../QScintilla/Editor.py" line="928"/>
         <source>Complete from APIs</source>
         <translation>Vervollständigung von APIs</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="922"/>
+        <location filename="../QScintilla/Editor.py" line="930"/>
         <source>Complete from Document and APIs</source>
         <translation>Vervollständigung vom Dokument und von APIs</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1129"/>
+        <location filename="../QScintilla/Editor.py" line="1137"/>
         <source>Export as</source>
         <translation>Exportieren als</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
+        <source>Export source</source>
+        <translation>Quelltext exportieren</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="1358"/>
-        <source>Export source</source>
-        <translation>Quelltext exportieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1350"/>
         <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="1358"/>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
         <source>No export format given. Aborting...</source>
         <translation>Kein Exportformat angegeben. Abbruch...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Imports Diagram</source>
         <translation>Imports Diagramm</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Include imports from external modules?</source>
         <translation>Imports externer Module anzeigen?</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="848"/>
+        <source>Calltip</source>
+        <translation>Calltip</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="894"/>
+        <source>Print Preview</source>
+        <translation>Druckvorschau</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="449"/>
+        <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;Quelltexteditorfenster&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="833"/>
+        <source>Typing aids enabled</source>
+        <translation>Eingabehilfen aktiv</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1101"/>
+        <source>End-of-Line Type</source>
+        <translation>Zeilenendemarkierung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1105"/>
+        <source>Unix</source>
+        <translation>Unix</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1112"/>
+        <source>Windows</source>
+        <translation>Windows</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1119"/>
+        <source>Macintosh</source>
+        <translation>Macintosh</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1060"/>
+        <source>Encodings</source>
+        <translation>Kodierungen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1040"/>
+        <source>Guessed</source>
+        <translation>Ermittelt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1381"/>
+        <source>Alternatives</source>
+        <translation>Alternativen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1377"/>
+        <source>Alternatives ({0})</source>
+        <translation>Alternativen ({0})</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
+        <source>Pygments Lexer</source>
+        <translation>Pygments Lexer</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
+        <source>Select the Pygments lexer to apply.</source>
+        <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7533"/>
+        <source>Check spelling...</source>
+        <translation>Rechtschreibprüfung...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="809"/>
+        <source>Check spelling of selection...</source>
+        <translation>Rechtschreibprüfung für Auswahl...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7536"/>
+        <source>Add to dictionary</source>
+        <translation>Zum Wörterbuch hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7538"/>
+        <source>Ignore All</source>
+        <translation>Alle ignorieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="813"/>
+        <source>Remove from dictionary</source>
+        <translation>Aus dem Wörterbuch entfernen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
+        <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="3118"/>
+        <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="1279"/>
+        <source>Next warning</source>
+        <translation>Nächste Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1282"/>
+        <source>Previous warning</source>
+        <translation>Vorherige Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1284"/>
+        <source>Show warning message</source>
+        <translation>Zeige Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1286"/>
+        <source>Clear warnings</source>
+        <translation>Warnungen löschen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
+        <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="6559"/>
+        <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 Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6410"/>
+        <source>Warning: {0}</source>
+        <translation>Warnung: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6417"/>
+        <source>Error: {0}</source>
+        <translation>Fehler: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6748"/>
+        <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="890"/>
+        <source>Open &apos;rejection&apos; file</source>
+        <translation>Öffne „Ablehnungs“-Datei</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1000"/>
+        <source>Load Diagram...</source>
+        <translation>Diagramm laden...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1317"/>
+        <source>Next change</source>
+        <translation>Nächste Änderung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1320"/>
+        <source>Previous change</source>
+        <translation>Vorherige Änderung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
+        <source>Sort Lines</source>
+        <translation>Zeilen sortieren</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
+        <source>The selection contains illegal data for a numerical sort.</source>
+        <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
+        <source>No warning messages available.</source>
+        <translation>Keine Warnmeldungen verfügbar.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
+        <source>Style: {0}</source>
+        <translation>Stil: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="864"/>
+        <source>New Document View</source>
+        <translation>Neue Dokumentenansicht</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="867"/>
+        <source>New Document View (with new split)</source>
+        <translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="954"/>
+        <source>Tools</source>
+        <translation>Werkzeuge</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1082"/>
+        <source>Re-Open With Encoding</source>
+        <translation>Öffnen mit Kodierung</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6742"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. 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 eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="840"/>
-        <source>Calltip</source>
-        <translation>Calltip</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="886"/>
-        <source>Print Preview</source>
-        <translation>Druckvorschau</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="441"/>
-        <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;Quelltexteditorfenster&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="825"/>
-        <source>Typing aids enabled</source>
-        <translation>Eingabehilfen aktiv</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1093"/>
-        <source>End-of-Line Type</source>
-        <translation>Zeilenendemarkierung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
-        <source>Unix</source>
-        <translation>Unix</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1104"/>
-        <source>Windows</source>
-        <translation>Windows</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1111"/>
-        <source>Macintosh</source>
-        <translation>Macintosh</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1052"/>
-        <source>Encodings</source>
-        <translation>Kodierungen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1032"/>
-        <source>Guessed</source>
-        <translation>Ermittelt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1373"/>
-        <source>Alternatives</source>
-        <translation>Alternativen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1369"/>
-        <source>Alternatives ({0})</source>
-        <translation>Alternativen ({0})</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
-        <source>Pygments Lexer</source>
-        <translation>Pygments Lexer</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
-        <source>Select the Pygments lexer to apply.</source>
-        <translation>Wähle den anzuwendenden Pygments Lexer.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7501"/>
-        <source>Check spelling...</source>
-        <translation>Rechtschreibprüfung...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="801"/>
-        <source>Check spelling of selection...</source>
-        <translation>Rechtschreibprüfung für Auswahl...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7504"/>
-        <source>Add to dictionary</source>
-        <translation>Zum Wörterbuch hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7506"/>
-        <source>Ignore All</source>
-        <translation>Alle ignorieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
-        <source>Remove from dictionary</source>
-        <translation>Aus dem Wörterbuch entfernen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
-        <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="3110"/>
-        <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="1271"/>
-        <source>Next warning</source>
-        <translation>Nächste Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1274"/>
-        <source>Previous warning</source>
-        <translation>Vorherige Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1276"/>
-        <source>Show warning message</source>
-        <translation>Zeige Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1278"/>
-        <source>Clear warnings</source>
-        <translation>Warnungen löschen</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
-        <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="6527"/>
-        <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 Makrodatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6378"/>
-        <source>Warning: {0}</source>
-        <translation>Warnung: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
-        <source>Error: {0}</source>
-        <translation>Fehler: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6716"/>
-        <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="882"/>
-        <source>Open &apos;rejection&apos; file</source>
-        <translation>Öffne „Ablehnungs“-Datei</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="992"/>
-        <source>Load Diagram...</source>
-        <translation>Diagramm laden...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1309"/>
-        <source>Next change</source>
-        <translation>Nächste Änderung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1312"/>
-        <source>Previous change</source>
-        <translation>Vorherige Änderung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
-        <source>Sort Lines</source>
-        <translation>Zeilen sortieren</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
-        <source>The selection contains illegal data for a numerical sort.</source>
-        <translation>Die Auswahl enthält für eine numerische Sortierung ungültige Daten.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
-        <source>No warning messages available.</source>
-        <translation>Keine Warnmeldungen verfügbar.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6375"/>
-        <source>Style: {0}</source>
-        <translation>Stil: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="856"/>
-        <source>New Document View</source>
-        <translation>Neue Dokumentenansicht</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="859"/>
-        <source>New Document View (with new split)</source>
-        <translation>Neue Dokumentenansicht (in neuem Abschnitt)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="946"/>
-        <source>Tools</source>
-        <translation>Werkzeuge</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1074"/>
-        <source>Re-Open With Encoding</source>
-        <translation>Öffnen mit Kodierung</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6710"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. 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 eric6 geöffnet war. Neu einlesen?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="832"/>
         <source>Automatic Completion enabled</source>
         <translation>Automatische Vervollständigung aktiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="912"/>
+        <location filename="../QScintilla/Editor.py" line="920"/>
         <source>Complete</source>
         <translation>Vervollständigen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>Auto-Completion Provider</source>
         <translation>Provider für automatische Vervollständigungen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Provider für automatische Vervollständigungen namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>Call-Tips Provider</source>
         <translation>Calltipps-Provider</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>Der Calltipps-Provider namens &apos;{0}&apos; ist bereits registriert. Die Wiederholung wird ignoriert.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>Register Mouse Click Handler</source>
         <translation>Maus Klick Handler registrieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Ein Maus Klick Handler für &quot;{0}&quot; wurde bereits durch &quot;{1}&quot; registriert. Die Anfrage durch &quot;{2}&quot; wird abgebrochen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="876"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Save Copy...</source>
         <translation>Kopie speichern...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="915"/>
+        <location filename="../QScintilla/Editor.py" line="923"/>
         <source>Clear Completions Cache</source>
         <translation>Vervollständigungsspeicher löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="842"/>
+        <location filename="../QScintilla/Editor.py" line="850"/>
         <source>Code Info</source>
         <translation>Code Info</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1315"/>
+        <location filename="../QScintilla/Editor.py" line="1323"/>
         <source>Clear changes</source>
         <translation>Änderungsmarker löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="767"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>Execute Selection In Console</source>
         <translation>Auswahl in Konsole ausführen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>EditorConfig Properties</source>
         <translation>EditorConfig Eigenschaften</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die EditorConfig Eigenschaften für die Datei &lt;b&gt;{0}&lt;/b&gt; konnten nicht geladen werden.&lt;/p&gt;</translation>
     </message>
@@ -13584,7 +13584,7 @@
         <translation>Ändere Hintergrundfarbe</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
         <source>Various</source>
         <translation>Verschiedenes</translation>
     </message>
@@ -13599,12 +13599,12 @@
         <translation>Zeige Leerzeichen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Auswählen, um ein minimales Kontextmenü anzuzeigen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
         <source>Show minimal context menu</source>
         <translation>Zeige minimales Kontextmenü</translation>
     </message>
@@ -14029,12 +14029,12 @@
         <translation>Wähle die Farbe der Markierung für die aktuelle Zeile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
         <source>Background:</source>
         <translation>Hintergrund:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
         <source>Select the background colour for the marker map</source>
         <translation>Wähle die Hintergrundfarbe der Markierungsübersicht</translation>
     </message>
@@ -14084,12 +14084,12 @@
         <translation>Wähle die Farbe der Suchmarkierung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Auswählen, um die Formatbuttonsleiste auszublenden, wenn dies nicht unterstützt wird</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation>Formatbuttonsleiste ausblenden, wenn nicht unterstützt</translation>
     </message>
@@ -14128,6 +14128,16 @@
         <source>Select the colour for the error line marker.</source>
         <translation>Wähle die Farbe der Markierung für die Fehlerzeile.</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <source>Conflict Marker Line:</source>
+        <translation>Konfliktmarkierungen:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <source>Select the colour for the conflict marker line marker</source>
+        <translation>Wähle die Farbe der Markierung für Zeilen mit Konfliktmarkierungen</translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -49351,27 +49361,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1650"/>
+        <location filename="../Preferences/__init__.py" line="1651"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
--- a/i18n/eric6_empty.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_empty.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -9731,902 +9731,902 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="359"/>
+        <location filename="../QScintilla/Editor.py" line="367"/>
         <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="441"/>
+        <location filename="../QScintilla/Editor.py" line="449"/>
         <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="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
+        <location filename="../QScintilla/Editor.py" line="761"/>
         <source>Revert to last saved state</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
+        <location filename="../QScintilla/Editor.py" line="791"/>
         <source>Stream Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
+        <location filename="../QScintilla/Editor.py" line="794"/>
         <source>Box Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7501"/>
-        <source>Check spelling...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="801"/>
-        <source>Check spelling of selection...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
-        <source>Remove from dictionary</source>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7533"/>
+        <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="809"/>
+        <source>Check spelling of selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="813"/>
+        <source>Remove from dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="817"/>
         <source>Shorten empty lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="816"/>
+        <location filename="../QScintilla/Editor.py" line="824"/>
         <source>Use Monospaced Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
+        <location filename="../QScintilla/Editor.py" line="829"/>
         <source>Autosave enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="825"/>
+        <location filename="../QScintilla/Editor.py" line="833"/>
         <source>Typing aids enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="832"/>
-        <source>Automatic Completion enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="840"/>
+        <source>Automatic Completion enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="848"/>
         <source>Calltip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="856"/>
-        <source>New Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="859"/>
-        <source>New Document View (with new split)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="864"/>
+        <source>New Document View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="867"/>
+        <source>New Document View (with new split)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="872"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
+        <location filename="../QScintilla/Editor.py" line="878"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
+        <location filename="../QScintilla/Editor.py" line="881"/>
         <source>Save As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="876"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Save Copy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="882"/>
+        <location filename="../QScintilla/Editor.py" line="890"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="886"/>
+        <location filename="../QScintilla/Editor.py" line="894"/>
         <source>Print Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
+        <location filename="../QScintilla/Editor.py" line="897"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="912"/>
-        <source>Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="918"/>
-        <source>Complete from Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="920"/>
+        <source>Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="926"/>
+        <source>Complete from Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="928"/>
         <source>Complete from APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="922"/>
+        <location filename="../QScintilla/Editor.py" line="930"/>
         <source>Complete from Document and APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="944"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="946"/>
+        <location filename="../QScintilla/Editor.py" line="954"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
-        <source>Code metrics...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
-        <source>Show code coverage annotations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="964"/>
-        <source>Hide code coverage annotations</source>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="966"/>
+        <source>Code metrics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="969"/>
+        <source>Show code coverage annotations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="972"/>
+        <source>Hide code coverage annotations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
         <source>Profile data...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="980"/>
-        <source>Diagrams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="988"/>
-        <source>Application Diagram...</source>
+        <source>Diagrams</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
+        <source>Application Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1000"/>
         <source>Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1006"/>
+        <location filename="../QScintilla/Editor.py" line="1014"/>
         <source>Languages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
         <source>No Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1032"/>
+        <location filename="../QScintilla/Editor.py" line="1040"/>
         <source>Guessed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1373"/>
+        <location filename="../QScintilla/Editor.py" line="1381"/>
         <source>Alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1052"/>
+        <location filename="../QScintilla/Editor.py" line="1060"/>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1074"/>
+        <location filename="../QScintilla/Editor.py" line="1082"/>
         <source>Re-Open With Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1093"/>
+        <location filename="../QScintilla/Editor.py" line="1101"/>
         <source>End-of-Line Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
+        <location filename="../QScintilla/Editor.py" line="1105"/>
         <source>Unix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1104"/>
+        <location filename="../QScintilla/Editor.py" line="1112"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1111"/>
+        <location filename="../QScintilla/Editor.py" line="1119"/>
         <source>Macintosh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1129"/>
+        <location filename="../QScintilla/Editor.py" line="1137"/>
         <source>Export as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1255"/>
+        <location filename="../QScintilla/Editor.py" line="1263"/>
         <source>Toggle bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
         <source>Next bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
         <source>Previous bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
         <source>Clear all bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
         <source>Toggle breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
+        <location filename="../QScintilla/Editor.py" line="1291"/>
         <source>Toggle temporary breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
+        <source>Edit breakpoint...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
+        <source>Enable breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
+        <source>Next breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1301"/>
+        <source>Previous breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
+        <source>Goto syntax error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <source>Show syntax error message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <source>Clear syntax error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1279"/>
+        <source>Next warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1282"/>
+        <source>Previous warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1284"/>
+        <source>Show warning message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="1286"/>
-        <source>Edit breakpoint...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
-        <source>Enable breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1291"/>
-        <source>Next breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
-        <source>Goto syntax error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
-        <source>Show syntax error message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
-        <source>Clear syntax error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1271"/>
-        <source>Next warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1274"/>
-        <source>Previous warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1276"/>
-        <source>Show warning message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1278"/>
         <source>Clear warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
-        <source>Next uncovered line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1301"/>
-        <source>Previous uncovered line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1304"/>
-        <source>Next task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1306"/>
-        <source>Previous task</source>
+        <source>Next uncovered line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1309"/>
-        <source>Next change</source>
+        <source>Previous uncovered line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1312"/>
+        <source>Next task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1314"/>
+        <source>Previous task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1317"/>
+        <source>Next change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1320"/>
         <source>Previous change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
         <source>LMB toggles bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
         <source>LMB toggles breakpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1358"/>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1350"/>
-        <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="1358"/>
+        <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="1366"/>
         <source>No export format given. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1369"/>
+        <location filename="../QScintilla/Editor.py" line="1377"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
         <source>Pygments Lexer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
         <source>Modification of Read Only file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
         <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="2556"/>
+        <location filename="../QScintilla/Editor.py" line="2564"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
         <source>Printing completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
         <source>Error while printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <source>File Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <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="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <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="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3110"/>
+        <location filename="../QScintilla/Editor.py" line="3118"/>
         <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="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <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="4602"/>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
         <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="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5409"/>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6375"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6378"/>
+        <location filename="../QScintilla/Editor.py" line="6410"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6417"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6481"/>
+        <location filename="../QScintilla/Editor.py" line="6513"/>
         <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="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <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="6510"/>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
         <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="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <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="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6710"/>
+        <location filename="../QScintilla/Editor.py" line="6742"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6716"/>
+        <location filename="../QScintilla/Editor.py" line="6748"/>
         <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="6720"/>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6884"/>
+        <location filename="../QScintilla/Editor.py" line="6916"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <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="7045"/>
-        <source>Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
-        <source>Add resource frame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7090"/>
+        <source>Add resource frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7504"/>
+        <location filename="../QScintilla/Editor.py" line="7536"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7506"/>
+        <location filename="../QScintilla/Editor.py" line="7538"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="915"/>
+        <location filename="../QScintilla/Editor.py" line="923"/>
         <source>Clear Completions Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="842"/>
+        <location filename="../QScintilla/Editor.py" line="850"/>
         <source>Code Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1315"/>
+        <location filename="../QScintilla/Editor.py" line="1323"/>
         <source>Clear changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="767"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>Execute Selection In Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13919,27 +13919,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
         <source>Select the background colour for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
         <source>Various</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
         <source>Select to show a minimalistic context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
         <source>Show minimal context menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13974,12 +13974,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14018,6 +14018,16 @@
         <source>Select the colour for the error line marker.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <source>Conflict Marker Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <source>Select the colour for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -49103,27 +49113,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1650"/>
+        <location filename="../Preferences/__init__.py" line="1651"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_en.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -9745,902 +9745,902 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="359"/>
+        <location filename="../QScintilla/Editor.py" line="367"/>
         <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="441"/>
+        <location filename="../QScintilla/Editor.py" line="449"/>
         <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="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
+        <location filename="../QScintilla/Editor.py" line="761"/>
         <source>Revert to last saved state</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
+        <location filename="../QScintilla/Editor.py" line="791"/>
         <source>Stream Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
+        <location filename="../QScintilla/Editor.py" line="794"/>
         <source>Box Comment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7501"/>
-        <source>Check spelling...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="801"/>
-        <source>Check spelling of selection...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
-        <source>Remove from dictionary</source>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7533"/>
+        <source>Check spelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="809"/>
+        <source>Check spelling of selection...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="813"/>
+        <source>Remove from dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="817"/>
         <source>Shorten empty lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="816"/>
+        <location filename="../QScintilla/Editor.py" line="824"/>
         <source>Use Monospaced Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
+        <location filename="../QScintilla/Editor.py" line="829"/>
         <source>Autosave enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="825"/>
+        <location filename="../QScintilla/Editor.py" line="833"/>
         <source>Typing aids enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="864"/>
+        <location filename="../QScintilla/Editor.py" line="872"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
+        <location filename="../QScintilla/Editor.py" line="878"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
+        <location filename="../QScintilla/Editor.py" line="881"/>
         <source>Save As...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="886"/>
+        <location filename="../QScintilla/Editor.py" line="894"/>
         <source>Print Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
+        <location filename="../QScintilla/Editor.py" line="897"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="918"/>
+        <location filename="../QScintilla/Editor.py" line="926"/>
         <source>Complete from Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="920"/>
+        <location filename="../QScintilla/Editor.py" line="928"/>
         <source>Complete from APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="922"/>
+        <location filename="../QScintilla/Editor.py" line="930"/>
         <source>Complete from Document and APIs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="840"/>
+        <location filename="../QScintilla/Editor.py" line="848"/>
         <source>Calltip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="944"/>
         <source>Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
-        <source>Code metrics...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
-        <source>Show code coverage annotations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="964"/>
-        <source>Hide code coverage annotations</source>
+        <source>Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="966"/>
+        <source>Code metrics...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="969"/>
+        <source>Show code coverage annotations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="972"/>
+        <source>Hide code coverage annotations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
         <source>Profile data...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="980"/>
-        <source>Diagrams</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="988"/>
+        <source>Diagrams</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
         <source>Application Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1006"/>
+        <location filename="../QScintilla/Editor.py" line="1014"/>
         <source>Languages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
         <source>No Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1032"/>
+        <location filename="../QScintilla/Editor.py" line="1040"/>
         <source>Guessed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1373"/>
+        <location filename="../QScintilla/Editor.py" line="1381"/>
         <source>Alternatives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1052"/>
+        <location filename="../QScintilla/Editor.py" line="1060"/>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1093"/>
+        <location filename="../QScintilla/Editor.py" line="1101"/>
         <source>End-of-Line Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
+        <location filename="../QScintilla/Editor.py" line="1105"/>
         <source>Unix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1104"/>
+        <location filename="../QScintilla/Editor.py" line="1112"/>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1111"/>
+        <location filename="../QScintilla/Editor.py" line="1119"/>
         <source>Macintosh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1129"/>
+        <location filename="../QScintilla/Editor.py" line="1137"/>
         <source>Export as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1255"/>
+        <location filename="../QScintilla/Editor.py" line="1263"/>
         <source>Toggle bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
         <source>Next bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
         <source>Previous bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
         <source>Clear all bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
         <source>Toggle breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
+        <location filename="../QScintilla/Editor.py" line="1291"/>
         <source>Toggle temporary breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
+        <source>Edit breakpoint...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
+        <source>Enable breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
+        <source>Next breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1301"/>
+        <source>Previous breakpoint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
+        <source>Goto syntax error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <source>Show syntax error message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <source>Clear syntax error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1279"/>
+        <source>Next warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1282"/>
+        <source>Previous warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1284"/>
+        <source>Show warning message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="1286"/>
-        <source>Edit breakpoint...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
-        <source>Enable breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1291"/>
-        <source>Next breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
-        <source>Goto syntax error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
-        <source>Show syntax error message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
-        <source>Clear syntax error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1271"/>
-        <source>Next warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1274"/>
-        <source>Previous warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1276"/>
-        <source>Show warning message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1278"/>
         <source>Clear warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
-        <source>Next uncovered line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1301"/>
-        <source>Previous uncovered line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1304"/>
-        <source>Next task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="1306"/>
+        <source>Next uncovered line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1309"/>
+        <source>Previous uncovered line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1312"/>
+        <source>Next task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1314"/>
         <source>Previous task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
         <source>LMB toggles bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
         <source>LMB toggles breakpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1358"/>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
         <source>Export source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1350"/>
-        <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="1358"/>
+        <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="1366"/>
         <source>No export format given. Aborting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1369"/>
+        <location filename="../QScintilla/Editor.py" line="1377"/>
         <source>Alternatives ({0})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
         <source>Pygments Lexer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
         <source>Select the Pygments lexer to apply.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
         <source>Modification of Read Only file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
         <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="2556"/>
+        <location filename="../QScintilla/Editor.py" line="2564"/>
         <source>Printing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
         <source>Printing completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
         <source>Error while printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
         <source>Printing aborted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <source>File Modified</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
         <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="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <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="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="3110"/>
+        <location filename="../QScintilla/Editor.py" line="3118"/>
         <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="3169"/>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
         <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="4602"/>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
         <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="5409"/>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
         <source>Disable breakpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Code Coverage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
         <source>Please select a coverage file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>Show Code Coverage Annotations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
         <source>All lines have been covered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>There is no coverage file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
         <source>Profile Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
         <source>Please select a profile file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
         <source>Syntax Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
         <source>No syntax error message available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
         <source>Macro Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
         <source>Select a macro name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
         <source>Load macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
         <source>Macro files (*.macro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <source>Error loading macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6481"/>
+        <location filename="../QScintilla/Editor.py" line="6513"/>
         <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="6490"/>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
         <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="6510"/>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
         <source>Save macro file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
         <source>Save macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
         <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="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <source>Error saving macro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
         <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="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <source>Start Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
         <source>Macro recording is already active. Start new?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Macro Recording</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
         <source>Enter name of the macro:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6720"/>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
         <source>File changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6884"/>
+        <location filename="../QScintilla/Editor.py" line="6916"/>
         <source>{0} (ro)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
         <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="7045"/>
-        <source>Resources</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
-        <source>Add resource frame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7090"/>
+        <source>Add resource frame</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
         <source>Add file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
         <source>Add file resources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Add aliased file resource</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Package Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Include class attributes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Imports Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
         <source>Include imports from external modules?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Application Diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Include module names?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7504"/>
+        <location filename="../QScintilla/Editor.py" line="7536"/>
         <source>Add to dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7506"/>
+        <location filename="../QScintilla/Editor.py" line="7538"/>
         <source>Ignore All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6378"/>
+        <location filename="../QScintilla/Editor.py" line="6410"/>
         <source>Warning: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
+        <location filename="../QScintilla/Editor.py" line="6417"/>
         <source>Error: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6716"/>
+        <location filename="../QScintilla/Editor.py" line="6748"/>
         <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="882"/>
+        <location filename="../QScintilla/Editor.py" line="890"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="992"/>
+        <location filename="../QScintilla/Editor.py" line="1000"/>
         <source>Load Diagram...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1309"/>
+        <location filename="../QScintilla/Editor.py" line="1317"/>
         <source>Next change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1312"/>
+        <location filename="../QScintilla/Editor.py" line="1320"/>
         <source>Previous change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
         <source>Sort Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
         <source>The selection contains illegal data for a numerical sort.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
         <source>No warning messages available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6375"/>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
         <source>Style: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="856"/>
+        <location filename="../QScintilla/Editor.py" line="864"/>
         <source>New Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="859"/>
+        <location filename="../QScintilla/Editor.py" line="867"/>
         <source>New Document View (with new split)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="946"/>
+        <location filename="../QScintilla/Editor.py" line="954"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1074"/>
+        <location filename="../QScintilla/Editor.py" line="1082"/>
         <source>Re-Open With Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="6710"/>
+        <location filename="../QScintilla/Editor.py" line="6742"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="832"/>
+        <location filename="../QScintilla/Editor.py" line="840"/>
         <source>Automatic Completion enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="912"/>
+        <location filename="../QScintilla/Editor.py" line="920"/>
         <source>Complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>Auto-Completion Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>Call-Tips Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>Register Mouse Click Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="876"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Save Copy...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="915"/>
+        <location filename="../QScintilla/Editor.py" line="923"/>
         <source>Clear Completions Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="842"/>
+        <location filename="../QScintilla/Editor.py" line="850"/>
         <source>Code Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1315"/>
+        <location filename="../QScintilla/Editor.py" line="1323"/>
         <source>Clear changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="767"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>Execute Selection In Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13578,7 +13578,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
         <source>Various</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13593,12 +13593,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
         <source>Select to show a minimalistic context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
         <source>Show minimal context menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13933,12 +13933,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
         <source>Select the background colour for the marker map</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13988,12 +13988,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14032,6 +14032,16 @@
         <source>Select the colour for the error line marker.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <source>Conflict Marker Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <source>Select the colour for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -49147,27 +49157,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1650"/>
+        <location filename="../Preferences/__init__.py" line="1651"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_es.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -9834,902 +9834,902 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation>Rehacer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
+        <location filename="../QScintilla/Editor.py" line="761"/>
         <source>Revert to last saved state</source>
         <translation>Volver al último estado guardado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation>Pegar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation>Indentar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation>Desindentar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation>Pasar a comentario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation>Sacar de comentario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
+        <location filename="../QScintilla/Editor.py" line="791"/>
         <source>Stream Comment</source>
         <translation>Bloque de comentario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
+        <location filename="../QScintilla/Editor.py" line="794"/>
         <source>Box Comment</source>
         <translation>Caja de comentario</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation>Seleccionar hasta la llave ( &apos;{&apos; o &apos;}&apos; )</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
+        <location filename="../QScintilla/Editor.py" line="801"/>
         <source>Deselect all</source>
         <translation>Deseleccionar todo</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="817"/>
+        <source>Shorten empty lines</source>
+        <translation>Acortar las líneas vacías</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="824"/>
+        <source>Use Monospaced Font</source>
+        <translation>Usar fuente monoespaciada</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="829"/>
+        <source>Autosave enabled</source>
+        <translation>Autoguardar habilitado</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="872"/>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="878"/>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="881"/>
+        <source>Save As...</source>
+        <translation>Guardar como...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="897"/>
+        <source>Print</source>
+        <translation>Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="926"/>
+        <source>Complete from Document</source>
+        <translation>Completar desde documento</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="928"/>
+        <source>Complete from APIs</source>
+        <translation>Completar desde APIs</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="930"/>
+        <source>Complete from Document and APIs</source>
+        <translation>Completar desde Documento y APIs</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="944"/>
+        <source>Check</source>
+        <translation>Verificar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="964"/>
+        <source>Show</source>
+        <translation>Mostrar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="966"/>
+        <source>Code metrics...</source>
+        <translation>Métricas de código...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation>Cobertura de código...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="969"/>
+        <source>Show code coverage annotations</source>
+        <translation>Mostrar anotaciones de cobertura de codigo</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="972"/>
+        <source>Hide code coverage annotations</source>
+        <translation>Ocultar anotaciones de cobertura de codigo</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
+        <source>Profile data...</source>
+        <translation>Datos de profiling...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="988"/>
+        <source>Diagrams</source>
+        <translation>Diagramas</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
+        <translation>Diagrama de clases...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation>Diagrama de paquetes...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation>Diagrama de imports...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
+        <source>Application Diagram...</source>
+        <translation>Diagrama de aplicación...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1014"/>
+        <source>Languages</source>
+        <translation>Lenguajes</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
+        <source>No Language</source>
+        <translation>Ningún Lenguaje</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1137"/>
+        <source>Export as</source>
+        <translation>Exportar como</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1263"/>
+        <source>Toggle bookmark</source>
+        <translation>Alternar marcador</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
+        <source>Next bookmark</source>
+        <translation>Nuevo marcador</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
+        <source>Previous bookmark</source>
+        <translation>Marcador anterior</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
+        <source>Clear all bookmarks</source>
+        <translation>Borrar todos los marcadores</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
+        <source>Goto syntax error</source>
+        <translation>Ir al error de sintaxis</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <source>Show syntax error message</source>
+        <translation>Ver el mensaje de error de sintaxis</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <source>Clear syntax error</source>
+        <translation>Borrar error de sintaxis</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
+        <source>Toggle breakpoint</source>
+        <translation>Alternar punto de interrupción</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1291"/>
+        <source>Toggle temporary breakpoint</source>
+        <translation>Alternar punto de interrupción temporal</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
+        <source>Edit breakpoint...</source>
+        <translation>Editar punto de interrupción...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
+        <source>Enable breakpoint</source>
+        <translation>Activar punto de interrupción</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
+        <source>Next breakpoint</source>
+        <translation>Siguiente punto de interrupción</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1301"/>
+        <source>Previous breakpoint</source>
+        <translation>Punto de interrupción anterior</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation>Borrar todos los puntos de interrupción</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1306"/>
+        <source>Next uncovered line</source>
+        <translation>Siguiente línea sin cobertura</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1309"/>
+        <source>Previous uncovered line</source>
+        <translation>Anterior línea sin cobertura</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1312"/>
+        <source>Next task</source>
+        <translation>Nueva tarea</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1314"/>
+        <source>Previous task</source>
+        <translation>Tarea anterior</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
+        <source>LMB toggles bookmarks</source>
+        <translation>LMB (botón izquierdo del ratón) alterna marcadores</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
+        <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="1366"/>
+        <source>Export source</source>
+        <translation>Exportar fuente</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1366"/>
+        <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="1873"/>
+        <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="1873"/>
+        <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="2564"/>
+        <source>Printing...</source>
+        <translation>Imprimiendo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
+        <source>Printing completed</source>
+        <translation>Impresión completa</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
+        <source>Error while printing</source>
+        <translation>Error al imprimir</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
+        <source>Printing aborted</source>
+        <translation>Impresión cancelada</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
+        <source>File Modified</source>
+        <translation>Archivo modificado</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
+        <source>Save File</source>
+        <translation>Guardar archivo</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
+        <source>Autocompletion</source>
+        <translation>Autocompletar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
+        <source>Autocompletion is not available because there is no autocompletion source set.</source>
+        <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
+        <source>Disable breakpoint</source>
+        <translation>Deshabilitar punto de interrupción</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <source>Code Coverage</source>
+        <translation>Cobertura de codigo</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <source>Please select a coverage file</source>
+        <translation>Por favor seleccione un archivo de cobertura</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
+        <source>Show Code Coverage Annotations</source>
+        <translation>Mostrar Anotaciones de Cobertura de Código</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
+        <source>All lines have been covered.</source>
+        <translation>Todas las líneas han sido cubiertas.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
+        <source>There is no coverage file available.</source>
+        <translation>No hay archivo de cobertura disponible.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
+        <source>Profile Data</source>
+        <translation>Datos de profiling</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
+        <source>Please select a profile file</source>
+        <translation>Por favor seleccione un archivo de profiling</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>Syntax Error</source>
+        <translation>Error de sintaxis</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>No syntax error message available.</source>
+        <translation>No hay mensajes de error de sintaxis disponibles.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Macro Name</source>
+        <translation>Nombre de macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Select a macro name:</source>
+        <translation>Seleccione un nombre de macro:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
+        <source>Load macro file</source>
+        <translation>Cargar archivo de macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Macro files (*.macro)</source>
+        <translation>Archivos de Macro  (*.macro)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
+        <source>Error loading macro</source>
+        <translation>Error al cargar macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Save macro file</source>
+        <translation>Guardar archivo de macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
+        <source>Save macro</source>
+        <translation>Guardar macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
+        <source>Error saving macro</source>
+        <translation>Error al guardar macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
+        <source>Start Macro Recording</source>
+        <translation>Comenzar grabación de macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
+        <source>Macro recording is already active. Start new?</source>
+        <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <source>Macro Recording</source>
+        <translation>Grabando macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <source>Enter name of the macro:</source>
+        <translation>Introduzca el nombre de la macro:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
+        <source>File changed</source>
+        <translation>Archivo modificado</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
+        <source>Drop Error</source>
+        <translation>Error al soltar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation>Recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation>Añadir archivo...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation>Añadir archivos...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation>Añadir archivo con un alias...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation>Añadir recursos localizados...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7090"/>
+        <source>Add resource frame</source>
+        <translation>Añadir ventana de recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
+        <source>Add file resource</source>
+        <translation>Añadir archivo de recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
+        <source>Add file resources</source>
+        <translation>Añadir archivo de recursos</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
+        <source>Add aliased file resource</source>
+        <translation>Añadir archivo de recursos con un alias</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
+        <source>Package Diagram</source>
+        <translation>Digrama de paquetes</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
+        <source>Include class attributes?</source>
+        <translation>¿Incluir atributos de clase?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
+        <source>Imports Diagram</source>
+        <translation>Diagrama de imports</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7237"/>
+        <source>Include imports from external modules?</source>
+        <translation>¿Incluir los imports de módulos externos?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
+        <source>Application Diagram</source>
+        <translation>Diagrama de aplicación</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
+        <source>Include module names?</source>
+        <translation>¿Incluir nombres de módulos?</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="848"/>
+        <source>Calltip</source>
+        <translation>Consejo de llamada</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="894"/>
+        <source>Print Preview</source>
+        <translation>Presentación preliminar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="449"/>
+        <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;Una Ventana de Edición de Códigos Fuente&lt;/b&gt;&lt;p&gt;Esta ventana se utiliza para mostrar y editar un archivo de código fuente.  Puede abrir tantas como desee. El nombre del archivo se muestra en la barra de título de la ventana.&lt;/p&gt;&lt;p&gt;Para insertar puntos de interrupción basta con hacer un click en el espacio entre los números de línea y los marcadores de plegado.  Pueden editarse con el menú de contexto de los márgenes.&lt;/p&gt;&lt;p&gt;Para insertar marcadores solo hay que hacer Shift-click en el espacio entre los números de línea y los marcadores de plegado.&lt;/p&gt;&lt;p&gt;Estas acciones se pueden revertir utilizando el menú de contexto.&lt;/p&gt;&lt;p&gt;Haciendo Ctrl-click en un marcador de error sintáctico se muestra información sobre el dicho error.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="833"/>
+        <source>Typing aids enabled</source>
+        <translation>Ayudas al tecleo habilitadas</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1101"/>
+        <source>End-of-Line Type</source>
+        <translation>Tipo de fin-de-línea</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1105"/>
+        <source>Unix</source>
+        <translation>Unix</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1112"/>
+        <source>Windows</source>
+        <translation>Windows</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1119"/>
+        <source>Macintosh</source>
+        <translation>Macintosh</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1060"/>
+        <source>Encodings</source>
+        <translation>Codificaciones</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1040"/>
+        <source>Guessed</source>
+        <translation>Suposición</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1381"/>
+        <source>Alternatives</source>
+        <translation>Alternativas</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
+        <source>Pygments Lexer</source>
+        <translation>Analizador Léxico de Pygments</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1397"/>
+        <source>Select the Pygments lexer to apply.</source>
+        <translation>Seleccionar el Analizador Léxico de Pygments.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7533"/>
+        <source>Check spelling...</source>
+        <translation>Corrección ortográfica...</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="809"/>
-        <source>Shorten empty lines</source>
-        <translation>Acortar las líneas vacías</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="816"/>
-        <source>Use Monospaced Font</source>
-        <translation>Usar fuente monoespaciada</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
-        <source>Autosave enabled</source>
-        <translation>Autoguardar habilitado</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="864"/>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
-        <source>Save As...</source>
-        <translation>Guardar como...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
-        <source>Print</source>
-        <translation>Imprimir</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="918"/>
-        <source>Complete from Document</source>
-        <translation>Completar desde documento</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="920"/>
-        <source>Complete from APIs</source>
-        <translation>Completar desde APIs</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="922"/>
-        <source>Complete from Document and APIs</source>
-        <translation>Completar desde Documento y APIs</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
-        <source>Check</source>
-        <translation>Verificar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
-        <source>Show</source>
-        <translation>Mostrar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
-        <source>Code metrics...</source>
-        <translation>Métricas de código...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation>Cobertura de código...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
-        <source>Show code coverage annotations</source>
-        <translation>Mostrar anotaciones de cobertura de codigo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="964"/>
-        <source>Hide code coverage annotations</source>
-        <translation>Ocultar anotaciones de cobertura de codigo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="967"/>
-        <source>Profile data...</source>
-        <translation>Datos de profiling...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="980"/>
-        <source>Diagrams</source>
-        <translation>Diagramas</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation>Diagrama de clases...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation>Diagrama de paquetes...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation>Diagrama de imports...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="988"/>
-        <source>Application Diagram...</source>
-        <translation>Diagrama de aplicación...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1006"/>
-        <source>Languages</source>
-        <translation>Lenguajes</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
-        <source>No Language</source>
-        <translation>Ningún Lenguaje</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1129"/>
-        <source>Export as</source>
-        <translation>Exportar como</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1255"/>
-        <source>Toggle bookmark</source>
-        <translation>Alternar marcador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
-        <source>Next bookmark</source>
-        <translation>Nuevo marcador</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
-        <source>Previous bookmark</source>
-        <translation>Marcador anterior</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
-        <source>Clear all bookmarks</source>
-        <translation>Borrar todos los marcadores</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
-        <source>Goto syntax error</source>
-        <translation>Ir al error de sintaxis</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
-        <source>Show syntax error message</source>
-        <translation>Ver el mensaje de error de sintaxis</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
-        <source>Clear syntax error</source>
-        <translation>Borrar error de sintaxis</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
-        <source>Toggle breakpoint</source>
-        <translation>Alternar punto de interrupción</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
-        <source>Toggle temporary breakpoint</source>
-        <translation>Alternar punto de interrupción temporal</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1286"/>
-        <source>Edit breakpoint...</source>
-        <translation>Editar punto de interrupción...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
-        <source>Enable breakpoint</source>
-        <translation>Activar punto de interrupción</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1291"/>
-        <source>Next breakpoint</source>
-        <translation>Siguiente punto de interrupción</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation>Punto de interrupción anterior</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation>Borrar todos los puntos de interrupción</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
-        <source>Next uncovered line</source>
-        <translation>Siguiente línea sin cobertura</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1301"/>
-        <source>Previous uncovered line</source>
-        <translation>Anterior línea sin cobertura</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1304"/>
-        <source>Next task</source>
-        <translation>Nueva tarea</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1306"/>
-        <source>Previous task</source>
-        <translation>Tarea anterior</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
-        <source>LMB toggles bookmarks</source>
-        <translation>LMB (botón izquierdo del ratón) alterna marcadores</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
-        <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="1358"/>
-        <source>Export source</source>
-        <translation>Exportar fuente</translation>
+        <source>Check spelling of selection...</source>
+        <translation>Corrección ortográfica de la selección...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7536"/>
+        <source>Add to dictionary</source>
+        <translation>Añadir al diccionario</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7538"/>
+        <source>Ignore All</source>
+        <translation>Ignorar Todo</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="813"/>
+        <source>Remove from dictionary</source>
+        <translation>Eliminar del diccionario</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="367"/>
+        <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;El tamaño del archivo &lt;b&gt;{0}&lt;/b&gt; es &lt;b&gt;{1} KB&lt;/b&gt;. ¿Desea cargarlo de todos modos?&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="1358"/>
-        <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="1865"/>
-        <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="1865"/>
-        <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="2556"/>
-        <source>Printing...</source>
-        <translation>Imprimiendo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
-        <source>Printing completed</source>
-        <translation>Impresión completa</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
-        <source>Error while printing</source>
-        <translation>Error al imprimir</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
-        <source>Printing aborted</source>
-        <translation>Impresión cancelada</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
-        <source>File Modified</source>
-        <translation>Archivo modificado</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
-        <source>Save File</source>
-        <translation>Guardar archivo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
-        <source>Autocompletion</source>
-        <translation>Autocompletar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
-        <source>Autocompletion is not available because there is no autocompletion source set.</source>
-        <translation>Autocompletar no está disponible porque no hay origen de datos para autocompletar.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5409"/>
-        <source>Disable breakpoint</source>
-        <translation>Deshabilitar punto de interrupción</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <source>Code Coverage</source>
-        <translation>Cobertura de codigo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <source>Please select a coverage file</source>
-        <translation>Por favor seleccione un archivo de cobertura</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
-        <source>Show Code Coverage Annotations</source>
-        <translation>Mostrar Anotaciones de Cobertura de Código</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
-        <source>All lines have been covered.</source>
-        <translation>Todas las líneas han sido cubiertas.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
-        <source>There is no coverage file available.</source>
-        <translation>No hay archivo de cobertura disponible.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
-        <source>Profile Data</source>
-        <translation>Datos de profiling</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
-        <source>Please select a profile file</source>
-        <translation>Por favor seleccione un archivo de profiling</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>Syntax Error</source>
-        <translation>Error de sintaxis</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>No syntax error message available.</source>
-        <translation>No hay mensajes de error de sintaxis disponibles.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Macro Name</source>
-        <translation>Nombre de macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Select a macro name:</source>
-        <translation>Seleccione un nombre de macro:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
-        <source>Load macro file</source>
-        <translation>Cargar archivo de macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Macro files (*.macro)</source>
-        <translation>Archivos de Macro  (*.macro)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
-        <source>Error loading macro</source>
-        <translation>Error al cargar macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Save macro file</source>
-        <translation>Guardar archivo de macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
-        <source>Save macro</source>
-        <translation>Guardar macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
-        <source>Error saving macro</source>
-        <translation>Error al guardar macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
-        <source>Start Macro Recording</source>
-        <translation>Comenzar grabación de macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
-        <source>Macro recording is already active. Start new?</source>
-        <translation>Grabación de macro ya está activada. ¿Comenzar una nueva?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <source>Macro Recording</source>
-        <translation>Grabando macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <source>Enter name of the macro:</source>
-        <translation>Introduzca el nombre de la macro:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6720"/>
-        <source>File changed</source>
-        <translation>Archivo modificado</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
-        <source>Drop Error</source>
-        <translation>Error al soltar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7045"/>
-        <source>Resources</source>
-        <translation>Recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation>Añadir archivo...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation>Añadir archivos...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation>Añadir archivo con un alias...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation>Añadir recursos localizados...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
-        <source>Add resource frame</source>
-        <translation>Añadir ventana de recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7077"/>
-        <source>Add file resource</source>
-        <translation>Añadir archivo de recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
-        <source>Add file resources</source>
-        <translation>Añadir archivo de recursos</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
-        <source>Add aliased file resource</source>
-        <translation>Añadir archivo de recursos con un alias</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
-        <source>Package Diagram</source>
-        <translation>Digrama de paquetes</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
-        <source>Include class attributes?</source>
-        <translation>¿Incluir atributos de clase?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
-        <source>Imports Diagram</source>
-        <translation>Diagrama de imports</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7205"/>
-        <source>Include imports from external modules?</source>
-        <translation>¿Incluir los imports de módulos externos?</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
-        <source>Application Diagram</source>
-        <translation>Diagrama de aplicación</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
-        <source>Include module names?</source>
-        <translation>¿Incluir nombres de módulos?</translation>
+        <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;No hay un exportador disponible para el formato de exportación &lt;b&gt;{0}&lt;/b&gt;. Abortando...&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1377"/>
+        <source>Alternatives ({0})</source>
+        <translation>Alternativas ({0})</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; tiene cambios sin guardar.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
+        <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;El archivo&lt;b&gt;{0}&lt;/b&gt; no puede ser abierto.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3118"/>
+        <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;El archivo &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br&gt;Causa: {1}&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6513"/>
+        <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;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; no se puede leer.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
+        <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; está dañado&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
+        <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;El archivo de macro  &lt;b&gt;{0}&lt;/b&gt; no se puede escribir.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6916"/>
+        <source>{0} (ro)</source>
+        <translation>{0} (ro)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
+        <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; no es un archivo.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
+        <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
+        <translation>Alias para el archivo &lt;b&gt;{0}&lt;/b&gt;:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1279"/>
+        <source>Next warning</source>
+        <translation>Siguiente advertencia</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1282"/>
+        <source>Previous warning</source>
+        <translation>Anterior advertencia</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1284"/>
+        <source>Show warning message</source>
+        <translation>Mostrar mensaje de advertencia</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1286"/>
+        <source>Clear warnings</source>
+        <translation>Limpiar advertencias</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
+        <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;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
+        <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;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6410"/>
+        <source>Warning: {0}</source>
+        <translation>Advertencia: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6417"/>
+        <source>Error: {0}</source>
+        <translation>Error: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6748"/>
+        <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;Advertencia:&lt;/b&gt; Perderá los cambios si lo reabre.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="890"/>
+        <source>Open &apos;rejection&apos; file</source>
+        <translation>Abrir archivo &apos;de rechazo&apos;</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1000"/>
+        <source>Load Diagram...</source>
+        <translation>Cargar Diagrama...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1317"/>
+        <source>Next change</source>
+        <translation>Siguiente cambio</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1320"/>
+        <source>Previous change</source>
+        <translation>Cambio anterior</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
+        <source>Sort Lines</source>
+        <translation>Ordenar Líneas</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7950"/>
+        <source>The selection contains illegal data for a numerical sort.</source>
+        <translation>La selección contiene datos ilegales para una ordenación numérica.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
+        <source>Warning</source>
+        <translation>Advertencia</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6346"/>
+        <source>No warning messages available.</source>
+        <translation>No hay mensajes de advertencia disponibles.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6407"/>
+        <source>Style: {0}</source>
+        <translation>Estilo: {0}</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="864"/>
+        <source>New Document View</source>
+        <translation>Nueva Vista de Documento</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="867"/>
+        <source>New Document View (with new split)</source>
+        <translation>Nueva Vista de Documento (con nueva división)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="954"/>
+        <source>Tools</source>
+        <translation>Herramientas</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1082"/>
+        <source>Re-Open With Encoding</source>
+        <translation>Reabrir Con Codificación</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6742"/>
+        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?&lt;/p&gt;</translation>
     </message>
     <message>
         <location filename="../QScintilla/Editor.py" line="840"/>
-        <source>Calltip</source>
-        <translation>Consejo de llamada</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="886"/>
-        <source>Print Preview</source>
-        <translation>Presentación preliminar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="441"/>
-        <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;Una Ventana de Edición de Códigos Fuente&lt;/b&gt;&lt;p&gt;Esta ventana se utiliza para mostrar y editar un archivo de código fuente.  Puede abrir tantas como desee. El nombre del archivo se muestra en la barra de título de la ventana.&lt;/p&gt;&lt;p&gt;Para insertar puntos de interrupción basta con hacer un click en el espacio entre los números de línea y los marcadores de plegado.  Pueden editarse con el menú de contexto de los márgenes.&lt;/p&gt;&lt;p&gt;Para insertar marcadores solo hay que hacer Shift-click en el espacio entre los números de línea y los marcadores de plegado.&lt;/p&gt;&lt;p&gt;Estas acciones se pueden revertir utilizando el menú de contexto.&lt;/p&gt;&lt;p&gt;Haciendo Ctrl-click en un marcador de error sintáctico se muestra información sobre el dicho error.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="825"/>
-        <source>Typing aids enabled</source>
-        <translation>Ayudas al tecleo habilitadas</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1093"/>
-        <source>End-of-Line Type</source>
-        <translation>Tipo de fin-de-línea</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1097"/>
-        <source>Unix</source>
-        <translation>Unix</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1104"/>
-        <source>Windows</source>
-        <translation>Windows</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1111"/>
-        <source>Macintosh</source>
-        <translation>Macintosh</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1052"/>
-        <source>Encodings</source>
-        <translation>Codificaciones</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1032"/>
-        <source>Guessed</source>
-        <translation>Suposición</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1373"/>
-        <source>Alternatives</source>
-        <translation>Alternativas</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
-        <source>Pygments Lexer</source>
-        <translation>Analizador Léxico de Pygments</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1389"/>
-        <source>Select the Pygments lexer to apply.</source>
-        <translation>Seleccionar el Analizador Léxico de Pygments.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7501"/>
-        <source>Check spelling...</source>
-        <translation>Corrección ortográfica...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="801"/>
-        <source>Check spelling of selection...</source>
-        <translation>Corrección ortográfica de la selección...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7504"/>
-        <source>Add to dictionary</source>
-        <translation>Añadir al diccionario</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7506"/>
-        <source>Ignore All</source>
-        <translation>Ignorar Todo</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="805"/>
-        <source>Remove from dictionary</source>
-        <translation>Eliminar del diccionario</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="359"/>
-        <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;El tamaño del archivo &lt;b&gt;{0}&lt;/b&gt; es &lt;b&gt;{1} KB&lt;/b&gt;. ¿Desea cargarlo de todos modos?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1350"/>
-        <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;No hay un exportador disponible para el formato de exportación &lt;b&gt;{0}&lt;/b&gt;. Abortando...&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1369"/>
-        <source>Alternatives ({0})</source>
-        <translation>Alternativas ({0})</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has unsaved changes.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; tiene cambios sin guardar.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
-        <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;El archivo&lt;b&gt;{0}&lt;/b&gt; no puede ser abierto.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3110"/>
-        <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;El archivo &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br&gt;Causa: {1}&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6481"/>
-        <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;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; no se puede leer.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
-        <source>&lt;p&gt;The macro file &lt;b&gt;{0}&lt;/b&gt; is corrupt.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; está dañado&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
-        <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;El archivo de macro  &lt;b&gt;{0}&lt;/b&gt; no se puede escribir.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6884"/>
-        <source>{0} (ro)</source>
-        <translation>{0} (ro)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
-        <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; no es un archivo.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
-        <source>Alias for file &lt;b&gt;{0}&lt;/b&gt;:</source>
-        <translation>Alias para el archivo &lt;b&gt;{0}&lt;/b&gt;:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1271"/>
-        <source>Next warning</source>
-        <translation>Siguiente advertencia</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1274"/>
-        <source>Previous warning</source>
-        <translation>Anterior advertencia</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1276"/>
-        <source>Show warning message</source>
-        <translation>Mostrar mensaje de advertencia</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1278"/>
-        <source>Clear warnings</source>
-        <translation>Limpiar advertencias</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
-        <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;El archivo &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
-        <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;El archivo de macro &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6378"/>
-        <source>Warning: {0}</source>
-        <translation>Advertencia: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6385"/>
-        <source>Error: {0}</source>
-        <translation>Error: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6716"/>
-        <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;Advertencia:&lt;/b&gt; Perderá los cambios si lo reabre.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="882"/>
-        <source>Open &apos;rejection&apos; file</source>
-        <translation>Abrir archivo &apos;de rechazo&apos;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="992"/>
-        <source>Load Diagram...</source>
-        <translation>Cargar Diagrama...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1309"/>
-        <source>Next change</source>
-        <translation>Siguiente cambio</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1312"/>
-        <source>Previous change</source>
-        <translation>Cambio anterior</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
-        <source>Sort Lines</source>
-        <translation>Ordenar Líneas</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7918"/>
-        <source>The selection contains illegal data for a numerical sort.</source>
-        <translation>La selección contiene datos ilegales para una ordenación numérica.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
-        <source>Warning</source>
-        <translation>Advertencia</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6314"/>
-        <source>No warning messages available.</source>
-        <translation>No hay mensajes de advertencia disponibles.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6375"/>
-        <source>Style: {0}</source>
-        <translation>Estilo: {0}</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="856"/>
-        <source>New Document View</source>
-        <translation>Nueva Vista de Documento</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="859"/>
-        <source>New Document View (with new split)</source>
-        <translation>Nueva Vista de Documento (con nueva división)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="946"/>
-        <source>Tools</source>
-        <translation>Herramientas</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1074"/>
-        <source>Re-Open With Encoding</source>
-        <translation>Reabrir Con Codificación</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6710"/>
-        <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; has been changed while it was opened in eric6. Reread it?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; ha cambiado mientras estaba abierto en eric6. ¿Desea volver a cargarlo?&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="832"/>
         <source>Automatic Completion enabled</source>
         <translation>Autocompletar habilitado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="912"/>
+        <location filename="../QScintilla/Editor.py" line="920"/>
         <source>Complete</source>
         <translation>Completo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>Auto-Completion Provider</source>
         <translation>Proveedor de Autocompletado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4727"/>
+        <location filename="../QScintilla/Editor.py" line="4735"/>
         <source>The completion list provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>El proveedor de lista de completado&apos;{0}&apos; ya está registrado. Se ignora la solicitud duplicada.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>Call-Tips Provider</source>
         <translation>Proveedor de Call-Tips</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="4989"/>
+        <location filename="../QScintilla/Editor.py" line="4997"/>
         <source>The call-tips provider &apos;{0}&apos; was already registered. Ignoring duplicate request.</source>
         <translation>El proveedor de call-tips&apos;{0}&apos; ya está registrado. Se ignora la solicitud duplicada.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>Register Mouse Click Handler</source>
         <translation>Registrar Manejador de Clicks de Ratón</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8005"/>
+        <location filename="../QScintilla/Editor.py" line="8037"/>
         <source>A mouse click handler for &quot;{0}&quot; was already registered by &quot;{1}&quot;. Aborting request by &quot;{2}&quot;...</source>
         <translation>Un manejador de clicks de ratón para &quot;{0}&quot; ya está registrado por &quot;{1}&quot;. Abortando solicitud por &quot;{2}&quot;...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="876"/>
+        <location filename="../QScintilla/Editor.py" line="884"/>
         <source>Save Copy...</source>
         <translation>Guardar Copia...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="915"/>
+        <location filename="../QScintilla/Editor.py" line="923"/>
         <source>Clear Completions Cache</source>
         <translation>Limpiar Caché de Completado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="842"/>
+        <location filename="../QScintilla/Editor.py" line="850"/>
         <source>Code Info</source>
         <translation>Info del Código</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1315"/>
+        <location filename="../QScintilla/Editor.py" line="1323"/>
         <source>Clear changes</source>
         <translation>Limpiar cambios</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="767"/>
+        <location filename="../QScintilla/Editor.py" line="775"/>
         <source>Execute Selection In Console</source>
         <translation>Ejecutar Selección en Consola</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>EditorConfig Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="8126"/>
+        <location filename="../QScintilla/Editor.py" line="8158"/>
         <source>&lt;p&gt;The EditorConfig properties for file &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13588,7 +13588,7 @@
         <translation>Cambiar color de fondo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
         <source>Various</source>
         <translation>Varios</translation>
     </message>
@@ -13603,12 +13603,12 @@
         <translation>Mostrar espacios en blanco</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Seleccionar mostrar un menú de contexto minimalista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
         <source>Show minimal context menu</source>
         <translation>Mostrar menú de contexto minimalista</translation>
     </message>
@@ -14033,12 +14033,12 @@
         <translation>Seleccionar el color para la marca de color de línea actual</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
         <source>Background:</source>
         <translation>Fondo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
         <source>Select the background colour for the marker map</source>
         <translation>Seleccionar el color de fondo para el mapa de marcas de color</translation>
     </message>
@@ -14088,12 +14088,12 @@
         <translation>Seleccionar el color para el marcador de búsqueda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Seleccionar para ocultar la barra de Botones de Formato cuando formatear no está soportado</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation>Ocultar barra de Botones de Formato cuando no esté soportado</translation>
     </message>
@@ -14132,6 +14132,16 @@
         <source>Select the colour for the error line marker.</source>
         <translation>Seleccionar color para el marcador de línea con error.</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+        <source>Conflict Marker Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+        <source>Select the colour for the conflict marker line marker</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -49352,27 +49362,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1650"/>
+        <location filename="../Preferences/__init__.py" line="1651"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1678"/>
+        <location filename="../Preferences/__init__.py" line="1679"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1780"/>
+        <location filename="../Preferences/__init__.py" line="1781"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
--- a/i18n/eric6_fr.ts	Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_fr.ts	Sat Feb 03 18:41:49 2018 +0100
@@ -10141,92 +10141,92 @@
 <context>
     <name>Editor</name>
     <message>
-        <location filename="../QScintilla/Editor.py" line="747"/>
+        <location filename="../QScintilla/Editor.py" line="755"/>
         <source>Undo</source>
         <translation>Défaire</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="750"/>
+        <location filename="../QScintilla/Editor.py" line="758"/>
         <source>Redo</source>
         <translation>Refaire</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="753"/>
+        <location filename="../QScintilla/Editor.py" line="761"/>
         <source>Revert to last saved state</source>
         <translation>Ecraser avec le dernier état enregistré</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="757"/>
+        <location filename="../QScintilla/Editor.py" line="765"/>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="760"/>
+        <location filename="../QScintilla/Editor.py" line="768"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="763"/>
-        <source>Paste</source>
-        <translation>Coller</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="771"/>
+        <source>Paste</source>
+        <translation>Coller</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="779"/>
         <source>Indent</source>
         <translation>Indenter</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="774"/>
+        <location filename="../QScintilla/Editor.py" line="782"/>
         <source>Unindent</source>
         <translation>Désindenter</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="777"/>
+        <location filename="../QScintilla/Editor.py" line="785"/>
         <source>Comment</source>
         <translation>Commenter</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="780"/>
+        <location filename="../QScintilla/Editor.py" line="788"/>
         <source>Uncomment</source>
         <translation>Décommenter</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="783"/>
+        <location filename="../QScintilla/Editor.py" line="791"/>
         <source>Stream Comment</source>
         <translation>Commentaire type &quot;Stream&quot;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="786"/>
+        <location filename="../QScintilla/Editor.py" line="794"/>
         <source>Box Comment</source>
         <translation>Commentaire type &quot;Bloc&quot;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="790"/>
+        <location filename="../QScintilla/Editor.py" line="798"/>
         <source>Select to brace</source>
         <translation>Sélection parenthèses</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="792"/>
+        <location filename="../QScintilla/Editor.py" line="800"/>
         <source>Select all</source>
         <translation>Tout sélectionner</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="793"/>
+        <location filename="../QScintilla/Editor.py" line="801"/>
         <source>Deselect all</source>
         <translation>Tout déselectionner</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="809"/>
+        <location filename="../QScintilla/Editor.py" line="817"/>
         <source>Shorten empty lines</source>
         <translation>Raccourcir les lignes vides</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1006"/>
+        <location filename="../QScintilla/Editor.py" line="1014"/>
         <source>Languages</source>
         <translation>Langages</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="816"/>
+        <location filename="../QScintilla/Editor.py" line="824"/>
         <source>Use Monospaced Font</source>
         <translation>Utiliser une police monospacée</translation>
     </message>
@@ -10236,422 +10236,422 @@
         <translation type="obsolete">Autocomplétion activée</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="936"/>
+        <location filename="../QScintilla/Editor.py" line="944"/>
         <source>Check</source>
         <translation>Vérification</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="956"/>
+        <location filename="../QScintilla/Editor.py" line="964"/>
         <source>Show</source>
         <translation>Afficher...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="864"/>
+        <location filename="../QScintilla/Editor.py" line="872"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="870"/>
+        <location filename="../QScintilla/Editor.py" line="878"/>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="873"/>
+        <location filename="../QScintilla/Editor.py" line="881"/>
         <source>Save As...</source>
         <translation>Enregistrer sous...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="889"/>
+        <location filename="../QScintilla/Editor.py" line="897"/>
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="958"/>
+        <location filename="../QScintilla/Editor.py" line="966"/>
         <source>Code metrics...</source>
         <translation>Statistiques du code...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="959"/>
-        <source>Code coverage...</source>
-        <translation>Code coverage...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="967"/>
+        <source>Code coverage...</source>
+        <translation>Code coverage...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="975"/>
         <source>Profile data...</source>
         <translation>Profiler les données...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1255"/>
+        <location filename="../QScintilla/Editor.py" line="1263"/>
         <source>Toggle bookmark</source>
         <translation>Placer/supprimer un signet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1257"/>
+        <location filename="../QScintilla/Editor.py" line="1265"/>
         <source>Next bookmark</source>
         <translation>Signet suivant</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1259"/>
+        <location filename="../QScintilla/Editor.py" line="1267"/>
         <source>Previous bookmark</source>
         <translation>Signet précédent</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1261"/>
+        <location filename="../QScintilla/Editor.py" line="1269"/>
         <source>Clear all bookmarks</source>
         <translation>Effacer tous les signets</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1281"/>
+        <location filename="../QScintilla/Editor.py" line="1289"/>
         <source>Toggle breakpoint</source>
         <translation>Placer/supprimer un point d&apos;arrêt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1286"/>
+        <location filename="../QScintilla/Editor.py" line="1294"/>
         <source>Edit breakpoint...</source>
         <translation>Éditer le point d&apos;arrêt...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5406"/>
+        <location filename="../QScintilla/Editor.py" line="5414"/>
         <source>Enable breakpoint</source>
         <translation>Activer le point d&apos;arrêt</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Editor.py" line="1299"/>
+        <source>Next breakpoint</source>
+        <translation>Point d&apos;arrêt suivant</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1301"/>
+        <source>Previous breakpoint</source>
+        <translation>Point d&apos;arrêt précédent</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1303"/>
+        <source>Clear all breakpoints</source>
+        <translation>Effacer tous les points d&apos;arrêts</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1326"/>
+        <source>LMB toggles bookmarks</source>
+        <translation>Le click principal place des signets</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1330"/>
+        <source>LMB toggles breakpoints</source>
+        <translation>Le click principal place les points d&apos;arrêts</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
+        <source>Modification of Read Only file</source>
+        <translation>Modification de la lecture seule</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1873"/>
+        <source>You are attempting to change a read only file. Please save to a different file first.</source>
+        <translation>Le fichier est en lecture seule. Sauvez d&apos;abord votre fichier sous un autre nom.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2564"/>
+        <source>Printing...</source>
+        <translation>Impression....</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2581"/>
+        <source>Printing completed</source>
+        <translation>Impression terminée</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2583"/>
+        <source>Error while printing</source>
+        <translation>Erreur durant l&apos;impression</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2586"/>
+        <source>Printing aborted</source>
+        <translation>Impression abandonnée</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3004"/>
+        <source>Open File</source>
+        <translation>Ouvrir Fichier</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="3177"/>
+        <source>Save File</source>
+        <translation>Enregistrer Fichier</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="2944"/>
+        <source>File Modified</source>
+        <translation>Fichier Modifié</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
+        <source>Autocompletion</source>
+        <translation>Autocompletion</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="4610"/>
+        <source>Autocompletion is not available because there is no autocompletion source set.</source>
+        <translation>L&apos;autocompletion n&apos;est pas disponible car aucune source d&apos;autocomplétion n&apos;est définie.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5417"/>
+        <source>Disable breakpoint</source>
+        <translation>Désactiver le point d&apos;arrêt</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <source>Code Coverage</source>
+        <translation>Code Coverage</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5794"/>
+        <source>Please select a coverage file</source>
+        <translation>Sélectionner un fichier coverage</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
+        <source>Profile Data</source>
+        <translation>Profiler de données</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="5972"/>
+        <source>Please select a profile file</source>
+        <translation>Sélectionner un fichier profile</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Macro Name</source>
+        <translation>Nom de la macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6471"/>
+        <source>Select a macro name:</source>
+        <translation>Sélectionner un nom de macro:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Macro files (*.macro)</source>
+        <translation>Fichier Macro (*.macro)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6499"/>
+        <source>Load macro file</source>
+        <translation>Charger un fichier macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6522"/>
+        <source>Error loading macro</source>
+        <translation>Erreur lors du chargement de la macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6542"/>
+        <source>Save macro file</source>
+        <translation>Enregistrer le fichier macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6559"/>
+        <source>Save macro</source>
+        <translation>Enregistrer la macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6575"/>
+        <source>Error saving macro</source>
+        <translation>Erreur lors de l&apos;enregistrement de la macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6588"/>
+        <source>Start Macro Recording</source>
+        <translation>Démarrer l&apos;enregistrement de la macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <source>Macro Recording</source>
+        <translation>Enregistrement de macro</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6614"/>
+        <source>Enter name of the macro:</source>
+        <translation>Entrer le nom de la macro:</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6752"/>
+        <source>File changed</source>
+        <translation>Fichier modifié</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="829"/>
+        <source>Autosave enabled</source>
+        <translation>Sauvegarde automatique activée</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1272"/>
+        <source>Goto syntax error</source>
+        <translation>Aller à l&apos;erreur de syntaxe suivante</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1276"/>
+        <source>Clear syntax error</source>
+        <translation>Supprimer les flags d&apos;erreurs de syntaxe</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7056"/>
+        <source>Drop Error</source>
+        <translation>Erreur de suppression</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="1274"/>
+        <source>Show syntax error message</source>
+        <translation>Afficher le message d&apos;erreur de syntaxe</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>Syntax Error</source>
+        <translation>Erreur de syntaxe</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="6132"/>
+        <source>No syntax error message available.</source>
+        <translation>Aucun message d&apos;erreur de syntaxe..</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Editor.py" line="1291"/>
-        <source>Next breakpoint</source>
-        <translation>Point d&apos;arrêt suivant</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1293"/>
-        <source>Previous breakpoint</source>
-        <translation>Point d&apos;arrêt précédent</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1295"/>
-        <source>Clear all breakpoints</source>
-        <translation>Effacer tous les points d&apos;arrêts</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1318"/>
-        <source>LMB toggles bookmarks</source>
-        <translation>Le click principal place des signets</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1322"/>
-        <source>LMB toggles breakpoints</source>
-        <translation>Le click principal place les points d&apos;arrêts</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
-        <source>Modification of Read Only file</source>
-        <translation>Modification de la lecture seule</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1865"/>
-        <source>You are attempting to change a read only file. Please save to a different file first.</source>
-        <translation>Le fichier est en lecture seule. Sauvez d&apos;abord votre fichier sous un autre nom.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2556"/>
-        <source>Printing...</source>
-        <translation>Impression....</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2573"/>
-        <source>Printing completed</source>
-        <translation>Impression terminée</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2575"/>
-        <source>Error while printing</source>
-        <translation>Erreur durant l&apos;impression</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2578"/>
-        <source>Printing aborted</source>
-        <translation>Impression abandonnée</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2996"/>
-        <source>Open File</source>
-        <translation>Ouvrir Fichier</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="3169"/>
-        <source>Save File</source>
-        <translation>Enregistrer Fichier</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="2936"/>
-        <source>File Modified</source>
-        <translation>Fichier Modifié</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
-        <source>Autocompletion</source>
-        <translation>Autocompletion</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="4602"/>
-        <source>Autocompletion is not available because there is no autocompletion source set.</source>
-        <translation>L&apos;autocompletion n&apos;est pas disponible car aucune source d&apos;autocomplétion n&apos;est définie.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5409"/>
-        <source>Disable breakpoint</source>
-        <translation>Désactiver le point d&apos;arrêt</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <source>Code Coverage</source>
-        <translation>Code Coverage</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5786"/>
-        <source>Please select a coverage file</source>
-        <translation>Sélectionner un fichier coverage</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
-        <source>Profile Data</source>
-        <translation>Profiler de données</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="5964"/>
-        <source>Please select a profile file</source>
-        <translation>Sélectionner un fichier profile</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Macro Name</source>
-        <translation>Nom de la macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6439"/>
-        <source>Select a macro name:</source>
-        <translation>Sélectionner un nom de macro:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Macro files (*.macro)</source>
-        <translation>Fichier Macro (*.macro)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6467"/>
-        <source>Load macro file</source>
-        <translation>Charger un fichier macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6490"/>
-        <source>Error loading macro</source>
-        <translation>Erreur lors du chargement de la macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6510"/>
-        <source>Save macro file</source>
-        <translation>Enregistrer le fichier macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6527"/>
-        <source>Save macro</source>
-        <translation>Enregistrer la macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6543"/>
-        <source>Error saving macro</source>
-        <translation>Erreur lors de l&apos;enregistrement de la macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6556"/>
-        <source>Start Macro Recording</source>
-        <translation>Démarrer l&apos;enregistrement de la macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <source>Macro Recording</source>
-        <translation>Enregistrement de macro</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6582"/>
-        <source>Enter name of the macro:</source>
-        <translation>Entrer le nom de la macro:</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6720"/>
-        <source>File changed</source>
-        <translation>Fichier modifié</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="821"/>
-        <source>Autosave enabled</source>
-        <translation>Sauvegarde automatique activée</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1264"/>
-        <source>Goto syntax error</source>
-        <translation>Aller à l&apos;erreur de syntaxe suivante</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1268"/>
-        <source>Clear syntax error</source>
-        <translation>Supprimer les flags d&apos;erreurs de syntaxe</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7024"/>
-        <source>Drop Error</source>
-        <translation>Erreur de suppression</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1266"/>
-        <source>Show syntax error message</source>
-        <translation>Afficher le message d&apos;erreur de syntaxe</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>Syntax Error</source>
-        <translation>Erreur de syntaxe</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="6124"/>
-        <source>No syntax error message available.</source>
-        <translation>Aucun message d&apos;erreur de syntaxe..</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="1283"/>
         <source>Toggle temporary breakpoint</source>
         <translation>Placer/Supprimer un point d&apos;arret temporaire</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="961"/>
+        <location filename="../QScintilla/Editor.py" line="969"/>
         <source>Show code coverage annotations</source>
         <translation>Afficher les annotations de code coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="964"/>
+        <location filename="../QScintilla/Editor.py" line="972"/>
         <source>Hide code coverage annotations</source>
         <translation>Masquer les annotations de code coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1298"/>
+        <location filename="../QScintilla/Editor.py" line="1306"/>
         <source>Next uncovered line</source>
         <translation>Ligne non executée suivante</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1301"/>
+        <location filename="../QScintilla/Editor.py" line="1309"/>
         <source>Previous uncovered line</source>
         <translation>Ligne non executée précédente</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>Show Code Coverage Annotations</source>
         <translation>Afficher les annotations de Code Coverage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5842"/>
+        <location filename="../QScintilla/Editor.py" line="5850"/>
         <source>All lines have been covered.</source>
         <translation>Toutes les lignes ont été executées.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="5849"/>
+        <location filename="../QScintilla/Editor.py" line="5857"/>
         <source>There is no coverage file available.</source>
         <translation>Impossible de trouver le fichier de coverage.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="980"/>
-        <source>Diagrams</source>
-        <translation>Diagrammes</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="982"/>
-        <source>Class Diagram...</source>
-        <translation>Diagramme des classes...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="984"/>
-        <source>Package Diagram...</source>
-        <translation>Diagramme des packages...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="986"/>
-        <source>Imports Diagram...</source>
-        <translation>Diagramme des modules...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="988"/>
+        <source>Diagrams</source>
+        <translation>Diagrammes</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="990"/>
+        <source>Class Diagram...</source>
+        <translation>Diagramme des classes...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="992"/>
+        <source>Package Diagram...</source>
+        <translation>Diagramme des packages...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="994"/>
+        <source>Imports Diagram...</source>
+        <translation>Diagramme des modules...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="996"/>
         <source>Application Diagram...</source>
         <translation>Diagramme de l&apos;application...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="1009"/>
+        <location filename="../QScintilla/Editor.py" line="1017"/>
         <source>No Language</source>
         <translation>Pas de langage</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7045"/>
-        <source>Resources</source>
-        <translation>Ressources</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7047"/>
-        <source>Add file...</source>
-        <translation>Ajouter un fichier...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7049"/>
-        <source>Add files...</source>
-        <translation>Ajouter des fichiers...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7051"/>
-        <source>Add aliased file...</source>
-        <translation>Ajouter un fichier alias...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Editor.py" line="7054"/>
-        <source>Add localized resource...</source>
-        <translation>Ajouter une ressource localisée...</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Editor.py" line="7077"/>
+        <source>Resources</source>
+        <translation>Ressources</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7079"/>
+        <source>Add file...</source>
+        <translation>Ajouter un fichier...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7081"/>
+        <source>Add files...</source>
+        <translation>Ajouter des fichiers...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7083"/>
+        <source>Add aliased file...</source>
+        <translation>Ajouter un fichier alias...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7086"/>
+        <source>Add localized resource...</source>
+        <translation>Ajouter une ressource localisée...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Editor.py" line="7109"/>
         <source>Add file resource</source>
         <translation>Ajoute un fichier ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7093"/>
+        <location filename="../QScintilla/Editor.py" line="7125"/>
         <source>Add file resources</source>
         <translation>Ajoute des fichiers ressources</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7121"/>
+        <location filename="../QScintilla/Editor.py" line="7153"/>
         <source>Add aliased file resource</source>
         <translation>Ajoute un alias de fichier ressource</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Package Diagram</source>
         <translation>Diagramme de package</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7185"/>
+        <location filename="../QScintilla/Editor.py" line="7217"/>
         <source>Include class attributes?</source>
         <translation>Inclure les attributs de classes ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Application Diagram</source>
         <translation>Diagramme de l&apos;application</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7219"/>
+        <location filename="../QScintilla/Editor.py" line="7251"/>
         <source>Include module names?</source>
         <translation>Inclure les noms de modules ?</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Editor.py" line="7058"/>
+        <location filename="../QScintilla/Editor.py" line="7090"/&g