Mercurial Repositories > eric / changeset

changeset

EditorMarkerMap: added cpability to suppress some markers in the marker map.

Thu, 10 Jan 2019 18:01:19 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 10 Jan 2019 18:01:19 +0100
changeset 6648
c09e6c6006eb
parent 6645
ad476851d7e0
child 6649
f1b3a73831c9

EditorMarkerMap: added cpability to suppress some markers in the marker map.

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/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/Preferences/ConfigurationPages/EditorStylesPage.py	Thu Jan 10 14:18:48 2019 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Thu Jan 10 18:01:19 2019 +0100
@@ -257,6 +257,12 @@
         self.initColour("MarkerMapBackground",
                         self.markerMapBackgroundButton,
                         Preferences.getEditorColour)
+        self.changesMarkerCheckBox.setChecked(
+            Preferences.getEditor("ShowMarkerChanges"))
+        self.coverageMarkerCheckBox.setChecked(
+            Preferences.getEditor("ShowMarkerCoverage"))
+        self.searchMarkerCheckBox.setChecked(
+            Preferences.getEditor("ShowMarkerSearch"))
         
         self.indentguidesCheckBox.setChecked(
             Preferences.getEditor("IndentationGuides"))
@@ -355,6 +361,15 @@
         Preferences.setEditor(
             "ShowMarkerMapOnRight",
             self.markerMapRightCheckBox.isChecked())
+        Preferences.setEditor(
+            "ShowMarkerChanges",
+            self.changesMarkerCheckBox.isChecked())
+        Preferences.setEditor(
+            "ShowMarkerCoverage",
+            self.coverageMarkerCheckBox.isChecked())
+        Preferences.setEditor(
+            "ShowMarkerSearch",
+            self.searchMarkerCheckBox.isChecked())
         
         self.saveColours(Preferences.setEditorColour)
         for key in list(self.editorColours.keys()):
--- a/Preferences/ConfigurationPages/EditorStylesPage.ui	Thu Jan 10 14:18:48 2019 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.ui	Thu Jan 10 18:01:19 2019 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>655</width>
-    <height>2650</height>
+    <height>2772</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1887,6 +1887,55 @@
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QGroupBox" name="groupBox_17">
+        <property name="title">
+         <string>Shown Markers</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_11">
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="changesMarkerCheckBox">
+           <property name="toolTip">
+            <string>Select to show change markers</string>
+           </property>
+           <property name="text">
+            <string>Changes</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QCheckBox" name="coverageMarkerCheckBox">
+           <property name="toolTip">
+            <string>Select to show coverage markers</string>
+           </property>
+           <property name="text">
+            <string>Coverage</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="searchMarkerCheckBox">
+           <property name="toolTip">
+            <string>Select to show search markers</string>
+           </property>
+           <property name="text">
+            <string>Search Markers</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0" colspan="2">
+          <widget class="QLabel" name="label_17">
+           <property name="text">
+            <string>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -2005,6 +2054,9 @@
   <tabstop>searchMarkerMapButton</tabstop>
   <tabstop>conflictMarkerMapButton</tabstop>
   <tabstop>markerMapBackgroundButton</tabstop>
+  <tabstop>changesMarkerCheckBox</tabstop>
+  <tabstop>coverageMarkerCheckBox</tabstop>
+  <tabstop>searchMarkerCheckBox</tabstop>
   <tabstop>miniMenuCheckBox</tabstop>
   <tabstop>hideFormatButtonsCheckBox</tabstop>
  </tabstops>
--- a/Preferences/__init__.py	Thu Jan 10 14:18:48 2019 +0100
+++ b/Preferences/__init__.py	Thu Jan 10 18:01:19 2019 +0100
@@ -499,6 +499,9 @@
         "MouseClickHandlersEnabled": True,
         
         "ShowMarkerMapOnRight": True,
+        "ShowMarkerChanges": True,
+        "ShowMarkerCoverage": True,
+        "ShowMarkerSearch": True,
         
         # All (most) lexers
         "AllFoldCompact": True,
--- a/QScintilla/EditorMarkerMap.py	Thu Jan 10 14:18:48 2019 +0100
+++ b/QScintilla/EditorMarkerMap.py	Thu Jan 10 18:01:19 2019 +0100
@@ -82,12 +82,14 @@
         # draw indicators in reverse order of priority
         
         # 1. changes
-        for line in self._master.getChangeLines():
-            self.__drawIndicator(line, painter, self.__changeColor)
+        if Preferences.getEditor("ShowMarkerChanges"):
+            for line in self._master.getChangeLines():
+                self.__drawIndicator(line, painter, self.__changeColor)
         
         # 2. coverage
-        for line in self._master.getCoverageLines():
-            self.__drawIndicator(line, painter, self.__coverageColor)
+        if Preferences.getEditor("ShowMarkerCoverage"):
+            for line in self._master.getCoverageLines():
+                self.__drawIndicator(line, painter, self.__coverageColor)
         
         # 3. tasks
         for line in self._master.getTaskLines():
@@ -102,21 +104,22 @@
             self.__drawIndicator(line, painter, self.__bookmarkColor)
         
         # 6. search markers
-        for line in self._master.getSearchIndicatorLines():
-            self.__drawIndicator(line, painter, self.__searchMarkerColor)
+        if Preferences.getEditor("ShowMarkerSearch"):
+            for line in self._master.getSearchIndicatorLines():
+                self.__drawIndicator(line, painter, self.__searchMarkerColor)
         
         # 7. warnings
         for line in self._master.getWarningLines():
             self.__drawIndicator(line, painter, self.__warningColor)
         
-        # 8a. VCS conflict markers
+        # 8. VCS conflict markers
         for line in self._master.getVcsConflictMarkerLines():
             self.__drawIndicator(line, painter, self.__vcsConflictMarkerColor)
         
-        # 8b. errors
+        # 9. errors
         for line in self._master.getSyntaxErrorLines():
             self.__drawIndicator(line, painter, self.__errorColor)
         
-        # 9. current line
+        # 10. current line
         self.__drawIndicator(self._master.getCursorPosition()[0], painter,
                              self.__currentLineMarker)
--- a/changelog	Thu Jan 10 14:18:48 2019 +0100
+++ b/changelog	Thu Jan 10 18:01:19 2019 +0100
@@ -1,5 +1,10 @@
 Change Log
 ----------
+Version 19.02:
+- bug fixes
+- Editor
+  -- added cpability to suppress some markers in the marker map
+
 Version 19.01:
 - bug fixes
 - pip Interface
--- a/i18n/eric6_cs.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_cs.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5611,12 +5611,12 @@
         <translation>změněno</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>Spojení z ilegálního hosta</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
@@ -5625,18 +5625,18 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pokus o spojení z ilegálního hosta &lt;b&gt;{0}&lt;/b&gt;. Přijmout toto spojení?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -5652,12 +5652,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Spustit debuger</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6892,27 +6892,27 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Spustit debuger</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished">Rodičovský proces</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished">Dětský proces</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished">Větvení klienta</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished">Pokračovat ve fork větvi.</translation>
     </message>
@@ -6922,22 +6922,22 @@
         <translation type="obsolete">&lt;p&gt;Python2 interpreter není nakonfigurován.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Debugovací backend nelze spustit.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14366,7 +14366,7 @@
         <translation>Změnit barvu pozadí</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Různé</translation>
     </message>
@@ -14381,12 +14381,12 @@
         <translation>Zobrazit prázdné znaky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <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="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Zobrazit minimální kontextové menu</translation>
     </message>
@@ -14871,12 +14871,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14916,6 +14916,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">Pokrytí</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Značky hledání</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -51643,17 +51683,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -63308,37 +63348,37 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation>Shell - pasivní</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Pasivní &gt;&gt;&gt; </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
+        <location filename="../QScintilla/Shell.py" line="309"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="308"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
@@ -63353,12 +63393,12 @@
         <translation type="obsolete">Reset a vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
+        <location filename="../QScintilla/Shell.py" line="836"/>
         <source>No.</source>
         <translation>Č.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
@@ -63368,63 +63408,63 @@
         <translation type="obsolete">&lt;b&gt;Okno Shellu&lt;/b&gt;&lt;p&gt;Toto je jednoduchý interpretr běžící v okně. Interpretr běží nezávisle na programu, který je debugován. To znamená, že můžete spustit jakýkoliv příkaz i během debugování.&lt;/p&gt;&lt;p&gt;Během vkládání příkazu můžete použít kurzorové klávesy. Je zde také historie příkazů, která se aktivuje klávesami up a down. Stisknutím up nebo down klávesy po textu, který byl zadán se spustí inkrementální vyhledávání.&lt;/p&gt;&lt;p&gt;Shell má několik speciálních příkazů. &apos;reset&apos; zabije shell a spustí nový. &apos;clear&apos; vyčistí obsah shell okna.&apos;start&apos; se používá pro přepnutí shell jazyka a musí za ním následovat jméno podporovaného jazyka. Podporované jazyky jsou zobrazeny v seznamu, který vrací příkaz &apos;languages&apos;. Tyto příkazy (kromě &apos;languages&apos;) jsou také dostupné přes kontextové menu.&lt;/p&gt;&lt;p&gt;Stisknutím tab klávesy po nějakém vloženém textu se zobrazí seznam s nabídkou možných zakončení výrazu. Odpovídající zadání pak může být vybráno z tohoto listu. Pokud je existuje jen jedna možnost, je vložena automaticky.&lt;/p&gt;&lt;p&gt;Dokud se program neukončí, je shell v pasivním módu dostupný jen pokud se debugovaný program připojil k IDE. To je oznámeno odlišným promptem a dále v názvu titulku okna.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation>Pasivní debug mód</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>Historie</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation>Vybrat vstupy</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>Historie</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation>Vybrat vstupy</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation>Vybrat historii</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>Nepřipojen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
+        <location filename="../QScintilla/Shell.py" line="308"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} na {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
@@ -63435,17 +63475,17 @@
         <translation type="obsolete">Shell jazyk &quot;{0}&quot; není podporován.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <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/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -63453,69 +63493,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished">Projekt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -87916,7 +87956,7 @@
         <translation type="unfinished">&lt;b&gt;Klávesové zkratky&lt;/b&gt;&lt;p&gt;Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished">Exportovat klávesové zkratky</translation>
     </message>
@@ -87936,7 +87976,7 @@
         <translation type="unfinished">&lt;b&gt;Export klávesových zkratek&lt;/b&gt;&lt;p&gt;Exportují se klávesové zkratky z aplikace.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -87956,7 +87996,7 @@
         <translation type="unfinished">&lt;b&gt;Import klávesových zkratek&lt;/b&gt;&lt;p&gt;Do aplikace se importují klávesové zkratky.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_de.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5488,12 +5488,12 @@
         <translation>geändert</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>Verbindung von ungültigem Rechner</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
@@ -5502,19 +5502,19 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Es wurde versucht, eine Verbindung von dem nicht zugelassenen Rechner &lt;b&gt;{0}&lt;/b&gt; aufzubauen. Soll die Verbindung angenommen werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation>Verbindung für passives Debuggen empfangen
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation>Verbindung für passives Debuggen geschlossen
@@ -5531,12 +5531,12 @@
         <translation>&lt;p&gt;Die Debuggerschnittstelle &lt;b&gt;{0}&lt;/b&gt; wurde bereits registriert. Anfrage wird ignoriert.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation>Debugger starten</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Debuggertyp &lt;b&gt;{0}&lt;/b&gt; wird nicht unterstützt oder ist nicht konfiguriert.&lt;/p&gt;</translation>
     </message>
@@ -6665,47 +6665,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation>Debugger starten</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Der Debugger konnte nicht gestartet werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation>Vaterprozess</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation>Kindprozess</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation>Client forkt</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation>Wähle den zu folgenden Forkpfad.</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation>Fehler im Debugprotokoll</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die vom Debugger empfangene Antwort konnte nicht dekodiert werden. Bitte berichten sie diesen Fehler zusammen mit den empfangenen Daten an die eric Bugs Emailadresse.&lt;/p&gt;&lt;p&gt;Fehler: {0}&lt;/p&gt;&lt;p&gt;Daten:&lt;br/&gt;{1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Keine geeignete {0} Umgebung konfiguriert.&lt;/p&gt;</translation>
     </message>
@@ -13696,7 +13696,7 @@
         <translation>Ändere Hintergrundfarbe</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Verschiedenes</translation>
     </message>
@@ -13711,12 +13711,12 @@
         <translation>Zeige Leerzeichen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <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="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Zeige minimales Kontextmenü</translation>
     </message>
@@ -14186,12 +14186,12 @@
         <translation>Wähle die Farbe der Suchmarkierung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation>Formatbuttonsleiste ausblenden, wenn nicht unterstützt</translation>
     </message>
@@ -14257,6 +14257,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation>Markierungsübersicht rechts des Editors anzeigen</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation>Angezeigte Markierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation>Auswählen, um Änderungen anzuzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation>Änderungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation>Auswählen, um Abdeckungen anzuzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation>Abdeckung</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation>Auswählen, um Suchmarkierungen anzuzeigen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation>Suchmarkierungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation>&lt;b&gt;Hinweis&lt;/b&gt;: nicht aufgeführte Markierungen werden immer angezeigt.</translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50376,17 +50416,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
@@ -62012,124 +62052,124 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation>Shell – Passiv</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passiv &gt;&gt;&gt; </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
+        <location filename="../QScintilla/Shell.py" line="309"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="308"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
-        <source>No.</source>
-        <translation>Nr.</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
-        <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/Shell.py" line="294"/>
-        <source>Start</source>
-        <translation>Starten</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="836"/>
+        <source>No.</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
+        <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/Shell.py" line="296"/>
+        <source>Start</source>
+        <translation>Starten</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} auf {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation>Passiver Debugmodus</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>Historie</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation>Eintrag auswählen</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>Historie</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation>Eintrag auswählen</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Wähle den auszuführenden Eintrag aus (aktuellster ist zuletzt dargestellt).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>
 nicht verbunden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
+        <location filename="../QScintilla/Shell.py" line="308"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -62140,14 +62180,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
+        <location filename="../QScintilla/Shell.py" line="916"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Unspezifischer Syntaxfehler.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
+        <location filename="../QScintilla/Shell.py" line="893"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -62156,51 +62196,51 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="916"/>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Syntaxfehler &quot;{1}&quot; in Datei {0}, Zeile {2}, Zeichen {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Signal &quot;{0}&quot; in der Datei {1} in Zeile {2} erzeugt.
 Funktion: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation>Projekt</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „restart“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um eine Shell für eine virtuelle Umgebung zu starten, und sollte vom Namen einer virtuellen Umgebung gefolgt werden. &apos;start&apos; ohne Angebe einer virtuellen Umgebung started die Standard-Shell. Verfügbare virtuelle Umgebungen können mit den Befehlen &apos;envs&apos; oder &apos;environments&apos; aufgelistet werden. Die aktive virtuelle Umgebung kann mit dem Befehl &apos;which&apos; abgefragt werden. &apos;quit&apos; oder &apos;exit&apos; beenden die Anwendung. Diese Befehle (mit Ausnahme von &apos;environments&apos;, &apos;envs&apos; und &apos;which&apos;) sind auch über die Anwendungsmenüs verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.&lt;/p&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „restart“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um eine Shell für eine virtuelle Umgebung zu starten, und sollte vom Namen einer virtuellen Umgebung gefolgt werden. &apos;start&apos; ohne Angebe einer virtuellen Umgebung started die Standard-Shell. Verfügbare virtuelle Umgebungen können mit den Befehlen &apos;envs&apos; oder &apos;environments&apos; aufgelistet werden. Die aktive virtuelle Umgebung kann mit dem Befehl &apos;which&apos; abgefragt werden. Diese Befehle (mit Ausnahme von &apos;environments&apos;, &apos;envs&apos; und &apos;which&apos;) sind auch über das Kontextmenu verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;&lt;p&gt;Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation>Neu starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation>Neu starten und löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation>Aktiver Name</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
@@ -62209,7 +62249,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation>Aktuelle virtuelle Umgebung: &apos;{0}&apos;
@@ -86309,7 +86349,7 @@
         <translation>&lt;b&gt;Tastaturkurzbefehle&lt;/b&gt;&lt;p&gt;Setze die Tastaturkurzbefehle der Applikation mit den bevorzugten Werten.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation>Tastaturkurzbefehle exportieren</translation>
     </message>
@@ -86329,7 +86369,7 @@
         <translation>&lt;b&gt;Tastaturkurzbefehle exportieren&lt;/b&gt;&lt;p&gt;Exportiert die Tastaturkurzbefehle der Applikation.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation>Tastaturkurzbefehle importieren</translation>
     </message>
@@ -86349,7 +86389,7 @@
         <translation>&lt;b&gt;Tastaturkurzbefehle importieren&lt;/b&gt;&lt;p&gt;Importiert die Tastaturkurzbefehle der Applikation.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation>Tastaturkurzbefehlsdatei (*.e4k)</translation>
     </message>
--- a/i18n/eric6_empty.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_empty.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5447,41 +5447,41 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6597,47 +6597,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14033,17 +14033,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14078,12 +14078,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14148,6 +14148,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50128,17 +50168,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61528,103 +61568,103 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="308"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="309"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
-        <source>No.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="836"/>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61632,89 +61672,89 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
+        <location filename="../QScintilla/Shell.py" line="893"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <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/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -85620,7 +85660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85640,7 +85680,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85660,7 +85700,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_en.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5444,30 +5444,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -5483,12 +5483,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6604,47 +6604,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13685,7 +13685,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13700,12 +13700,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14095,12 +14095,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14165,6 +14165,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50175,17 +50215,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -61577,123 +61617,123 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="308"/>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="309"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
-        <source>No.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="836"/>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <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/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61701,69 +61741,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -85673,7 +85713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85693,7 +85733,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -85713,7 +85753,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_es.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -13701,7 +13701,7 @@
         <translation>Cambiar color de fondo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Varios</translation>
     </message>
@@ -13716,12 +13716,12 @@
         <translation>Mostrar espacios en blanco</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <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="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Mostrar menú de contexto minimalista</translation>
     </message>
@@ -14191,12 +14191,12 @@
         <translation>Seleccionar el color para el marcador de búsqueda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation>Ocultar barra de Botones de Formato cuando no esté soportado</translation>
     </message>
@@ -14262,6 +14262,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation>Mostrar Mapa de Marcadores a la Derecha del Editor</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished">Cambios</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">Cobertura</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Marcadores de Búsqueda</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50378,17 +50418,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
--- a/i18n/eric6_fr.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_fr.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5621,30 +5621,30 @@
         <translation>modifiée</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>Connexion en provenance d&apos;un hote illégal</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
         <translation>Non connecté</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -5660,12 +5660,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Démarrage du débogueur</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6896,47 +6896,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Démarrage du débogueur</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Impossible de lancer le débogueur en arrière-plan.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14305,7 +14305,7 @@
         <translation>Changement de la couleur de fond</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Divers</translation>
     </message>
@@ -14320,12 +14320,12 @@
         <translation>Affiche explicitement les espaces</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Cocher pour utiliser un menu contextuel réduit</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Afficher un menu contextuel minimal</translation>
     </message>
@@ -14810,12 +14810,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14855,6 +14855,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">Coverage</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Marquage des occurences</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -51341,17 +51381,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62991,32 +63031,32 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation>Shell - Passif</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passif &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
+        <location filename="../QScintilla/Shell.py" line="309"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="308"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
@@ -63031,17 +63071,17 @@
         <translation type="obsolete">Effacer et réinitialiser</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
+        <location filename="../QScintilla/Shell.py" line="836"/>
         <source>No.</source>
         <translation>Non.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation>Lancer...</translation>
     </message>
@@ -63051,78 +63091,78 @@
         <translation type="obsolete">&lt;b&gt;La fenêtre Shell&lt;/b&gt;&lt;p&gt;Il s&apos;agit simplement d&apos;un interpreteur Python affiché dans une fenêtre. L&apos;interpréteur affiché est celui utilisé pour le débogage du programme en cours .Cela signifie qu&apos;on peut exécuter n&apos;importe quelle commande durant le débogage, en utilisant l&apos;environnement de débug en cours.&lt;/p&gt;&lt;p&gt;On peut utiliser les flèches pour rappeler les commandes enregistrées dans l&apos;historique. En appuyant sur les flèches du haut et du bas, on peut aussi rappeler les commandes qui commencent par le début du mot tapé..&lt;/p&gt;&lt;p&gt;Le shell possède des commandes spéciales. &apos;Réinitialiser&apos; tue le shell en cours et en redémarre un nouveau. &apos;Effacer&apos; efface l&apos;affichage, et &apos;Lancer...&apos; est utilisé pour basculer d&apos;un langage shell à l&apos;autre (&apos;Python&apos; ou &apos;Ruby&apos;). Ces commandes sont aussi disponibles via le menu contextuel du shell.&lt;/p&gt;&lt;p&gt;En appuyant sur la touche Tab après avoir saisi du texte, on affiche la liste des complétions possibles. L&apos;entrée voulue peut être sélectionnée dans la liste. Si une seule entrée est disponible, elle sera sélectionnée automatiquement.&lt;/p&gt;&lt;p&gt;En mode débogage passif, le shell est  disponible uniquement après que le programme débogué connecté à l&apos;IDE a été terminé. Ceci est indiqué par une invite de commande différente et par une indication dans le titre de la fenêtre.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation>Mode débogueur passif</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>Historique</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation>Sélection d&apos;une entrée</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>Historique</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation>Sélection d&apos;une entrée</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Sélectionner une entrée à executer (la plus récente est à la fin).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>Non connexté</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>Configuration...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
+        <location filename="../QScintilla/Shell.py" line="308"/>
         <source>Cut</source>
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <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/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -63130,69 +63170,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished">Projet</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -87626,7 +87666,7 @@
         <translation type="unfinished">&lt;b&gt;Raccourcis claviers&lt;/b&gt;&lt;p&gt;Edite les raccourcis claviers pour l&apos;application.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -87646,7 +87686,7 @@
         <translation type="unfinished">&lt;b&gt;Exporter les raccourcis clavier&lt;/b&gt;&lt;p&gt;Exporte les raccourcis claviers de l&apos;application.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -87666,7 +87706,7 @@
         <translation type="unfinished">&lt;b&gt;Importer des raccourcis clavier&lt;/b&gt;&lt;p&gt;Importe des raccourcis claviers de l&apos;application.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_it.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5524,30 +5524,30 @@
         <translation>modificato</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>Connessione da un non vietato</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
         <translation>Non connesso</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Una connessione è stata tentata da un host vietato &lt;b&gt;{0}&lt;/b&gt;.  Accettare questa connessione ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -5563,12 +5563,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6749,47 +6749,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Avvia Debugger</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il debugger non può essere avviato.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished">Processo padre</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished">Processo figlio</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished">Lancio processo figlio in corso</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished">Seleziona il client da seguire.</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13956,7 +13956,7 @@
         <translation>Cambia colore di sfondo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Vari</translation>
     </message>
@@ -13971,12 +13971,12 @@
         <translation>Mostra spazi</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Seleziona per mostrare un menù di contesto minimale</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Mostra menù di contesto minimale</translation>
     </message>
@@ -14461,12 +14461,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14506,6 +14506,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">Coverage</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Marcatori di ricerca</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50658,17 +50698,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
@@ -62218,32 +62258,32 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation>Shell - Passive</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Passivo &apos;&gt;&gt;&gt;&apos;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
+        <location filename="../QScintilla/Shell.py" line="309"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="308"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
@@ -62258,79 +62298,79 @@
         <translation type="obsolete">Resetta e pulisci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation>Drop Error</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
+        <location filename="../QScintilla/Shell.py" line="836"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation>Passive Debug Mode</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>Cronologia</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation>Seleziona elemento</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>Cronologia</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation>Seleziona elemento</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation>Selezione cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleziona l&apos;elemento dalla cronologia da esegurie (i più recenti sono gli ultimi).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>
 Non connesso</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>Configura...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
+        <location filename="../QScintilla/Shell.py" line="308"/>
         <source>Cut</source>
         <translation>Taglia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
@@ -62342,17 +62382,17 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <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; non è un file.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -62360,69 +62400,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished">Progetto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished">Riavvio</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -86484,7 +86524,7 @@
         <translation type="unfinished">&lt;b&gt;Scorciatoie da tastiera&lt;/b&gt;&lt;p&gt;Imposta le scorciatoie da tastiera dell&apos;applicazione con i valori personalizzati.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -86504,7 +86544,7 @@
         <translation type="unfinished">&lt;b&gt;Esporta scorciatoie da tastiera&lt;/b&gt;&lt;p&gt;Esporta le scorciatoie da tastiera dell&apos;applicazione.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -86524,7 +86564,7 @@
         <translation type="unfinished">&lt;b&gt;Importa scorciatoie da tastiera&lt;/b&gt;&lt;p&gt;Importa le scorciatoie da tastiera dell&apos;applicazione.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished">File scorciatoi tastiera (*.e4k)</translation>
     </message>
--- a/i18n/eric6_pt.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_pt.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5676,17 +5676,17 @@
         <translation>alterado</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>Conexão desde anfitrião ilegal</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O anfitrião ilegal &lt;b&gt;{0}&lt;/b&gt; tentou conectar. Aceitar esta conexão?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
@@ -5695,14 +5695,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation>Conexão de depuração passiva recebida
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation>Conexão de depuração passiva fechada
@@ -5719,12 +5719,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Iniciar o Depurador</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6981,7 +6981,7 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Iniciar o Depurador</translation>
     </message>
@@ -6991,42 +6991,42 @@
         <translation type="obsolete">&lt;p&gt;Intérprete de Python2 não configurado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;A instalação de retaguarda do depurador não pode iniciar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished">Processo Pai</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished">Processo Filho</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished">Bifurcação do Cliente</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished">Selecionar o ramo da bifurcação a seguir.</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14640,7 +14640,7 @@
         <translation>Mostra o factor zoom inicial selecionado</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Vários</translation>
     </message>
@@ -14655,12 +14655,12 @@
         <translation>Mostrar Espaços</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15050,12 +15050,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15095,6 +15095,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished">Alterações</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Marcadores de Pesquisa</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -52062,17 +52102,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
@@ -63578,57 +63618,57 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>Historial</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="308"/>
+        <source>Cut</source>
+        <translation>Cortar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="309"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
@@ -63638,68 +63678,68 @@
         <translation type="obsolete">Reinicializar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>Desconetado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
-        <source>No.</source>
-        <translation>Nº</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="836"/>
+        <source>No.</source>
+        <translation>Nº</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation>Encontrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -63707,69 +63747,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished">Projeto</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -88101,7 +88141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -88121,7 +88161,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -88141,7 +88181,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished">Ficheiro de atalhos de teclado (*.e4k)</translation>
     </message>
--- a/i18n/eric6_ru.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_ru.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -13819,7 +13819,7 @@
         <translation>Показать начальный коэффициент масштабирования</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Разное</translation>
     </message>
@@ -13834,12 +13834,12 @@
         <translation>Показывать символы пропуска</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>Разрешить показ минимального контекстного меню</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Показывать минимальное контекстное меню</translation>
     </message>
@@ -14229,12 +14229,12 @@
         <translation>Выберите цвет маркера поиска</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <source>Select to hide the Format Buttons bar when formatting is not supported</source>
         <translation>Разрешить скрывать панель кнопок форматирования, если форматирование не поддерживается</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation>Скрывать панель кнопок форматирования если нет поддержки форматирования</translation>
     </message>
@@ -14300,6 +14300,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation>Отображать карту маркеров с правой стороны редактора</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished">Изменения</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">Охват</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Маркеры поиска</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50471,17 +50511,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы предпочтений (*.ini);;Все файлы (*)</translation>
     </message>
--- a/i18n/eric6_tr.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_tr.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5608,17 +5608,17 @@
         <translation>değişti</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>Yasal olmayan bir host tan balğlantı</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt;kaçak bir barındırıcıdan (host) bağlantı denemesi. Bu bağlantıyı kabul ediyor musunuz?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
@@ -5627,13 +5627,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -5649,12 +5649,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Hata Ayıklayıcıyı Başlat</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6859,7 +6859,7 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation type="unfinished">Hata Ayıklayıcıyı Başlat</translation>
     </message>
@@ -6869,42 +6869,42 @@
         <translation type="obsolete">&lt;p&gt;Python2 yorumlayıcısı ayarlanmamış.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Hata ayıklayıcıbaşlatılamadı.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation type="unfinished">Ana İşlem</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation type="unfinished">Alt işlem</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished">İstemci çatallaşması</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished">Takip eden çatallaşmadaki branşı seç.</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14360,7 +14360,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>Çeşitli</translation>
     </message>
@@ -14375,12 +14375,12 @@
         <translation>Boş Alanları Göster</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>Enaz açılır menüyü göster</translation>
     </message>
@@ -14795,12 +14795,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14860,6 +14860,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">Kapsam</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">Arama İşaretçileri</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -51462,17 +51502,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62967,12 +63007,12 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation>Pasif- Kabuk</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation>Kabuk</translation>
     </message>
@@ -62982,47 +63022,47 @@
         <translation type="obsolete">&lt;b&gt;Kabu Penceresi&lt;/b&gt;&lt;p&gt;Bu basit bir yorumlayıcı penceresidir. Koşturulan programın hata yakalamasının yapılacağı bir arayüzdür.Bunun anlamı programda hata yakalamaya başladığınızda kabuk üzerinden istediğiniz comutu girebileceğinizdir.&lt;/p&gt;&lt;p&gt;İmleç tuşları ile daha önceden girilen komutlar arasında dolaşabilirsiniz. Aşağı yada yukarı tuşlarına bastıktan sonra klavyeden gireceğiniz harf ve kelimelere göre arama başlatırsınız.&lt;/p&gt;&lt;p&gt;Kabuğun bazı özel komutları vardır. &apos;reset&apos;kabuğu sıfırlar ve yeni bir tane başlatır. &apos;clear&apos; kabuk penceresini temziler. &apos;start&apos;kullanılan kabuk dilinden bir sonraki kabuk diline geçirir. Desteklenen diller &apos;languages&apos; komutu ile listelenir. Bu komutlar (except &apos;languages&apos;) sağ tuş menusü ilede ulaşılabilir.&lt;/p&gt;&lt;p&gt;Bazı metinleri girdikten sonra tab tuşuna bazarsanız tamamlanabilecek kelimelerin bir listesi gelir. Konuyla ilgili kelimelri bu listede seçebilirsiniz.Eğer girilebilecek tek bir seçenek varsa , bu otomat,k olarak eklenir.&lt;/p&gt;&lt;p&gt; Pasif hata ayıklama modunda bu tamamlanana kadar IDLE kullanılamaz.Bu durum pencere başlığında farklı çıktılar ile gösterilir.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>Pasif &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation>Başla</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>Geçmiş</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation>Girişi Seç</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>Geçmiş</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation>Girişi Seç</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>Temizle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
-        <source>Cut</source>
-        <translation>Kes</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
-        <source>Copy</source>
-        <translation>Kopyala</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="308"/>
+        <source>Cut</source>
+        <translation>Kes</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="309"/>
+        <source>Copy</source>
+        <translation>Kopyala</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>Yapıştır</translation>
     </message>
@@ -63037,49 +63077,49 @@
         <translation type="obsolete">Başadön ve temizle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>Ayarlanıyor...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation>Geçmişi Seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>geçmişte yapılanları göster (ençok gösterilenleri seç).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation>Pasif Hata Ayıklama Modu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>
 Bağlantı yok</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
+        <location filename="../QScintilla/Shell.py" line="836"/>
         <source>No.</source>
         <translation>NO.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} üzerin {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation>Stdçıktı:{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation>stdhata: {0}</translation>
     </message>
@@ -63091,22 +63131,22 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <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; bir dosya değil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation type="unfinished">Bul</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -63114,69 +63154,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished">Proje</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -87517,7 +87557,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished">Kılavye Kısa Yollarını Dışa Aktar</translation>
     </message>
@@ -87537,7 +87577,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished">Klavye kısayollarını İçe Aktar</translation>
     </message>
@@ -87557,7 +87597,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Thu Jan 10 14:18:48 2019 +0100
+++ b/i18n/eric6_zh_CN.ts	Thu Jan 10 18:01:19 2019 +0100
@@ -5459,12 +5459,12 @@
         <translation>改变</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>Connection from illegal host</source>
         <translation>连接非法主机</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1513"/>
+        <location filename="../Debugger/DebugServer.py" line="1515"/>
         <source>
 Not connected
 </source>
@@ -5473,18 +5473,18 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="792"/>
+        <location filename="../Debugger/DebugServer.py" line="794"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1706"/>
+        <location filename="../Debugger/DebugServer.py" line="1708"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1720"/>
+        <location filename="../Debugger/DebugServer.py" line="1722"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -5500,12 +5500,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>Start Debugger</source>
         <translation type="unfinished">启动调试器</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1338"/>
+        <location filename="../Debugger/DebugServer.py" line="1340"/>
         <source>&lt;p&gt;The debugger type &lt;b&gt;{0}&lt;/b&gt; is not supported or not configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6686,47 +6686,47 @@
 <context>
     <name>DebuggerInterfacePython</name>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>Start Debugger</source>
         <translation>启动调试器</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="442"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="461"/>
         <source>&lt;p&gt;The debugger backend could not be started.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;调试器后端无法启动。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="937"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="956"/>
         <source>Parent Process</source>
         <translation>父进程</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="938"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="957"/>
         <source>Child process</source>
         <translation>子进程</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Client forking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="939"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="958"/>
         <source>Select the fork branch to follow.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>Debug Protocol Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="985"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="1004"/>
         <source>&lt;p&gt;The response received from the debugger backend could not be decoded. Please report this issue with the received data to the eric bugs email address.&lt;/p&gt;&lt;p&gt;Error: {0}&lt;/p&gt;&lt;p&gt;Data:&lt;br/&gt;{1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerInterfacePython.py" line="349"/>
+        <location filename="../Debugger/DebuggerInterfacePython.py" line="365"/>
         <source>&lt;p&gt;No suitable {0} environment configured.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13773,7 +13773,7 @@
         <translation>改变背景颜色</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1896"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/>
         <source>Various</source>
         <translation>其它</translation>
     </message>
@@ -13788,12 +13788,12 @@
         <translation>显示空格</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/>
         <source>Select to show a minimalistic context menu</source>
         <translation>选择显示简化的上下文菜单</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1905"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/>
         <source>Show minimal context menu</source>
         <translation>显示最简上下文菜单</translation>
     </message>
@@ -14233,12 +14233,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/>
         <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="1915"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/>
         <source>Hide Format Buttons bar when not supported</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14278,6 +14278,46 @@
         <source>Show Marker Map Right of the Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/>
+        <source>Shown Markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
+        <source>Select to show change markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/>
+        <source>Select to show coverage markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/>
+        <source>Coverage</source>
+        <translation type="unfinished">覆盖率</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/>
+        <source>Select to show search markers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/>
+        <source>Search Markers</source>
+        <translation type="unfinished">搜索标记</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/>
+        <source>&lt;b&gt;Note&lt;/b&gt;: Marker types not listed are always shown.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSyntaxPage</name>
@@ -50297,17 +50337,17 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1711"/>
+        <location filename="../Preferences/__init__.py" line="1714"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1739"/>
+        <location filename="../Preferences/__init__.py" line="1742"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
@@ -61857,52 +61897,52 @@
 <context>
     <name>Shell</name>
     <message>
-        <location filename="../QScintilla/Shell.py" line="158"/>
+        <location filename="../QScintilla/Shell.py" line="160"/>
         <source>Shell - Passive</source>
         <translation>命令行 - 被动</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="160"/>
+        <location filename="../QScintilla/Shell.py" line="162"/>
         <source>Shell</source>
         <translation>命令行</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="278"/>
+        <location filename="../QScintilla/Shell.py" line="280"/>
         <source>Passive &gt;&gt;&gt; </source>
         <translation>被动 &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="294"/>
+        <location filename="../QScintilla/Shell.py" line="296"/>
         <source>Start</source>
         <translation>开始</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="299"/>
-        <source>History</source>
-        <translation>历史</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="300"/>
-        <source>Select entry</source>
-        <translation>选择条目</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="301"/>
+        <source>History</source>
+        <translation>历史</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="302"/>
+        <source>Select entry</source>
+        <translation>选择条目</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="303"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="314"/>
+        <location filename="../QScintilla/Shell.py" line="316"/>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="307"/>
+        <location filename="../QScintilla/Shell.py" line="309"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="308"/>
+        <location filename="../QScintilla/Shell.py" line="310"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
@@ -61917,74 +61957,74 @@
         <translation type="obsolete">重置并清除</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="322"/>
+        <location filename="../QScintilla/Shell.py" line="324"/>
         <source>Configure...</source>
         <translation>配置…</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select History</source>
         <translation>选择历史</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="762"/>
+        <location filename="../QScintilla/Shell.py" line="764"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>选择历史条目以执行（最常用的显示在最后）。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="830"/>
+        <location filename="../QScintilla/Shell.py" line="832"/>
         <source>Passive Debug Mode</source>
         <translation>被动调试模式</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="831"/>
+        <location filename="../QScintilla/Shell.py" line="833"/>
         <source>
 Not connected</source>
         <translation>
 没有连接</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="834"/>
+        <location filename="../QScintilla/Shell.py" line="836"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>Drop Error</source>
         <translation>降落误差</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="306"/>
+        <location filename="../QScintilla/Shell.py" line="308"/>
         <source>Cut</source>
         <translation>剪切</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="836"/>
+        <location filename="../QScintilla/Shell.py" line="838"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1016"/>
+        <location filename="../QScintilla/Shell.py" line="1018"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1026"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2125"/>
+        <location filename="../QScintilla/Shell.py" line="2140"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; 不是一个文件。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="312"/>
+        <location filename="../QScintilla/Shell.py" line="314"/>
         <source>Find</source>
         <translation type="unfinished">查找</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="881"/>
+        <location filename="../QScintilla/Shell.py" line="883"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -61992,69 +62032,69 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="914"/>
-        <source>Unspecified syntax error.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="891"/>
-        <source>Exception &quot;{0}&quot;
-{1}
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Shell.py" line="916"/>
+        <source>Unspecified syntax error.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="893"/>
+        <source>Exception &quot;{0}&quot;
+{1}
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="918"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="939"/>
+        <location filename="../QScintilla/Shell.py" line="941"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1989"/>
+        <location filename="../QScintilla/Shell.py" line="2000"/>
         <source>Project</source>
         <translation type="unfinished">项目</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="163"/>
+        <location filename="../QScintilla/Shell.py" line="165"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. &apos;quit&apos; or &apos;exit&apos; is used to exit the application. These commands (except environments&apos;, &apos;envs&apos; and &apos;which&apos;) are available through the window menus as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="190"/>
+        <location filename="../QScintilla/Shell.py" line="192"/>
         <source>&lt;b&gt;The Shell Window&lt;/b&gt;&lt;p&gt;This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.&lt;/p&gt;&lt;p&gt;You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.&lt;/p&gt;&lt;p&gt;The shell has some special commands. &apos;restart&apos; kills the shell and starts a new one. &apos;clear&apos; clears the display of the shell window. &apos;start&apos; is used to start a shell for a virtual environment and should be followed by a virtual environment name. start&apos; without a virtual environment name starts the default shell. Available virtual environments may be listed with the &apos;envs&apos; or &apos;environments&apos; commands. The active virtual environment can be questioned by the &apos;which&apos; command. These commands (except environments&apos; and &apos;envs&apos;) are available through the context menu as well.&lt;/p&gt;&lt;p&gt;Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.&lt;/p&gt;&lt;p&gt;In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="315"/>
+        <location filename="../QScintilla/Shell.py" line="317"/>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="316"/>
+        <location filename="../QScintilla/Shell.py" line="318"/>
         <source>Restart and Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="320"/>
+        <location filename="../QScintilla/Shell.py" line="322"/>
         <source>Active Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1813"/>
+        <location filename="../QScintilla/Shell.py" line="1823"/>
         <source>Available Virtual Environments:
 {0}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1853"/>
+        <location filename="../QScintilla/Shell.py" line="1863"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation type="unfinished"></translation>
@@ -86078,7 +86118,7 @@
         <translation type="unfinished">&lt;b&gt;键盘快捷键&lt;/b&gt;&lt;p&gt;将程序的键盘快捷键设置成你喜欢的按键。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5016"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5025"/>
         <source>Export Keyboard Shortcuts</source>
         <translation type="unfinished">导出键盘快捷键</translation>
     </message>
@@ -86098,7 +86138,7 @@
         <translation type="unfinished">&lt;b&gt;导出键盘快捷键&lt;/b&gt;&lt;p&gt;导出程序的键盘快捷键。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Import Keyboard Shortcuts</source>
         <translation type="unfinished">导入键盘快捷键</translation>
     </message>
@@ -86118,7 +86158,7 @@
         <translation type="unfinished">&lt;b&gt;导入键盘快捷键&lt;/b&gt;&lt;p&gt;导入程序的键盘快捷键。&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserWindow.py" line="5040"/>
+        <location filename="../WebBrowser/WebBrowserWindow.py" line="5049"/>
         <source>Keyboard shortcut file (*.e4k)</source>
         <translation type="unfinished">键盘快捷键文件 (*.e4k)</translation>
     </message>

Mercurial Repository: eric

eric ide

mercurial