Made the colors of the diff dialogs configurable.

Sat, 24 Jun 2017 12:15:03 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 24 Jun 2017 12:15:03 +0200
changeset 5765
39d8b26ff557
parent 5764
51ceecf32585
child 5766
eb2139c20553

Made the colors of the diff dialogs configurable.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
APIs/Python3/eric6.bas file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.E5Gui.E5GenericDiffHighlighter.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Preferences.ConfigurationPages.DiffColoursPage.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Preferences.__init__.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.UI.CompareDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.Preferences.ConfigurationPages.html file | annotate | diff | comparison | revisions
E5Gui/E5GenericDiffHighlighter.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationDialog.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/DiffColoursPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/DiffColoursPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
UI/CompareDialog.py file | annotate | diff | comparison | revisions
UI/DiffDialog.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
eric6.e4p file | annotate | diff | comparison | revisions
i18n/eric6_cs.ts file | annotate | diff | comparison | revisions
i18n/eric6_de.qm file | annotate | diff | comparison | revisions
i18n/eric6_de.ts file | annotate | diff | comparison | revisions
i18n/eric6_empty.ts file | annotate | diff | comparison | revisions
i18n/eric6_en.ts file | annotate | diff | comparison | revisions
i18n/eric6_es.ts file | annotate | diff | comparison | revisions
i18n/eric6_fr.ts file | annotate | diff | comparison | revisions
i18n/eric6_it.ts file | annotate | diff | comparison | revisions
i18n/eric6_pt.ts file | annotate | diff | comparison | revisions
i18n/eric6_ru.ts file | annotate | diff | comparison | revisions
i18n/eric6_tr.ts file | annotate | diff | comparison | revisions
i18n/eric6_zh_CN.ts file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Fri Jun 23 18:46:40 2017 +0200
+++ b/APIs/Python3/eric6.api	Sat Jun 24 12:15:03 2017 +0200
@@ -947,6 +947,7 @@
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.generateRules?4()
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.highlightBlock?4(text)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.makeFormat?4(fg=None, bg=None, bold=False)
+eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.regenerateRules?4()
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter?1(doc)
 eric6.E5Gui.E5GenericDiffHighlighter.TERMINAL?4(pattern)
 eric6.E5Gui.E5GenericDiffHighlighter._REGEX_CACHE?8
@@ -6288,6 +6289,9 @@
 eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage.save?4()
 eric6.Preferences.ConfigurationPages.DebuggerPythonPage.DebuggerPythonPage?1()
 eric6.Preferences.ConfigurationPages.DebuggerPythonPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage.save?4()
+eric6.Preferences.ConfigurationPages.DiffColoursPage.DiffColoursPage?1()
+eric6.Preferences.ConfigurationPages.DiffColoursPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addApiFileButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addInstalledApiFileButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorAPIsPage.EditorAPIsPage.on_addPluginApiFileButton_clicked?4()
@@ -6593,6 +6597,7 @@
 eric6.Preferences.Prefs.cooperationDefaults?7
 eric6.Preferences.Prefs.corbaDefaults?7
 eric6.Preferences.Prefs.debuggerDefaults?7
+eric6.Preferences.Prefs.diffColourDefaults?7
 eric6.Preferences.Prefs.editorColourDefaults?7
 eric6.Preferences.Prefs.editorDefaults?7
 eric6.Preferences.Prefs.editorExporterDefaults?7
@@ -6688,6 +6693,7 @@
 eric6.Preferences.getCooperation?4(key, prefClass=Prefs)
 eric6.Preferences.getCorba?4(key, prefClass=Prefs)
 eric6.Preferences.getDebugger?4(key, prefClass=Prefs)
+eric6.Preferences.getDiffColour?4(key, prefClass=Prefs)
 eric6.Preferences.getEditor?4(key, prefClass=Prefs)
 eric6.Preferences.getEditorAPI?4(language, projectType="", prefClass=Prefs)
 eric6.Preferences.getEditorColour?4(key, prefClass=Prefs)
@@ -6741,6 +6747,7 @@
 eric6.Preferences.setCooperation?4(key, value, prefClass=Prefs)
 eric6.Preferences.setCorba?4(key, value, prefClass=Prefs)
 eric6.Preferences.setDebugger?4(key, value, prefClass=Prefs)
+eric6.Preferences.setDiffColour?4(key, value, prefClass=Prefs)
 eric6.Preferences.setEditor?4(key, value, prefClass=Prefs)
 eric6.Preferences.setEditorAPI?4(language, projectType, apilist, prefClass=Prefs)
 eric6.Preferences.setEditorColour?4(key, value, prefClass=Prefs)
--- a/APIs/Python3/eric6.bas	Fri Jun 23 18:46:40 2017 +0200
+++ b/APIs/Python3/eric6.bas	Sat Jun 24 12:15:03 2017 +0200
@@ -129,6 +129,7 @@
 DelayedFileWatcher QFileSystemWatcher
 DeleteFilesConfirmationDialog QDialog Ui_DeleteFilesConfirmationDialog
 DictResolver BaseResolver
+DiffColoursPage ConfigurationPageBase Ui_DiffColoursPage
 DiffDialog QWidget Ui_DiffDialog
 DiffHighlighter E5GenericDiffHighlighter
 DiffReport StandardReport
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Help/source.qhp	Sat Jun 24 12:15:03 2017 +0200
@@ -774,6 +774,7 @@
               <section title="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.DebuggerPython3Page" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html" />
               <section title="eric6.Preferences.ConfigurationPages.DebuggerPythonPage" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html" />
+              <section title="eric6.Preferences.ConfigurationPages.DiffColoursPage" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAPIsPage" ref="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html" />
@@ -2947,6 +2948,7 @@
       <keyword name="CompareDialog.__appendText" id="CompareDialog.__appendText" ref="eric6.UI.CompareDialog.html#CompareDialog.__appendText" />
       <keyword name="CompareDialog.__compare" id="CompareDialog.__compare" ref="eric6.UI.CompareDialog.html#CompareDialog.__compare" />
       <keyword name="CompareDialog.__fileChanged" id="CompareDialog.__fileChanged" ref="eric6.UI.CompareDialog.html#CompareDialog.__fileChanged" />
+      <keyword name="CompareDialog.__generateFormats" id="CompareDialog.__generateFormats" ref="eric6.UI.CompareDialog.html#CompareDialog.__generateFormats" />
       <keyword name="CompareDialog.__moveTextToCurrentDiffPos" id="CompareDialog.__moveTextToCurrentDiffPos" ref="eric6.UI.CompareDialog.html#CompareDialog.__moveTextToCurrentDiffPos" />
       <keyword name="CompareDialog.__scrollBarMoved" id="CompareDialog.__scrollBarMoved" ref="eric6.UI.CompareDialog.html#CompareDialog.__scrollBarMoved" />
       <keyword name="CompareDialog.compare" id="CompareDialog.compare" ref="eric6.UI.CompareDialog.html#CompareDialog.compare" />
@@ -3809,6 +3811,15 @@
       <keyword name="DictResolver.getDictionary" id="DictResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.getDictionary" />
       <keyword name="DictResolver.keyToStr" id="DictResolver.keyToStr" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.keyToStr" />
       <keyword name="DictResolver.resolve" id="DictResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.resolve" />
+      <keyword name="DiffColoursPage" id="DiffColoursPage" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage" />
+      <keyword name="DiffColoursPage (Constructor)" id="DiffColoursPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__init__" />
+      <keyword name="DiffColoursPage (Module)" id="DiffColoursPage (Module)" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html" />
+      <keyword name="DiffColoursPage.__initColour" id="DiffColoursPage.__initColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__initColour" />
+      <keyword name="DiffColoursPage.__selectBackgroundColour" id="DiffColoursPage.__selectBackgroundColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__selectBackgroundColour" />
+      <keyword name="DiffColoursPage.__selectTextColour" id="DiffColoursPage.__selectTextColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__selectTextColour" />
+      <keyword name="DiffColoursPage.__updateSampleBackgroundColour" id="DiffColoursPage.__updateSampleBackgroundColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__updateSampleBackgroundColour" />
+      <keyword name="DiffColoursPage.__updateSampleTextColour" id="DiffColoursPage.__updateSampleTextColour" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__updateSampleTextColour" />
+      <keyword name="DiffColoursPage.save" id="DiffColoursPage.save" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.save" />
       <keyword name="DiffDialog" id="DiffDialog" ref="eric6.UI.DiffDialog.html#DiffDialog" />
       <keyword name="DiffDialog (Constructor)" id="DiffDialog (Constructor)" ref="eric6.UI.DiffDialog.html#DiffDialog.__init__" />
       <keyword name="DiffDialog (Module)" id="DiffDialog (Module)" ref="eric6.UI.DiffDialog.html" />
@@ -4185,11 +4196,13 @@
       <keyword name="E5GenericDiffHighlighter" id="E5GenericDiffHighlighter" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter" />
       <keyword name="E5GenericDiffHighlighter (Constructor)" id="E5GenericDiffHighlighter (Constructor)" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.__init__" />
       <keyword name="E5GenericDiffHighlighter (Module)" id="E5GenericDiffHighlighter (Module)" ref="eric6.E5Gui.E5GenericDiffHighlighter.html" />
+      <keyword name="E5GenericDiffHighlighter.__initColours" id="E5GenericDiffHighlighter.__initColours" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.__initColours" />
       <keyword name="E5GenericDiffHighlighter.createRules" id="E5GenericDiffHighlighter.createRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.createRules" />
       <keyword name="E5GenericDiffHighlighter.formats" id="E5GenericDiffHighlighter.formats" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.formats" />
       <keyword name="E5GenericDiffHighlighter.generateRules" id="E5GenericDiffHighlighter.generateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.generateRules" />
       <keyword name="E5GenericDiffHighlighter.highlightBlock" id="E5GenericDiffHighlighter.highlightBlock" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.highlightBlock" />
       <keyword name="E5GenericDiffHighlighter.makeFormat" id="E5GenericDiffHighlighter.makeFormat" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.makeFormat" />
+      <keyword name="E5GenericDiffHighlighter.regenerateRules" id="E5GenericDiffHighlighter.regenerateRules" ref="eric6.E5Gui.E5GenericDiffHighlighter.html#E5GenericDiffHighlighter.regenerateRules" />
       <keyword name="E5Graphics (Package)" id="E5Graphics (Package)" ref="index-eric6.E5Graphics.html" />
       <keyword name="E5GraphicsView" id="E5GraphicsView" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView" />
       <keyword name="E5GraphicsView (Constructor)" id="E5GraphicsView (Constructor)" ref="eric6.E5Graphics.E5GraphicsView.html#E5GraphicsView.__init__" />
@@ -16520,6 +16533,7 @@
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html#create" />
+      <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#create" />
@@ -16730,6 +16744,7 @@
       <keyword name="getDebugger" id="getDebugger" ref="eric6.Preferences.__init__.html#getDebugger" />
       <keyword name="getDefaultLexerAssociations" id="getDefaultLexerAssociations" ref="eric6.QScintilla.Lexers.__init__.html#getDefaultLexerAssociations" />
       <keyword name="getDefaults" id="getDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html#getDefaults" />
+      <keyword name="getDiffColour" id="getDiffColour" ref="eric6.Preferences.__init__.html#getDiffColour" />
       <keyword name="getDirs" id="getDirs" ref="eric6.Utilities.__init__.html#getDirs" />
       <keyword name="getEditor" id="getEditor" ref="eric6.Preferences.__init__.html#getEditor" />
       <keyword name="getEditorAPI" id="getEditorAPI" ref="eric6.Preferences.__init__.html#getEditorAPI" />
@@ -17090,6 +17105,7 @@
       <keyword name="setCorba" id="setCorba" ref="eric6.Preferences.__init__.html#setCorba" />
       <keyword name="setCss" id="setCss" ref="eric6.WebBrowser.Tools.Scripts.html#setCss" />
       <keyword name="setDebugger" id="setDebugger" ref="eric6.Preferences.__init__.html#setDebugger" />
+      <keyword name="setDiffColour" id="setDiffColour" ref="eric6.Preferences.__init__.html#setDiffColour" />
       <keyword name="setEditor" id="setEditor" ref="eric6.Preferences.__init__.html#setEditor" />
       <keyword name="setEditorAPI" id="setEditorAPI" ref="eric6.Preferences.__init__.html#setEditorAPI" />
       <keyword name="setEditorColour" id="setEditorColour" ref="eric6.Preferences.__init__.html#setEditorColour" />
@@ -17813,6 +17829,7 @@
       <file>eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.DebuggerPython3Page.html</file>
       <file>eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html</file>
+      <file>eric6.Preferences.ConfigurationPages.DiffColoursPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAPIsPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAutocompletionPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html</file>
--- a/Documentation/Source/eric6.E5Gui.E5GenericDiffHighlighter.html	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Source/eric6.E5Gui.E5GenericDiffHighlighter.html	Sat Jun 24 12:15:03 2017 +0200
@@ -63,6 +63,9 @@
 <td><a href="#E5GenericDiffHighlighter.__init__">E5GenericDiffHighlighter</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#E5GenericDiffHighlighter.__initColours">__initColours</a></td>
+<td>Private method to initialize the highlighter colours.</td>
+</tr><tr>
 <td><a href="#E5GenericDiffHighlighter.createRules">createRules</a></td>
 <td>Public method to create the highlighting rules.</td>
 </tr><tr>
@@ -77,6 +80,9 @@
 </tr><tr>
 <td><a href="#E5GenericDiffHighlighter.makeFormat">makeFormat</a></td>
 <td>Public method to generate a format definition.</td>
+</tr><tr>
+<td><a href="#E5GenericDiffHighlighter.regenerateRules">regenerateRules</a></td>
+<td>Public method to initialize or regenerate the syntax highlighter rules.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -93,7 +99,12 @@
 <dd>
 reference to the text document (QTextDocument)
 </dd>
-</dl><a NAME="E5GenericDiffHighlighter.createRules" ID="E5GenericDiffHighlighter.createRules"></a>
+</dl><a NAME="E5GenericDiffHighlighter.__initColours" ID="E5GenericDiffHighlighter.__initColours"></a>
+<h4>E5GenericDiffHighlighter.__initColours</h4>
+<b>__initColours</b>(<i></i>)
+<p>
+        Private method to initialize the highlighter colours.
+</p><a NAME="E5GenericDiffHighlighter.createRules" ID="E5GenericDiffHighlighter.createRules"></a>
 <h4>E5GenericDiffHighlighter.createRules</h4>
 <b>createRules</b>(<i>*rules</i>)
 <p>
@@ -160,7 +171,12 @@
 <dd>
 format definiton (QTextCharFormat)
 </dd>
-</dl>
+</dl><a NAME="E5GenericDiffHighlighter.regenerateRules" ID="E5GenericDiffHighlighter.regenerateRules"></a>
+<h4>E5GenericDiffHighlighter.regenerateRules</h4>
+<b>regenerateRules</b>(<i></i>)
+<p>
+        Public method to initialize or regenerate the syntax highlighter rules.
+</p>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
 <a NAME="TERMINAL" ID="TERMINAL"></a>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.DiffColoursPage.html	Sat Jun 24 12:15:03 2017 +0200
@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Preferences.ConfigurationPages.DiffColoursPage</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Preferences.ConfigurationPages.DiffColoursPage</h1>
+<p>
+Module implementing the Diff colours configuration page.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#DiffColoursPage">DiffColoursPage</a></td>
+<td>Class implementing the Diff colours configuration page.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#create">create</a></td>
+<td>Module function to create the configuration page.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="DiffColoursPage" ID="DiffColoursPage"></a>
+<h2>DiffColoursPage</h2>
+<p>
+    Class implementing the Diff colours configuration page.
+</p>
+<h3>Derived from</h3>
+ConfigurationPageBase, Ui_DiffColoursPage
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#DiffColoursPage.__init__">DiffColoursPage</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#DiffColoursPage.__initColour">__initColour</a></td>
+<td>Private method to initialize a colour selection button.</td>
+</tr><tr>
+<td><a href="#DiffColoursPage.__selectBackgroundColour">__selectBackgroundColour</a></td>
+<td>Private slot to select a background colour.</td>
+</tr><tr>
+<td><a href="#DiffColoursPage.__selectTextColour">__selectTextColour</a></td>
+<td>Private slot to select the text colour.</td>
+</tr><tr>
+<td><a href="#DiffColoursPage.__updateSampleBackgroundColour">__updateSampleBackgroundColour</a></td>
+<td>Private slot to update the background colour of a sample.</td>
+</tr><tr>
+<td><a href="#DiffColoursPage.__updateSampleTextColour">__updateSampleTextColour</a></td>
+<td>Private slot to update the text colour of all samples.</td>
+</tr><tr>
+<td><a href="#DiffColoursPage.save">save</a></td>
+<td>Public slot to save the Diff colours configuration.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="DiffColoursPage.__init__" ID="DiffColoursPage.__init__"></a>
+<h4>DiffColoursPage (Constructor)</h4>
+<b>DiffColoursPage</b>(<i></i>)
+<p>
+        Constructor
+</p><a NAME="DiffColoursPage.__initColour" ID="DiffColoursPage.__initColour"></a>
+<h4>DiffColoursPage.__initColour</h4>
+<b>__initColour</b>(<i>colourKey, button, initSlot, selectSlot, sampleWidget</i>)
+<p>
+        Private method to initialize a colour selection button.
+</p><dl>
+<dt><i>colourKey</i> (str)</dt>
+<dd>
+key of the diff colour
+</dd><dt><i>button</i> (QPushButton)</dt>
+<dd>
+reference to the button
+</dd><dt><i>initSlot</i> (func)</dt>
+<dd>
+slot to be called to initialize the sample
+</dd><dt><i>selectSlot</i> (func)</dt>
+<dd>
+slot to be called to select the colour
+</dd><dt><i>sampleWidget</i> (QLineEdit)</dt>
+<dd>
+reference to the sample widget
+</dd>
+</dl><a NAME="DiffColoursPage.__selectBackgroundColour" ID="DiffColoursPage.__selectBackgroundColour"></a>
+<h4>DiffColoursPage.__selectBackgroundColour</h4>
+<b>__selectBackgroundColour</b>(<i></i>)
+<p>
+        Private slot to select a background colour.
+</p><a NAME="DiffColoursPage.__selectTextColour" ID="DiffColoursPage.__selectTextColour"></a>
+<h4>DiffColoursPage.__selectTextColour</h4>
+<b>__selectTextColour</b>(<i></i>)
+<p>
+        Private slot to select the text colour.
+</p><a NAME="DiffColoursPage.__updateSampleBackgroundColour" ID="DiffColoursPage.__updateSampleBackgroundColour"></a>
+<h4>DiffColoursPage.__updateSampleBackgroundColour</h4>
+<b>__updateSampleBackgroundColour</b>(<i>colourKey</i>)
+<p>
+        Private slot to update the background colour of a sample.
+</p><dl>
+<dt><i>colourKey</i> (str)</dt>
+<dd>
+key of the diff colour
+</dd>
+</dl><a NAME="DiffColoursPage.__updateSampleTextColour" ID="DiffColoursPage.__updateSampleTextColour"></a>
+<h4>DiffColoursPage.__updateSampleTextColour</h4>
+<b>__updateSampleTextColour</b>(<i>colourKey</i>)
+<p>
+        Private slot to update the text colour of all samples.
+</p><dl>
+<dt><i>colourKey</i> (str)</dt>
+<dd>
+key of the diff colour
+</dd>
+</dl><a NAME="DiffColoursPage.save" ID="DiffColoursPage.save"></a>
+<h4>DiffColoursPage.save</h4>
+<b>save</b>(<i></i>)
+<p>
+        Public slot to save the Diff colours configuration.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="create" ID="create"></a>
+<h2>create</h2>
+<b>create</b>(<i>dlg</i>)
+<p>
+    Module function to create the configuration page.
+</p><dl>
+<dt><i>dlg</i></dt>
+<dd>
+reference to the configuration dialog
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+reference to the instantiated page (ConfigurationPageBase)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Preferences.__init__.html	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Source/eric6.Preferences.__init__.html	Sat Jun 24 12:15:03 2017 +0200
@@ -61,6 +61,9 @@
 <td><a href="#getDebugger">getDebugger</a></td>
 <td>Module function to retrieve the debugger settings.</td>
 </tr><tr>
+<td><a href="#getDiffColour">getDiffColour</a></td>
+<td>Module function to retrieve the colours for the diff highlighter.</td>
+</tr><tr>
 <td><a href="#getEditor">getEditor</a></td>
 <td>Module function to retrieve the various editor settings.</td>
 </tr><tr>
@@ -220,6 +223,9 @@
 <td><a href="#setDebugger">setDebugger</a></td>
 <td>Module function to store the debugger settings.</td>
 </tr><tr>
+<td><a href="#setDiffColour">setDiffColour</a></td>
+<td>Module function to store the diff highlighter colours.</td>
+</tr><tr>
 <td><a href="#setEditor">setEditor</a></td>
 <td>Module function to store the various editor settings.</td>
 </tr><tr>
@@ -363,7 +369,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>hexEditorDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>pyflakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>webBrowserDefaults</td></tr><tr><td>webEngineSettingsIntitialized</td></tr><tr><td>webSettingsIntitialized</td></tr>
+<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>diffColourDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>hexEditorDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>pyflakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>webBrowserDefaults</td></tr><tr><td>webEngineSettingsIntitialized</td></tr><tr><td>webSettingsIntitialized</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -491,6 +497,27 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="getDiffColour" ID="getDiffColour"></a>
+<h2>getDiffColour</h2>
+<b>getDiffColour</b>(<i>key, prefClass=Prefs</i>)
+<p>
+    Module function to retrieve the colours for the diff highlighter.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+the key of the value to get
+</dd><dt><i>prefClass</i></dt>
+<dd>
+preferences class used as the storage area
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+the requested editor colour
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="getEditor" ID="getEditor"></a>
 <h2>getEditor</h2>
 <b>getEditor</b>(<i>key, prefClass=Prefs</i>)
@@ -1528,6 +1555,25 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="setDiffColour" ID="setDiffColour"></a>
+<h2>setDiffColour</h2>
+<b>setDiffColour</b>(<i>key, value, prefClass=Prefs</i>)
+<p>
+    Module function to store the diff highlighter colours.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+the key of the colour to be set
+</dd><dt><i>value</i></dt>
+<dd>
+the colour to be set
+</dd><dt><i>prefClass</i></dt>
+<dd>
+preferences class used as the storage area
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="setEditor" ID="setEditor"></a>
 <h2>setEditor</h2>
 <b>setEditor</b>(<i>key, value, prefClass=Prefs</i>)
--- a/Documentation/Source/eric6.UI.CompareDialog.html	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Source/eric6.UI.CompareDialog.html	Sat Jun 24 12:15:03 2017 +0200
@@ -80,6 +80,9 @@
 <td><a href="#CompareDialog.__fileChanged">__fileChanged</a></td>
 <td>Private slot to enable/disable the Compare button.</td>
 </tr><tr>
+<td><a href="#CompareDialog.__generateFormats">__generateFormats</a></td>
+<td>Private method to generate the various text formats.</td>
+</tr><tr>
 <td><a href="#CompareDialog.__moveTextToCurrentDiffPos">__moveTextToCurrentDiffPos</a></td>
 <td>Private slot to move the text display to the current diff position.</td>
 </tr><tr>
@@ -172,6 +175,11 @@
 <b>__fileChanged</b>(<i></i>)
 <p>
         Private slot to enable/disable the Compare button.
+</p><a NAME="CompareDialog.__generateFormats" ID="CompareDialog.__generateFormats"></a>
+<h4>CompareDialog.__generateFormats</h4>
+<b>__generateFormats</b>(<i></i>)
+<p>
+        Private method to generate the various text formats.
 </p><a NAME="CompareDialog.__moveTextToCurrentDiffPos" ID="CompareDialog.__moveTextToCurrentDiffPos"></a>
 <h4>CompareDialog.__moveTextToCurrentDiffPos</h4>
 <b>__moveTextToCurrentDiffPos</b>(<i></i>)
--- a/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Fri Jun 23 18:46:40 2017 +0200
+++ b/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Sat Jun 24 12:15:03 2017 +0200
@@ -49,6 +49,9 @@
 <td><a href="eric6.Preferences.ConfigurationPages.DebuggerPythonPage.html">DebuggerPythonPage</a></td>
 <td>Module implementing the Debugger Python configuration page.</td>
 </tr><tr>
+<td><a href="eric6.Preferences.ConfigurationPages.DiffColoursPage.html">DiffColoursPage</a></td>
+<td>Module implementing the Diff colours configuration page.</td>
+</tr><tr>
 <td><a href="eric6.Preferences.ConfigurationPages.EditorAPIsPage.html">EditorAPIsPage</a></td>
 <td>Module implementing the Editor APIs configuration page.</td>
 </tr><tr>
--- a/E5Gui/E5GenericDiffHighlighter.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/E5Gui/E5GenericDiffHighlighter.py	Sat Jun 24 12:15:03 2017 +0200
@@ -11,7 +11,7 @@
 
 import re
 
-from PyQt5.QtGui import QSyntaxHighlighter, QColor, QTextCharFormat, QFont
+from PyQt5.QtGui import QSyntaxHighlighter, QTextCharFormat, QFont
 
 import Preferences
 
@@ -41,26 +41,19 @@
         """
         super(E5GenericDiffHighlighter, self).__init__(doc)
         
-        self.textColor = QColor(0, 0, 0)
-        self.addedColor = QColor(190, 237, 190)
-        self.removedColor = QColor(237, 190, 190)
-        self.replacedColor = QColor(190, 190, 237)
-        self.contextColor = QColor(255, 220, 168)
-        self.headerColor = QColor(237, 237, 190)
-        
-        self.normalFormat = self.makeFormat()
-        
-        self._rules = []
-        self.generateRules()
+        self.regenerateRules()
     
-    def generateRules(self):
+    def __initColours(self):
+        """
+        Private method to initialize the highlighter colours.
         """
-        Public method to generate the rule set.
-        
-        Note: This method must me implemented by derived syntax
-        highlighters.
-        """
-        pass
+        self.textColor = Preferences.getDiffColour("TextColor")
+        self.addedColor = Preferences.getDiffColour("AddedColor")
+        self.removedColor = Preferences.getDiffColour("RemovedColor")
+        self.replacedColor = Preferences.getDiffColour("ReplacedColor")
+        self.contextColor = Preferences.getDiffColour("ContextColor")
+        self.headerColor = Preferences.getDiffColour("HeaderColor")
+        self.whitespaceColor = Preferences.getDiffColour("BadWhitespaceColor")
     
     def createRules(self, *rules):
         """
@@ -159,3 +152,23 @@
                     self.setFormat(start, start + length,
                                    formatStr[groupIndex])
                 start += length
+    
+    def regenerateRules(self):
+        """
+        Public method to initialize or regenerate the syntax highlighter rules.
+        """
+        self.normalFormat = self.makeFormat()
+        
+        self.__initColours()
+        
+        self._rules = []
+        self.generateRules()
+    
+    def generateRules(self):
+        """
+        Public method to generate the rule set.
+        
+        Note: This method must me implemented by derived syntax
+        highlighters.
+        """
+        pass
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -92,6 +92,7 @@
         
         self.contents.clear()
         self.filesCombo.clear()
+        self.highlighter.regenerateRules()
         
         if qdiff:
             self.setWindowTitle(self.tr("Patch Contents"))
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -2553,6 +2553,7 @@
         self.diffEdit.setPlainText(self.tr("Generating differences ..."))
         self.diffLabel.setText(self.tr("Differences"))
         self.diffSelectLabel.clear()
+        self.diffHighlighter.regenerateRules()
         
         selectedItems = self.logTree.selectedItems()
         if len(selectedItems) == 1:
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -904,6 +904,7 @@
         Private slot to generate diff outputs for the selected item.
         """
         self.diffEdit.clear()
+        self.diffHighlighter.regenerateRules()
         
         if not self.__mq:
             selectedItems = self.statusList.selectedItems()
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -146,6 +146,7 @@
         self.filename = fn
         
         self.contents.clear()
+        self.highlighter.regenerateRules()
         self.paras = 0
         
         self.filesCombo.clear()
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -118,6 +118,7 @@
         self.process.kill()
         
         self.contents.clear()
+        self.highlighter.regenerateRules()
         self.paras = 0
         
         self.filesCombo.clear()
--- a/Preferences/ConfigurationDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Preferences/ConfigurationDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -140,6 +140,9 @@
                 "corbaPage":
                 [self.tr("CORBA"), "preferences-orbit.png",
                  "CorbaPage", None, None],
+                "diffPage":
+                [self.tr("Diff"), "diffFiles.png",
+                 "DiffColoursPage", None, None],
                 "emailPage":
                 [self.tr("Email"), "preferences-mail_generic.png",
                  "EmailPage", None, None],
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Preferences/ConfigurationPages/DiffColoursPage.py	Sat Jun 24 12:15:03 2017 +0200
@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing the Diff colours configuration page.
+"""
+
+from __future__ import unicode_literals
+
+from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtGui import QPalette
+from PyQt5.QtWidgets import QColorDialog
+
+from .ConfigurationPageBase import ConfigurationPageBase
+from .Ui_DiffColoursPage import Ui_DiffColoursPage
+
+import Preferences
+
+
+class DiffColoursPage(ConfigurationPageBase, Ui_DiffColoursPage):
+    """
+    Class implementing the Diff colours configuration page.
+    """
+    def __init__(self):
+        """
+        Constructor
+        """
+        super(DiffColoursPage, self).__init__()
+        self.setupUi(self)
+        self.setObjectName("DiffColoursPage")
+        
+        self.__coloursDict = {}
+        
+        monospacedFont = Preferences.getEditorOtherFonts("MonospacedFont")
+        self.__allSamples = (
+            self.textSample, self.addedSample, self.removedSample,
+            self.replacedSample, self.contextSample, self.headerSample,
+            self.whitespaceSample)
+        for sample in self.__allSamples:
+            sample.setFont(monospacedFont)
+        
+        # set initial values
+        self.__initColour("TextColor", self.textButton,
+                          self.__updateSampleTextColour,
+                          self.__selectTextColour, self.textSample)
+        self.__initColour("AddedColor", self.addedButton,
+                          self.__updateSampleBackgroundColour,
+                          self.__selectBackgroundColour, self.addedSample)
+        self.__initColour("RemovedColor", self.removedButton,
+                          self.__updateSampleBackgroundColour,
+                          self.__selectBackgroundColour, self.removedSample)
+        self.__initColour("ReplacedColor", self.replacedButton,
+                          self.__updateSampleBackgroundColour,
+                          self.__selectBackgroundColour, self.replacedSample)
+        self.__initColour("ContextColor", self.contextButton,
+                          self.__updateSampleBackgroundColour,
+                          self.__selectBackgroundColour, self.contextSample)
+        self.__initColour("HeaderColor", self.headerButton,
+                          self.__updateSampleBackgroundColour,
+                          self.__selectBackgroundColour, self.headerSample)
+        self.__initColour("BadWhitespaceColor", self.whitespaceButton,
+                          self.__updateSampleBackgroundColour,
+                          self.__selectBackgroundColour, self.whitespaceSample)
+    
+    def save(self):
+        """
+        Public slot to save the Diff colours configuration.
+        """
+        for key in self.__coloursDict:
+            Preferences.setDiffColour(key, self.__coloursDict[key][0])
+    
+    def __initColour(self, colourKey, button, initSlot, selectSlot,
+                     sampleWidget):
+        """
+        Private method to initialize a colour selection button.
+        
+        @param colourKey key of the diff colour
+        @type str
+        @param button reference to the button
+        @type QPushButton
+        @param initSlot slot to be called to initialize the sample
+        @type func
+        @param selectSlot slot to be called to select the colour
+        @type func
+        @param sampleWidget reference to the sample widget
+        @type QLineEdit
+        """
+        colour = Preferences.getDiffColour(colourKey)
+        button.setProperty("colorKey", colourKey)
+        button.clicked.connect(selectSlot)
+        self.__coloursDict[colourKey] = [colour, sampleWidget]
+        if initSlot:
+            initSlot(colourKey)
+    
+    @pyqtSlot()
+    def __selectTextColour(self):
+        """
+        Private slot to select the text colour.
+        """
+        button = self.sender()
+        colorKey = button.property("colorKey")
+        
+        colour = QColorDialog.getColor(self.__coloursDict[colorKey][0], self)
+        if colour.isValid():
+            self.__coloursDict[colorKey][0] = colour
+            self.__updateSampleTextColour(colorKey)
+    
+    @pyqtSlot()
+    def __selectBackgroundColour(self):
+        """
+        Private slot to select a background colour.
+        """
+        button = self.sender()
+        colorKey = button.property("colorKey")
+        
+        colour = QColorDialog.getColor(self.__coloursDict[colorKey][0], self,
+                                       "", QColorDialog.ShowAlphaChannel)
+        if colour.isValid():
+            self.__coloursDict[colorKey][0] = colour
+            self.__updateSampleBackgroundColour(colorKey)
+    
+    @pyqtSlot()
+    def __updateSampleTextColour(self, colourKey):
+        """
+        Private slot to update the text colour of all samples.
+        
+        @param colourKey key of the diff colour
+        @type str
+        """
+        colour = self.__coloursDict[colourKey][0]
+        for sample in self.__allSamples:
+            pl = sample.palette()
+            pl.setColor(QPalette.Text, colour)
+            sample.setPalette(pl)
+            sample.repaint()
+    
+    def __updateSampleBackgroundColour(self, colourKey):
+        """
+        Private slot to update the background colour of a sample.
+        
+        @param colourKey key of the diff colour
+        @type str
+        """
+        sample = self.__coloursDict[colourKey][1]
+        if sample:
+            colour = self.__coloursDict[colourKey][0]
+            pl = sample.palette()
+            pl.setColor(QPalette.Base, colour)
+            sample.setPalette(pl)
+            sample.repaint()
+
+
+def create(dlg):
+    """
+    Module function to create the configuration page.
+    
+    @param dlg reference to the configuration dialog
+    @return reference to the instantiated page (ConfigurationPageBase)
+    """
+    page = DiffColoursPage()
+    return page
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Preferences/ConfigurationPages/DiffColoursPage.ui	Sat Jun 24 12:15:03 2017 +0200
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DiffColoursPage</class>
+ <widget class="QWidget" name="DiffColoursPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="headerLabel">
+     <property name="text">
+      <string>&lt;b&gt;Configure Diff colours&lt;/b&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line1">
+     <property name="frameShape">
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="5" column="0">
+      <widget class="QPushButton" name="headerButton">
+       <property name="toolTip">
+        <string>Select the background colour for header lines</string>
+       </property>
+       <property name="text">
+        <string>Header Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="headerSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Header Line</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QPushButton" name="whitespaceButton">
+       <property name="toolTip">
+        <string>Select the background colour for bad whitespace</string>
+       </property>
+       <property name="text">
+        <string>Whitespace Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="whitespaceSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QPushButton" name="textButton">
+       <property name="toolTip">
+        <string>Select the text foreground colour</string>
+       </property>
+       <property name="text">
+        <string>Text Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="textSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Normal Text</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QPushButton" name="addedButton">
+       <property name="toolTip">
+        <string>Select the background colour for additions</string>
+       </property>
+       <property name="text">
+        <string>Added Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="addedSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Added Text</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QPushButton" name="removedButton">
+       <property name="toolTip">
+        <string>Select the background colour for removed text</string>
+       </property>
+       <property name="text">
+        <string>Removed Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="removedSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Removed Text</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QPushButton" name="replacedButton">
+       <property name="toolTip">
+        <string>Select the background colour for replaced text</string>
+       </property>
+       <property name="text">
+        <string>Replaced Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="replacedSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Replaced Text</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QPushButton" name="contextButton">
+       <property name="toolTip">
+        <string>Select the background colour for context lines</string>
+       </property>
+       <property name="text">
+        <string>Context Colour</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="contextSample">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>Context Line</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignHCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>46</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
--- a/Preferences/__init__.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/Preferences/__init__.py	Sat Jun 24 12:15:03 2017 +0200
@@ -1415,6 +1415,17 @@
         hexEditorDefaults["Font"] = "Courier,10,-1,5,50,0,0,0,0,0"
     else:
         hexEditorDefaults["Font"] = "Monospace,10,-1,5,50,0,0,0,0,0"
+    
+    # defaults for Diff colors
+    diffColourDefaults = {
+        "TextColor": QColor(0, 0, 0),
+        "AddedColor": QColor(190, 237, 190),
+        "RemovedColor": QColor(237, 190, 190),
+        "ReplacedColor": QColor(190, 190, 237),
+        "ContextColor": QColor(255, 220, 168),
+        "HeaderColor": QColor(237, 237, 190),
+        "BadWhitespaceColor": QColor(255, 0, 0, 192),
+    }
 
 
 def readToolGroups(prefClass=Prefs):
@@ -3452,6 +3463,40 @@
         prefClass.settings.setValue("HexEditor/" + key, value.toString())
     else:
         prefClass.settings.setValue("HexEditor/" + key, value)
+    
+
+def getDiffColour(key, prefClass=Prefs):
+    """
+    Module function to retrieve the colours for the diff highlighter.
+    
+    @param key the key of the value to get
+    @param prefClass preferences class used as the storage area
+    @return the requested editor colour
+    """
+    col = prefClass.settings.value("Diff/" + key)
+    if col is not None:
+        if len(col) == 9:
+            # color string with alpha
+            return QColor.fromRgba(int(col[1:], 16))
+        else:
+            return QColor(col)
+    else:
+        return prefClass.diffColourDefaults[key]
+    
+
+def setDiffColour(key, value, prefClass=Prefs):
+    """
+    Module function to store the diff highlighter colours.
+    
+    @param key the key of the colour to be set
+    @param value the colour to be set
+    @param prefClass preferences class used as the storage area
+    """
+    if value.alpha() < 255:
+        val = "#{0:8x}".format(value.rgba())
+    else:
+        val = value.name()
+    prefClass.settings.setValue("Diff/" + key, val)
 
 
 def getGeometry(key, prefClass=Prefs):
--- a/UI/CompareDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/UI/CompareDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -18,7 +18,7 @@
 from difflib import _mdiff, IS_CHARACTER_JUNK
 
 from PyQt5.QtCore import QTimer, QEvent, pyqtSlot
-from PyQt5.QtGui import QColor, QFontMetrics, QBrush, QTextCursor
+from PyQt5.QtGui import QFontMetrics, QBrush, QTextCursor
 from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox
 
 from E5Gui import E5MessageBox
@@ -133,20 +133,7 @@
         
         self.on_synchronizeCheckBox_toggled(True)
         
-        font = Preferences.getEditorOtherFonts("MonospacedFont")
-        self.contents_1.setFontFamily(font.family())
-        self.contents_1.setFontPointSize(font.pointSize())
-        self.contents_2.setFontFamily(font.family())
-        self.contents_2.setFontPointSize(font.pointSize())
-        self.fontHeight = QFontMetrics(self.contents_1.currentFont()).height()
-        
-        self.cNormalFormat = self.contents_1.currentCharFormat()
-        self.cInsertedFormat = self.contents_1.currentCharFormat()
-        self.cInsertedFormat.setBackground(QBrush(QColor(190, 237, 190)))
-        self.cDeletedFormat = self.contents_1.currentCharFormat()
-        self.cDeletedFormat.setBackground(QBrush(QColor(237, 190, 190)))
-        self.cReplacedFormat = self.contents_1.currentCharFormat()
-        self.cReplacedFormat.setBackground(QBrush(QColor(190, 190, 237)))
+        self.__generateFormats()
         
         # connect some of our widgets explicitly
         self.file1Picker.textChanged.connect(self.__fileChanged)
@@ -171,7 +158,29 @@
         else:
             self.file1Label.hide()
             self.file2Label.hide()
-
+    
+    def __generateFormats(self):
+        """
+        Private method to generate the various text formats.
+        """
+        font = Preferences.getEditorOtherFonts("MonospacedFont")
+        self.contents_1.setFontFamily(font.family())
+        self.contents_1.setFontPointSize(font.pointSize())
+        self.contents_2.setFontFamily(font.family())
+        self.contents_2.setFontPointSize(font.pointSize())
+        self.fontHeight = QFontMetrics(self.contents_1.currentFont()).height()
+        
+        self.cNormalFormat = self.contents_1.currentCharFormat()
+        self.cInsertedFormat = self.contents_1.currentCharFormat()
+        self.cInsertedFormat.setBackground(
+            QBrush(Preferences.getDiffColour("AddedColor")))
+        self.cDeletedFormat = self.contents_1.currentCharFormat()
+        self.cDeletedFormat.setBackground(
+            QBrush(Preferences.getDiffColour("RemovedColor")))
+        self.cReplacedFormat = self.contents_1.currentCharFormat()
+        self.cReplacedFormat.setBackground(
+            QBrush(Preferences.getDiffColour("ReplacedColor")))
+    
     def show(self, filename=None):
         """
         Public slot to show the dialog.
@@ -296,6 +305,8 @@
         self.contents_1.clear()
         self.contents_2.clear()
         
+        self.__generateFormats()
+        
         # counters for changes
         added = 0
         deleted = 0
--- a/UI/DiffDialog.py	Fri Jun 23 18:46:40 2017 +0200
+++ b/UI/DiffDialog.py	Sat Jun 24 12:15:03 2017 +0200
@@ -367,6 +367,7 @@
             return
         
         self.contents.clear()
+        self.highlighter.regenerateRules()
         self.saveButton.setEnabled(False)
         
         if self.unifiedRadioButton.isChecked():
--- a/changelog	Fri Jun 23 18:46:40 2017 +0200
+++ b/changelog	Sat Jun 24 12:15:03 2017 +0200
@@ -5,6 +5,8 @@
 - Background Services
   -- added functionality to limit the number of processes used for background
      services
+- Configuration
+  -- made the colors of the diff dialogs configurable
 - Third Party packages
   -- updated chardet to 3.0.4
 
--- a/eric6.e4p	Fri Jun 23 18:46:40 2017 +0200
+++ b/eric6.e4p	Sat Jun 24 12:15:03 2017 +0200
@@ -735,6 +735,7 @@
     <Source>Preferences/ConfigurationPages/DebuggerGeneralPage.py</Source>
     <Source>Preferences/ConfigurationPages/DebuggerPython3Page.py</Source>
     <Source>Preferences/ConfigurationPages/DebuggerPythonPage.py</Source>
+    <Source>Preferences/ConfigurationPages/DiffColoursPage.py</Source>
     <Source>Preferences/ConfigurationPages/EditorAPIsPage.py</Source>
     <Source>Preferences/ConfigurationPages/EditorAutocompletionPage.py</Source>
     <Source>Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py</Source>
@@ -1773,6 +1774,7 @@
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.ui</Form>
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui</Form>
     <Form>Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.ui</Form>
+    <Form>Preferences/ConfigurationPages/DiffColoursPage.ui</Form>
     <Form>Preferences/ConfigurationPages/ApplicationPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CooperationPage.ui</Form>
     <Form>Preferences/ConfigurationPages/CorbaPage.ui</Form>
@@ -1990,14 +1992,14 @@
   <Interfaces/>
   <Others>
     <Other>.hgignore</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
--- a/i18n/eric6_cs.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_cs.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4366,7 +4366,7 @@
         <translation>Stisknout pro provedení porovnání dvou souborů</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Porovnat soubory</translation>
     </message>
@@ -4386,27 +4386,27 @@
         <translation>&amp;Synchronizovat vodorovné posuvníky</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation>Celkem: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Změněno: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Přidáno: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Smazáno: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor &lt;b&gt;{0}&lt;/b&gt; nelze přečíst.&lt;/p&gt;</translation>
     </message>
@@ -4452,62 +4452,62 @@
         <translation>CORBA</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Grafika</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Ikony</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
         <source>Plugin Manager</source>
         <translation>Plugin Manažer</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Tiskárna</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Úlohy</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Úlohy</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Šablony</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Version Control Systems</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
@@ -4517,163 +4517,163 @@
         <translation type="obsolete">Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation>Autodoplňování</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
         <source>Calltips</source>
         <translation>Rychlé tipy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation>Hlavní</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Psaní</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Psaní</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Exportery</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Zvýrazňovače</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Asociace typů souborů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Styly</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Nápověda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Dokumenty nápovědy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Prohlížeče nápovědy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Projekt</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
-        <source>Project Viewer</source>
-        <translation>Prohlížeč projektu</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Projekt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
+        <source>Project Viewer</source>
+        <translation>Prohlížeč projektu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Multiprojekt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Viewmanager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation>Chyba na straně konfigurace</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Manažer souborů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Vyhledávání</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
+        <source>Properties</source>
+        <translation>Nastavení</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
+        <source>Preferences</source>
+        <translation>Předvolby</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
+        <source>Please select an entry of the list 
+to display the configuration page.</source>
+        <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <source>Network</source>
+        <translation>Síť</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
+        <source>Spell checking</source>
+        <translation>Kontrola pravopisu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
+        <source>Python3</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
+        <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Konfigurační stranu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
-        <source>Properties</source>
-        <translation>Nastavení</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
-        <source>Preferences</source>
-        <translation>Předvolby</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
-        <source>Please select an entry of the list 
-to display the configuration page.</source>
-        <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
-        <source>Network</source>
-        <translation>Síť</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
-        <source>Spell checking</source>
-        <translation>Kontrola pravopisu</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
-        <source>Python3</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
-        <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Konfigurační stranu &lt;b&gt;{0}&lt;/b&gt; nelze načíst.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
         <source>Keywords</source>
         <translation>Klíčová slova</translation>
     </message>
@@ -4683,75 +4683,80 @@
         <translation>Spolupráce</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation type="unfinished">Bezpečnost</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation type="unfinished">eric5 web prohlížeč {6 ?}</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation type="unfinished">Prohlížeč logu</translation>
+        <source>IRC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation type="unfinished">eric5 web prohlížeč {6 ?}</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation type="unfinished">Prohlížeč logu</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7309,6 +7314,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7406,7 +7519,7 @@
         <translation>Porovnat soubory</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>Žádné rozdíly nebyly nalezeny.</translation>
     </message>
@@ -24247,52 +24360,52 @@
         <translation type="obsolete">Ty&amp;p heslo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation>Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation>Žádné rozdíly nebyly nalezeny.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation>Uložit Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patch soubory (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Patch soubor &lt;b&gt;{0}&lt;/b&gt; nelze uložit.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25728,37 +25841,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Žádné rozdíly nebyly nalezeny.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation type="unfinished">Uložit Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Patch soubory (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Patch soubor &lt;b&gt;{0}&lt;/b&gt; nelze uložit.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
@@ -40863,27 +40976,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55150,7 +55263,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation></translation>
     </message>
@@ -55210,58 +55323,58 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>Žádné rozdíly nebyly nalezeny.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Uložit Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patch soubory (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation>Zamčené soubory nejsou dostupné/vybrané.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Patch soubor &lt;b&gt;{0}&lt;/b&gt; nelze uložit.&lt;br /&gt;Důvod: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation>Spouštím proces &apos;{0}&apos;...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_de.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4236,12 +4236,12 @@
 <context>
     <name>CompareDialog</name>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Dateien vergleichen</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Datei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
@@ -4306,22 +4306,22 @@
         <translation>Vergleichen</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation>Gesamt: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Geändert: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Hinzugefügt: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Gelöscht: {0}</translation>
     </message>
@@ -4377,224 +4377,224 @@
         <translation>CORBA</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>E-Mail</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Grafiken</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Icons</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
         <source>Plugin Manager</source>
         <translation>Pluginmanager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Drucker</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Aufgaben</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Aufgaben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Vorlagen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Versionskontrollsysteme</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Editor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation>Automatische Vervollständigung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
         <source>Calltips</source>
         <translation>Calltips</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Eingabe</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Eingabe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Exporter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Syntaxhervorhebung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Dateitypzuordnungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Stile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Hilfe Dokumentation</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Hilfeanzeiger</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Projekt</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
-        <source>Project Viewer</source>
-        <translation>Projektanzeige</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Projekt</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
+        <source>Project Viewer</source>
+        <translation>Projektanzeige</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Mehrfachprojekt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Ansichtenmanager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation>Konfigurationsseitenfehler</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Konfigurationsseite &lt;b&gt;{0}&lt;/b&gt; konnte nicht geladen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Dateibehandlung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Erscheinung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation>Wähle einen Listeneintrag aus,
 um die Konfigurationsseite anzuzeigen.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
         <source>Network</source>
         <translation>Netzwerk</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation>Rechtschreibprüfung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
         <source>Python3</source>
         <translation>Python 3</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
         <source>Keywords</source>
         <translation>Schlüsselwörter</translation>
     </message>
@@ -4604,75 +4604,80 @@
         <translation>Zusammenarbeit</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation>Systemstarter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation>VirusTotal-Schnittstelle</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation>Benachrichtigungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation>IRC</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation>Quelltextprüfungen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation>eric6-Webbrowser</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation>Ausgabefenster</translation>
+        <source>IRC</source>
+        <translation>IRC</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation>Quelltextprüfungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation>eric6-Webbrowser</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation>Ausgabefenster</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation>MIME-Typen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation>Suchtext eingeben...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation>Maus Klick Handlers</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation>Flash Cookie Manager</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation>Hex-Editor</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation>Web-Browser</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation>Diff</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7040,6 +7045,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Diff Farben einstellen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation>Wähle die Hintergrundfarbe für Kopfzeilen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation>Kopfzeilenfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation>Kopfzeile</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation>Wähle die Hintergrundfarbe für ungültige Leerzeichen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation>Leerzeichenfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation>Wähle die Textfarbe aus</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation>Textfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation>Normaler Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation>Wähle die Hintergrundfarbe für Ergänzungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation>Ergänzungsfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation>Hinzugefügter Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation>Wähle die Hintergrundfarbe für entfernten Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation>Löschungsfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation>Gelöschter Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation>Wähle die Hintergrundfarbe für geänderten Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation>Änderungsfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation>Geänderter Text</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation>Wähle die Hintergrundfarbe für Kontextzeilen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation>Kontextfarbe</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation>Kontextzeile</translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.py" line="288"/>
@@ -7057,7 +7170,7 @@
         <translation>Dateien vergleichen</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>Es gibt keinen Unterschied.</translation>
     </message>
@@ -23669,52 +23782,52 @@
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation>Es gibt keinen Unterschied.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation>Diff speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patchdateien (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;br&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation>Patchinhalt</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation>&lt;Anfang&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation>&lt;Anfang&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Ende&gt;</translation>
     </message>
@@ -25130,37 +25243,37 @@
         <translation>Unterschiede</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation>Unterschiede zu Vorgänger {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation>Diff zu Vorgänger {0}{1}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation>Es gibt keinen Unterschied.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation>Diff speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patchdateien (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;br&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
@@ -39952,27 +40065,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
@@ -54132,27 +54245,27 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation>Subversion-Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>Es gibt keinen Unterschied.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>Patchdateien (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Diff speichern</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gespeichert werden.&lt;br&gt;Grund: {1}&lt;/p&gt;</translation>
     </message>
@@ -54212,39 +54325,39 @@
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation>Es steht kein temporäres Verzeichnis zur verfügung.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation>Bearbeite Datei „{0}“...
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Patchdatei &lt;b&gt;{0}&lt;/b&gt; existiert bereits. Überschreiben?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation>&lt;Anfang&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation>&lt;Anfang&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Ende&gt;</translation>
     </message>
--- a/i18n/eric6_empty.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_empty.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4262,32 +4262,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4333,296 +4333,301 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
-        <source>Icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
+        <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
+        <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
-        <source>Plugin Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
-        <source>Printer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
-        <source>Python</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
-        <source>Qt</source>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
+        <source>Plugin Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <source>Printer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <source>Python</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
+        <source>Qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
+        <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
-        <source>Python3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
-        <source>Autocompletion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
-        <source>QScintilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
-        <source>Calltips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
+        <source>Python3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <source>Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <source>Autocompletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <source>QScintilla</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <source>Calltips</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
+        <source>Code Checkers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <source>Keywords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
-        <source>Project Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
+        <source>Project Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
         <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -6967,6 +6972,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7079,7 +7192,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23532,52 +23645,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24968,37 +25081,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39746,27 +39859,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53632,7 +53745,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53702,58 +53815,58 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_en.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4264,32 +4264,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4340,296 +4340,301 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
-        <source>Plugin Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
+        <source>Plugin Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
+        <source>Shell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
         <source>Python3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
+        <source>Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <source>QScintilla</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
-        <source>QScintilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
         <source>Calltips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <source>Keywords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
-        <source>Project Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
+        <source>Project Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
+        <source>IRC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -6974,6 +6979,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7081,7 +7194,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23543,52 +23656,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24989,37 +25102,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39785,27 +39898,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53674,7 +53787,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53734,58 +53847,58 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_es.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4291,7 +4291,7 @@
         <translation>Pulse para realizar la comparación de los dos archivos</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Comparar Archivos</translation>
     </message>
@@ -4306,27 +4306,27 @@
         <translation>&amp;Sincronizar barras de desplazamiento horizontales</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation>Total: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Cambiado: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Añadido: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Borrado: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; no se ha podido leer.&lt;/p&gt;</translation>
     </message>
@@ -4372,224 +4372,224 @@
         <translation>CORBA</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>Correo electrónico</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Iconos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
         <source>Plugin Manager</source>
         <translation>Gestor de Plugins</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Impresora</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Tareas</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Tareas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Plantillas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Sistemas de Control de Versiones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Depurador</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Editor</source>
-        <translation>Editor</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
+        <source>Editor</source>
+        <translation>Editor</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
         <source>Calltips</source>
         <translation>Consejos de llamada (calltips)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Tecleo de codigo</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Tecleo de codigo</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Exportadores</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Resaltado de código</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Asociación de tipos de archivo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Estilos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Documentación de Ayuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Visores de Ayuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Proyecto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
-        <source>Project Viewer</source>
-        <translation>Visor de proyecto</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
+        <source>Project Viewer</source>
+        <translation>Visor de proyecto</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Multiproyecto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation>Interfaz de Usuario</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Gestor de vistas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation> Error de Configuración de Página</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Gestión de archivos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Búsquedas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation>Por favor, seleccione una entrada de la lista
 para visualizar la página de configuración.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation>Corrección ortográfica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
         <source>Python3</source>
         <translation>Python3</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La página de configuración  &lt;b&gt;{0}&lt;/b&gt; no puede ser cargada.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
         <source>Keywords</source>
         <translation>Palabras clave</translation>
     </message>
@@ -4599,75 +4599,80 @@
         <translation>Cooperación</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation>Lanzador de bandeja de sistema</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation>Interfaz de VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation>Notificaciones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation>IRC</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation>Comprobadores de Código</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation>Navegador Web de eric6</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation>Visor de Log</translation>
+        <source>IRC</source>
+        <translation>IRC</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation>Comprobadores de Código</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation>Navegador Web de eric6</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation>Visor de Log</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation>Mimetypes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation>Introducir texto de búsqueda...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation>Manejadores de clicks del ratón</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation>Gestor de Cookies de Flash</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation>Editor Hexadecimal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation>Navegador Web</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished">Diff</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7031,6 +7036,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7123,7 +7236,7 @@
         <translation>Comparar Archivos</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>No hay ninguna diferencia.</translation>
     </message>
@@ -23661,52 +23774,52 @@
         <translation>Errores</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation>Error de Generación de Proceso</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation>No hay ninguna diferencia.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation>Guardar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation>Archivos de Parche (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation>Contenido del Patch</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation>&lt;Inicio&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation>&lt;Inicio&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Fin&gt;</translation>
     </message>
@@ -25123,37 +25236,37 @@
         <translation>Diferencias</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation>Diferencias con el Parent {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation>Diff con el Parent {0}{1}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation>No hay ninguna diferencia.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation>Guardar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation>Archivos de Parche (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
@@ -39944,27 +40057,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -54084,7 +54197,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation>Diff de Subversion</translation>
     </message>
@@ -54144,59 +54257,59 @@
         <translation>Alt+M</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Error de Generación de Proceso</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>No hay diferencia.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Guardar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>Archivos de Parche (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation>No hay directorio temporal disponible.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; no puede ser guardado.&lt;br /&gt;Causa: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation>Procesando archivo &apos;{0}&apos;...
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de parche &lt;b&gt;{0}&lt;/b&gt; ya existe. ¿Desea sobreescribirlo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation>&lt;Inicio&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation>&lt;Inicio&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Fin&gt;</translation>
     </message>
--- a/i18n/eric6_fr.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_fr.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4310,7 +4310,7 @@
 <context>
     <name>CompareDialog</name>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Comparaison de fichiers</translation>
     </message>
@@ -4395,27 +4395,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4461,62 +4461,62 @@
         <translation>CORBA</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Graphiques</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Icônes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
         <source>Plugin Manager</source>
         <translation>Gestionnaire de plugins</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Impression</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Tâches</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Tâches</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Gabarits</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Contrôle de versions</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Débogueur</translation>
     </message>
@@ -4526,164 +4526,164 @@
         <translation type="obsolete">Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Editor</source>
         <translation>Éditeur</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation>Autocomplétion</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
         <source>Calltips</source>
         <translation>Calltips</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Autoformat</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Autoformat</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Exportation</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Analyseurs syntaxiques</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Types de fichiers</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Styles</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Sources de documentation</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Visionneurs d&apos;aide</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Projet</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Projet</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
         <source>Project Viewer</source>
         <translation>Gestionnaire de projet</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Multi-projet</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Gestionnaire d&apos;affichage</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation>Erreur de la page de configuration</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Gestion des fichiers</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Recherche</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation>Choisir une entrée dans la liste
 pour afficher la page de configuration.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
         <source>Network</source>
         <translation>Réseau</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation>Correction orthographique</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
         <source>Python3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
         <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4693,75 +4693,80 @@
         <translation type="unfinished">Coopération</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation type="unfinished">Fenêtre de log</translation>
+        <source>IRC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
+        <source>Notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation type="unfinished">Fenêtre de log</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished">Diff</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7293,6 +7298,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.py" line="288"/>
@@ -7310,7 +7423,7 @@
         <translation>Comparaison de fichiers</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>Aucune différence.</translation>
     </message>
@@ -24195,52 +24308,52 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erreur du processus</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Aucune différence.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation type="unfinished">Enregistrer Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Fichiers Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25656,37 +25769,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Aucune différence.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation type="unfinished">Enregistrer Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">Fichiers Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40644,27 +40757,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54943,22 +55056,22 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation>Subversion Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>Aucune différence.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>Fichiers Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Enregistrer Diff</translation>
     </message>
@@ -55018,43 +55131,43 @@
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Erreur du processus</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation>Il n&apos;y a aucun répertoire temporaire disponible.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_it.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4347,7 +4347,7 @@
 <context>
     <name>CompareDialog</name>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Confronta files</translation>
     </message>
@@ -4432,27 +4432,27 @@
         <translation>&amp;Sincronizza barre di scorrimento orizzontali</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation>Totale: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Modificati: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Aggiunti: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Cancellati: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
@@ -4498,62 +4498,62 @@
         <translation>CORBA</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Grafica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Icone</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
         <source>Plugin Manager</source>
         <translation>Gestore plugin</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Stampante</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Task</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Task</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Modello</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Controllo di versione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Debugger</translation>
     </message>
@@ -4563,164 +4563,164 @@
         <translation type="obsolete">Ruby</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
         <source>Editor</source>
         <translation>Editor</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation>Autocompletamento</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
         <source>Calltips</source>
         <translation>Calltips</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Digitazione</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Digitazione</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Esportatori</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Evidenziatori</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Associazione tipi file</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Stili</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Aiuto Documentazione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Aiuto visualizzatori</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Progetto</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Progetto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
         <source>Project Viewer</source>
         <translation>Visualizzatore progetto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Multiprogetto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Gestrore viste</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation>Configurazione pagine errore</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Gestione file</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Ricerca</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Aspetto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
         <source>QScintilla</source>
         <translation>QScintilla</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Stile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation>Selezionare un elemento della lista
 da mostrare nella pagina di configurazione.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
         <source>Network</source>
         <translation>Rete</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation>Correzione automatica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
         <source>Python3</source>
         <translation>Python3</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;La pagina di configurazione &lt;b&gt;{0}&lt;/b&gt; non può essere caricata.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
         <source>Keywords</source>
         <translation>Parole chiave</translation>
     </message>
@@ -4730,17 +4730,17 @@
         <translation>Cooperazione</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation>Tray Starter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation>Interfaccia VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
@@ -4750,60 +4750,65 @@
         <translation type="obsolete">Insirisci il testo del filtro...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation>Notificazioni</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation>IRC</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation>Correttori di codice</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation type="unfinished">Web Browser di eric5 {6 ?}</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation type="unfinished">Log-Viewer</translation>
+        <source>IRC</source>
+        <translation>IRC</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation>Correttori di codice</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation type="unfinished">Web Browser di eric5 {6 ?}</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation type="unfinished">Log-Viewer</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished">Diff</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7395,6 +7400,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.py" line="288"/>
@@ -7412,7 +7525,7 @@
         <translation>Confronta File</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>Non ci sono differenze.</translation>
     </message>
@@ -24431,52 +24544,52 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation>Errore Generazione Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Il processo {0}  non può essere avviato. Assicurarsi che sia nel path.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation>Non ci sono differenze.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation>Salva Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation>File Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file  patch &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25912,37 +26025,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Non ci sono differenze.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation type="unfinished">Salva Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished">File Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file  patch &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -41103,27 +41216,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55444,22 +55557,22 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation>Subversion Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>Non ci sono differenze.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>File Patch (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Salva Diff</translation>
     </message>
@@ -55519,44 +55632,44 @@
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Errore Generazione Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation>Non c&apos;è la directory temporanea disponibile.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Il processo {0}  non può essere avviato. Assicurarsi che sia nel path.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file &lt;b&gt;{0}&lt;/b&gt; non può essere salvato.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation>Processo file &apos;{0}&apos;...
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file  patch &lt;b&gt;{0}&lt;/b&gt; esiste già.Sovrascriverlo ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
-        <source>&lt;Start&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <source>&lt;Start&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_pt.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4434,32 +4434,32 @@
         <translation>Pressionar para executar comparação de dois ficheiros</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Alterado: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Adicionado: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Apagado: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Comparar Ficheiros</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; não se pôde ler.&lt;/p&gt;</translation>
     </message>
@@ -4515,239 +4515,239 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>Correio Eletrónico</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Ícones</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
-        <source>Network</source>
-        <translation>Rede</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
-        <source>Plugin Manager</source>
-        <translation>Gestor de Plugins</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <source>Network</source>
+        <translation>Rede</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
+        <source>Plugin Manager</source>
+        <translation>Gestor de Plugins</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Impressora</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Shell</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Tarefas</translation>
+        <source>Shell</source>
+        <translation>Shell</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Tarefas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Modelos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Sistemas de Control de Versão</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Depurador</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
         <source>Python3</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Editor</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
+        <source>Editor</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
         <source>Autocompletion</source>
         <translation>Autocompletar</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <source>QScintilla</source>
+        <translation></translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
-        <source>QScintilla</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
         <source>Calltips</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Tratamento de Ficheiros</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Pesquisa</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation>Verificação ortográfica</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Digitação</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Digitação</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Exportadores</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Realçadores</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Associações de Tipos de Ficheiros</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Estilos</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
-        <source>Keywords</source>
-        <translation>Palavras Chave</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <source>Keywords</source>
+        <translation>Palavras Chave</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Documentação de Ajuda</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Visores de Ajuda</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Projeto</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Projeto</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
         <source>Project Viewer</source>
         <translation>Visor de Projeto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Multiprojeto</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Gestor de Vista</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation>Por favor selecione uma entrada da lista 
 para mostrar a página de configuração.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation>Erro na Página de Configuração</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A página de configuração &lt;b&gt;{0}&lt;/b&gt; não pôde ser carregada.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation>Iniciador de Bandeja de Sistema</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation>Interface de VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
@@ -4757,60 +4757,65 @@
         <translation type="obsolete">Introduzir texto do filtro...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation>Notificações</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation>Verificadores de Código</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation>Navegador Web de eric6</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation>Visor de Registos</translation>
+        <source>IRC</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation>Verificadores de Código</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation>Navegador Web de eric6</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation>Visor de Registos</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation>Tipos MIME</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished">Diff</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7414,6 +7419,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7526,7 +7639,7 @@
         <translation>&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; não se pôde ler.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>Não há diferenças.</translation>
     </message>
@@ -24426,52 +24539,52 @@
         <translation type="obsolete">Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation>Erro na Criação de Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation>Não há diferenças.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation>Gravar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation>Ficheiros de Remendos (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro de remendo &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever-lo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro remendo &lt;b&gt;{0}&lt;/b&gt; não se pôde gravar.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation>Conteúdo do Remendo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation>&lt;Inicio&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation>&lt;Inicio&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Fim&gt;</translation>
     </message>
@@ -25904,37 +26017,37 @@
         <translation type="unfinished">Diferenças</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation type="unfinished">Não há diferenças.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation type="unfinished">Gravar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;O ficheiro remendo &lt;b&gt;{0}&lt;/b&gt; não se pôde gravar.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
@@ -41238,27 +41351,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -55281,7 +55394,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55341,58 +55454,58 @@
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Erro na Criação de Processo</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>Não há diferenças.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Gravar Diff</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>Ficheiros de Remendos (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O ficheiro de remendo &lt;b&gt;{0}&lt;/b&gt; já existe. Sobreescrever-lo?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;O ficheiro remendo &lt;b&gt;{0}&lt;/b&gt; não se pôde gravar.&lt;br /&gt;Motivo: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation>A processar ficheiro &apos;{0}&apos;...</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
         <source>&lt;Start&gt;</source>
         <translation>&lt;Inicio&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Fim&gt;</translation>
     </message>
--- a/i18n/eric6_ru.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_ru.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4311,32 +4311,32 @@
         <translation>Выполнить сравнение двух файлов</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation>Всего: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Изменено: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Добавлено: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Удалено: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Сравнить файлы</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
@@ -4387,297 +4387,302 @@
         <translation>CORBA</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
         <source>Graphics</source>
         <translation>Графика</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
         <source>Icons</source>
         <translation>Пиктограммы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
-        <source>Network</source>
-        <translation>Сеть</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
-        <source>Plugin Manager</source>
-        <translation>Менеджер плагинов</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+        <source>Network</source>
+        <translation>Сеть</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
+        <source>Plugin Manager</source>
+        <translation>Менеджер плагинов</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
         <source>Printer</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
         <source>Python</source>
         <translation>Python</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
-        <source>Shell</source>
-        <translation>Оболочка</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="191"/>
-        <source>Tasks</source>
-        <translation>Задачи</translation>
+        <source>Shell</source>
+        <translation>Оболочка</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+        <source>Tasks</source>
+        <translation>Задачи</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
         <source>Templates</source>
         <translation>Шаблоны</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
         <source>Version Control Systems</source>
         <translation>Системы контроля версий</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
         <source>Debugger</source>
         <translation>Отладка</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
-        <source>General</source>
-        <translation>Основные параметры</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
-        <source>Python3</source>
-        <translation>Python3</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
-        <source>Editor</source>
-        <translation>Редактор</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
-        <source>APIs</source>
-        <translation>APIs</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
-        <source>Autocompletion</source>
-        <translation>Автодополнение</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
-        <source>QScintilla</source>
-        <translation>QScintilla</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
-        <source>Calltips</source>
-        <translation>Подсказки</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+        <source>General</source>
+        <translation>Основные параметры</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
+        <source>Python3</source>
+        <translation>Python3</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+        <source>Editor</source>
+        <translation>Редактор</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+        <source>APIs</source>
+        <translation>APIs</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+        <source>Autocompletion</source>
+        <translation>Автодополнение</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+        <source>QScintilla</source>
+        <translation>QScintilla</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+        <source>Calltips</source>
+        <translation>Подсказки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
         <source>Filehandling</source>
         <translation>Работа с файлами</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
         <source>Searching</source>
         <translation>Поиск</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
         <source>Spell checking</source>
         <translation>Проверка орфографии</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
-        <source>Typing</source>
-        <translation>Набор текста</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+        <source>Typing</source>
+        <translation>Набор текста</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
         <source>Exporters</source>
         <translation>Экспортёры</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
         <source>Highlighters</source>
         <translation>Подсветка синтаксиса</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
         <source>Filetype Associations</source>
         <translation>Ассоциации типа файлов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
         <source>Styles</source>
         <translation>Стили</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
-        <source>Keywords</source>
-        <translation>Ключевые слова</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+        <source>Keywords</source>
+        <translation>Ключевые слова</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
         <source>Help</source>
         <translation>Справка</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
         <source>Appearance</source>
         <translation>Стили</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
         <source>Help Documentation</source>
         <translation>Справочная документация</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
         <source>Help Viewers</source>
         <translation>Просмотр справки</translation>
     </message>
     <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <source>Project</source>
+        <translation>Проект</translation>
+    </message>
+    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="307"/>
-        <source>Project</source>
-        <translation>Проект</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
         <source>Project Viewer</source>
         <translation>Просмотр проектов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
         <source>Multiproject</source>
         <translation>Мультипроект</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
         <source>Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
         <source>Viewmanager</source>
         <translation>Менеджер видов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
         <source>Preferences</source>
         <translation>Предпочтения</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
         <source>Please select an entry of the list 
 to display the configuration page.</source>
         <translation>Выберите элемент в списке слева,
 чтобы отобразить страницу настройки.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>Configuration Page Error</source>
         <translation>Ошибка страницы конфигурации</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
         <source>&lt;p&gt;The configuration page &lt;b&gt;{0}&lt;/b&gt; could not be loaded.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Страница конфигурации &lt;b&gt;{0}&lt;/b&gt; не может быть загружена.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
         <source>Tray Starter</source>
         <translation>Tray Starter</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
         <source>VirusTotal Interface</source>
         <translation>Интерфейс VirusTotal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
         <source>Notifications</source>
         <translation>Уведомления</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
-        <source>IRC</source>
-        <translation>IRC</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
-        <source>Code Checkers</source>
-        <translation>Проверка кода</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
-        <source>eric6 Web Browser</source>
-        <translation>Eric6 Web браузер</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="159"/>
-        <source>Log-Viewer</source>
-        <translation>Просмотр журнала</translation>
+        <source>IRC</source>
+        <translation>IRC</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+        <source>Code Checkers</source>
+        <translation>Проверка кода</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+        <source>eric6 Web Browser</source>
+        <translation>Eric6 Web браузер</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+        <source>Log-Viewer</source>
+        <translation>Просмотр журнала</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
         <source>Mimetypes</source>
         <translation>Mimetypes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
         <source>Enter search text...</source>
         <translation>Введите искомый текст...</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
         <source>Mouse Click Handlers</source>
         <translation>Обработка кликов мышки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
         <source>Flash Cookie Manager</source>
         <translation>Менеджер флэш-куки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
         <source>Hex Editor</source>
         <translation>Hex-редактор</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+        <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
         <source>Web Browser</source>
         <translation>Web браузер</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+        <source>Diff</source>
+        <translation type="unfinished">Diff</translation>
+    </message>
 </context>
 <context>
     <name>Connection</name>
@@ -7067,6 +7072,114 @@
     </message>
 </context>
 <context>
+    <name>DiffColoursPage</name>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+        <source>&lt;b&gt;Configure Diff colours&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+        <source>Select the background colour for header lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+        <source>Header Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+        <source>Header Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+        <source>Select the background colour for bad whitespace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+        <source>Whitespace Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+        <source>Select the text foreground colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+        <source>Text Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+        <source>Normal Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+        <source>Select the background colour for additions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+        <source>Added Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+        <source>Added Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+        <source>Select the background colour for removed text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+        <source>Removed Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+        <source>Removed Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+        <source>Select the background colour for replaced text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+        <source>Replaced Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+        <source>Replaced Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+        <source>Select the background colour for context lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+        <source>Context Colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+        <source>Context Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DiffDialog</name>
     <message>
         <location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7174,7 +7287,7 @@
         <translation>&lt;p&gt;Невозможно прочитать файл: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/DiffDialog.py" line="447"/>
+        <location filename="../UI/DiffDialog.py" line="448"/>
         <source>There is no difference.</source>
         <translation>Различий нет.</translation>
     </message>
@@ -23724,52 +23837,52 @@
         <translation>Ошибки</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>Process Generation Error</source>
         <translation>Ошибка при запуске процесса</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
         <source>There is no difference.</source>
         <translation>Различий нет.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>Save Diff</source>
         <translation>Сохранить различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
         <source>Patch Files (*.diff)</source>
         <translation>Файлы патчей (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл патч &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить патч в файл &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
         <source>Patch Contents</source>
         <translation>Содержание патча</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
-        <source>&lt;Start&gt;</source>
-        <translation>&lt;Начало&gt;</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+        <source>&lt;Start&gt;</source>
+        <translation>&lt;Начало&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Конец&gt;</translation>
     </message>
@@ -25187,37 +25300,37 @@
         <translation>Различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
         <source>Differences to Parent {0}</source>
         <translation>Различия с предком {0}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
         <source>Diff to Parent {0}{1}</source>
         <translation>Различия с предком {0}{1}</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
         <source>There is no difference.</source>
         <translation>Различий нет.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>Save Diff</source>
         <translation>Сохранить различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
         <source>Patch Files (*.diff)</source>
         <translation>Файлы патчей (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Патч файл &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить патч в файл &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
@@ -40040,27 +40153,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1552"/>
+        <location filename="../Preferences/__init__.py" line="1563"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1580"/>
+        <location filename="../Preferences/__init__.py" line="1591"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1682"/>
+        <location filename="../Preferences/__init__.py" line="1693"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Задайте интерпретатор Python{0}:</translation>
     </message>
@@ -54283,7 +54396,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>Subversion Diff</source>
         <translation>Subversion: Отображение различий</translation>
     </message>
@@ -54343,59 +54456,59 @@
         <translation>Alt+P</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>Process Generation Error</source>
         <translation>Ошибка при запуске процесса</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
         <source>There is no difference.</source>
         <translation>Различий нет.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>Save Diff</source>
         <translation>Сохранить различия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
         <source>Patch Files (*.diff)</source>
         <translation>Файлы патчей (*.diff)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; already exists. Overwrite it?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл патч &lt;b&gt;{0}&lt;/b&gt; уже существует. Переписать?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
         <source>&lt;p&gt;The patch file &lt;b&gt;{0}&lt;/b&gt; could not be saved.&lt;br&gt;Reason: {1}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить патч-файл &lt;b&gt;{0}&lt;/b&gt;:&lt;br&gt;Причина: {1}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
         <source>There is no temporary directory available.</source>
         <translation>Недоступна временная директория.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
         <source>Processing file &apos;{0}&apos;...
 </source>
         <translation>Обработка файла &apos;{0}&apos;...
 </translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
         <source>&lt;Start&gt;</source>
         <translation>&lt;Начало&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
         <source>&lt;End&gt;</source>
         <translation>&lt;Конец&gt;</translation>
     </message>
--- a/i18n/eric6_tr.ts	Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_tr.ts	Sat Jun 24 12:15:03 2017 +0200
@@ -4372,32 +4372,32 @@
         <translation>İki dosya arasındaki karşılaştırmayı başlatmak için basınız</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="358"/>
+        <location filename="../UI/CompareDialog.py" line="369"/>
         <source>Total: {0}</source>
         <translation>Toplam: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="360"/>
+        <location filename="../UI/CompareDialog.py" line="371"/>
         <source>Changed: {0}</source>
         <translation>Değişti: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="361"/>
+        <location filename="../UI/CompareDialog.py" line="372"/>
         <source>Added: {0}</source>
         <translation>Eklendi: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="362"/>
+        <location filename="../UI/CompareDialog.py" line="373"/>
         <source>Deleted: {0}</source>
         <translation>Silindi: {0}</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>Compare Files</source>
         <translation>Dosyaları Karşılaştır</translation>
     </message>
     <message>
-        <location filename="../UI/CompareDialog.py" line="253"/>
+        <location filename="../UI/CompareDialog.py" line="262"/>
         <source>&lt;p&gt;The file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Dosya &lt;b&gt;{0}&lt;/b&gt; okunamıyor.&lt;/p&gt;</translatio