Added support for the new QScintilla JSON lexer.

Sat, 14 Jan 2017 14:12:42 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 14 Jan 2017 14:12:42 +0100
changeset 5420
53ca6ddb4acf
parent 5419
6f7a196d25da
child 5421
ce62341e81b6

Added support for the new QScintilla JSON lexer.

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.QScintilla.Lexers.LexerJSON.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.QScintilla.Lexers.html file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorPropertiesPage.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationPages/EditorPropertiesPage.ui file | annotate | diff | comparison | revisions
Preferences/__init__.py file | annotate | diff | comparison | revisions
QScintilla/Lexers/LexerJSON.py file | annotate | diff | comparison | revisions
QScintilla/Lexers/__init__.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
icons/default/languages/lexerJSON.png file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Thu Jan 12 19:26:13 2017 +0100
+++ b/APIs/Python3/eric6.api	Sat Jan 14 14:12:42 2017 +0100
@@ -7620,6 +7620,12 @@
 eric6.QScintilla.Lexers.LexerIDL.LexerIDL.isStringStyle?4(style)
 eric6.QScintilla.Lexers.LexerIDL.LexerIDL.maximumKeywordSet?4()
 eric6.QScintilla.Lexers.LexerIDL.LexerIDL?1(parent=None)
+eric6.QScintilla.Lexers.LexerJSON.LexerJSON.defaultKeywords?4(kwSet)
+eric6.QScintilla.Lexers.LexerJSON.LexerJSON.initProperties?4()
+eric6.QScintilla.Lexers.LexerJSON.LexerJSON.isCommentStyle?4(style)
+eric6.QScintilla.Lexers.LexerJSON.LexerJSON.isStringStyle?4(style)
+eric6.QScintilla.Lexers.LexerJSON.LexerJSON.maximumKeywordSet?4()
+eric6.QScintilla.Lexers.LexerJSON.LexerJSON?1(parent=None)
 eric6.QScintilla.Lexers.LexerJava.LexerJava.defaultKeywords?4(kwSet)
 eric6.QScintilla.Lexers.LexerJava.LexerJava.initProperties?4()
 eric6.QScintilla.Lexers.LexerJava.LexerJava.isCommentStyle?4(style)
--- a/APIs/Python3/eric6.bas	Thu Jan 12 19:26:13 2017 +0100
+++ b/APIs/Python3/eric6.bas	Sat Jan 14 14:12:42 2017 +0100
@@ -480,6 +480,7 @@
 LexerFortran77 Lexer QsciLexerFortran77
 LexerHTML Lexer QsciLexerHTML
 LexerIDL Lexer QsciLexerIDL
+LexerJSON Lexer QsciLexerJSON
 LexerJava Lexer QsciLexerJava
 LexerJavaScript Lexer QsciLexerJavaScript
 LexerLua Lexer QsciLexerLua
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Thu Jan 12 19:26:13 2017 +0100
+++ b/Documentation/Help/source.qhp	Sat Jan 14 14:12:42 2017 +0100
@@ -901,6 +901,7 @@
               <section title="eric6.QScintilla.Lexers.LexerFortran77" ref="eric6.QScintilla.Lexers.LexerFortran77.html" />
               <section title="eric6.QScintilla.Lexers.LexerHTML" ref="eric6.QScintilla.Lexers.LexerHTML.html" />
               <section title="eric6.QScintilla.Lexers.LexerIDL" ref="eric6.QScintilla.Lexers.LexerIDL.html" />
+              <section title="eric6.QScintilla.Lexers.LexerJSON" ref="eric6.QScintilla.Lexers.LexerJSON.html" />
               <section title="eric6.QScintilla.Lexers.LexerJava" ref="eric6.QScintilla.Lexers.LexerJava.html" />
               <section title="eric6.QScintilla.Lexers.LexerJavaScript" ref="eric6.QScintilla.Lexers.LexerJavaScript.html" />
               <section title="eric6.QScintilla.Lexers.LexerLua" ref="eric6.QScintilla.Lexers.LexerLua.html" />
@@ -9258,6 +9259,14 @@
       <keyword name="LexerIDL.isCommentStyle" id="LexerIDL.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.isCommentStyle" />
       <keyword name="LexerIDL.isStringStyle" id="LexerIDL.isStringStyle" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.isStringStyle" />
       <keyword name="LexerIDL.maximumKeywordSet" id="LexerIDL.maximumKeywordSet" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.maximumKeywordSet" />
+      <keyword name="LexerJSON" id="LexerJSON" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON" />
+      <keyword name="LexerJSON (Constructor)" id="LexerJSON (Constructor)" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.__init__" />
+      <keyword name="LexerJSON (Module)" id="LexerJSON (Module)" ref="eric6.QScintilla.Lexers.LexerJSON.html" />
+      <keyword name="LexerJSON.defaultKeywords" id="LexerJSON.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.defaultKeywords" />
+      <keyword name="LexerJSON.initProperties" id="LexerJSON.initProperties" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.initProperties" />
+      <keyword name="LexerJSON.isCommentStyle" id="LexerJSON.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.isCommentStyle" />
+      <keyword name="LexerJSON.isStringStyle" id="LexerJSON.isStringStyle" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.isStringStyle" />
+      <keyword name="LexerJSON.maximumKeywordSet" id="LexerJSON.maximumKeywordSet" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.maximumKeywordSet" />
       <keyword name="LexerJava" id="LexerJava" ref="eric6.QScintilla.Lexers.LexerJava.html#LexerJava" />
       <keyword name="LexerJava (Constructor)" id="LexerJava (Constructor)" ref="eric6.QScintilla.Lexers.LexerJava.html#LexerJava.__init__" />
       <keyword name="LexerJava (Module)" id="LexerJava (Module)" ref="eric6.QScintilla.Lexers.LexerJava.html" />
@@ -17750,6 +17759,7 @@
       <file>eric6.QScintilla.Lexers.LexerFortran77.html</file>
       <file>eric6.QScintilla.Lexers.LexerHTML.html</file>
       <file>eric6.QScintilla.Lexers.LexerIDL.html</file>
+      <file>eric6.QScintilla.Lexers.LexerJSON.html</file>
       <file>eric6.QScintilla.Lexers.LexerJava.html</file>
       <file>eric6.QScintilla.Lexers.LexerJavaScript.html</file>
       <file>eric6.QScintilla.Lexers.LexerLua.html</file>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerJSON.html	Sat Jan 14 14:12:42 2017 +0100
@@ -0,0 +1,156 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.QScintilla.Lexers.LexerJSON</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.QScintilla.Lexers.LexerJSON</h1>
+<p>
+Module implementing a JSON lexer with some additional methods.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#LexerJSON">LexerJSON</a></td>
+<td>Subclass to implement some additional lexer dependent methods.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="LexerJSON" ID="LexerJSON"></a>
+<h2>LexerJSON</h2>
+<p>
+    Subclass to implement some additional lexer dependent methods.
+</p>
+<h3>Derived from</h3>
+Lexer, QsciLexerJSON
+<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="#LexerJSON.__init__">LexerJSON</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#LexerJSON.defaultKeywords">defaultKeywords</a></td>
+<td>Public method to get the default keywords.</td>
+</tr><tr>
+<td><a href="#LexerJSON.initProperties">initProperties</a></td>
+<td>Public slot to initialize the properties.</td>
+</tr><tr>
+<td><a href="#LexerJSON.isCommentStyle">isCommentStyle</a></td>
+<td>Public method to check, if a style is a comment style.</td>
+</tr><tr>
+<td><a href="#LexerJSON.isStringStyle">isStringStyle</a></td>
+<td>Public method to check, if a style is a string style.</td>
+</tr><tr>
+<td><a href="#LexerJSON.maximumKeywordSet">maximumKeywordSet</a></td>
+<td>Public method to get the maximum keyword set.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="LexerJSON.__init__" ID="LexerJSON.__init__"></a>
+<h4>LexerJSON (Constructor)</h4>
+<b>LexerJSON</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i></dt>
+<dd>
+parent widget of this lexer
+</dd>
+</dl><a NAME="LexerJSON.defaultKeywords" ID="LexerJSON.defaultKeywords"></a>
+<h4>LexerJSON.defaultKeywords</h4>
+<b>defaultKeywords</b>(<i>kwSet</i>)
+<p>
+        Public method to get the default keywords.
+</p><dl>
+<dt><i>kwSet</i></dt>
+<dd>
+number of the keyword set (integer)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+string giving the keywords (string) or None
+</dd>
+</dl><a NAME="LexerJSON.initProperties" ID="LexerJSON.initProperties"></a>
+<h4>LexerJSON.initProperties</h4>
+<b>initProperties</b>(<i></i>)
+<p>
+        Public slot to initialize the properties.
+</p><a NAME="LexerJSON.isCommentStyle" ID="LexerJSON.isCommentStyle"></a>
+<h4>LexerJSON.isCommentStyle</h4>
+<b>isCommentStyle</b>(<i>style</i>)
+<p>
+        Public method to check, if a style is a comment style.
+</p><dl>
+<dt><i>style</i></dt>
+<dd>
+style to check (integer)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a comment style (boolean)
+</dd>
+</dl><a NAME="LexerJSON.isStringStyle" ID="LexerJSON.isStringStyle"></a>
+<h4>LexerJSON.isStringStyle</h4>
+<b>isStringStyle</b>(<i>style</i>)
+<p>
+        Public method to check, if a style is a string style.
+</p><dl>
+<dt><i>style</i></dt>
+<dd>
+style to check (integer)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating a string style (boolean)
+</dd>
+</dl><a NAME="LexerJSON.maximumKeywordSet" ID="LexerJSON.maximumKeywordSet"></a>
+<h4>LexerJSON.maximumKeywordSet</h4>
+<b>maximumKeywordSet</b>(<i></i>)
+<p>
+        Public method to get the maximum keyword set.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum keyword set (integer)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/index-eric6.QScintilla.Lexers.html	Thu Jan 12 19:26:13 2017 +0100
+++ b/Documentation/Source/index-eric6.QScintilla.Lexers.html	Sat Jan 14 14:12:42 2017 +0100
@@ -73,6 +73,9 @@
 <td><a href="eric6.QScintilla.Lexers.LexerIDL.html">LexerIDL</a></td>
 <td>Module implementing an IDL lexer with some additional methods.</td>
 </tr><tr>
+<td><a href="eric6.QScintilla.Lexers.LexerJSON.html">LexerJSON</a></td>
+<td>Module implementing a JSON lexer with some additional methods.</td>
+</tr><tr>
 <td><a href="eric6.QScintilla.Lexers.LexerJava.html">LexerJava</a></td>
 <td>Module implementing a Java lexer with some additional methods.</td>
 </tr><tr>
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py	Thu Jan 12 19:26:13 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sat Jan 14 14:12:42 2017 +0100
@@ -57,33 +57,19 @@
             Preferences.getEditor("CppCaseInsensitiveKeywords"))
         self.cppDollarAllowedCheckBox.setChecked(
             Preferences.getEditor("CppDollarsAllowed"))
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.cppStylePreprocessorCheckBox.setChecked(
-                Preferences.getEditor("CppStylePreprocessor"))
-        else:
-            self.cppStylePreprocessorCheckBox.setEnabled(False)
-        if QSCINTILLA_VERSION() >= 0x020600:
-            self.cppHighlightTripleQuotedCheckBox.setChecked(
-                Preferences.getEditor("CppHighlightTripleQuotedStrings"))
-        else:
-            self.cppHighlightTripleQuotedCheckBox.setEnabled(False)
-        if QSCINTILLA_VERSION() >= 0x020700:
-            self.cppHighlightHashQuotedCheckBox.setChecked(
-                Preferences.getEditor("CppHighlightHashQuotedStrings"))
-        else:
-            self.cppHighlightHashQuotedCheckBox.setEnabled(False)
-        if QSCINTILLA_VERSION() >= 0x020900:
-            self.cppHighlightBackQuotedCheckBox.setChecked(
-                Preferences.getEditor("CppHighlightBackQuotedStrings"))
-            self.cppHighlightEsacepSequencesCheckBox.setChecked(
-                Preferences.getEditor("CppHighlightEscapeSequences"))
-            self.cppVerbatimStringEscapeAllowedCheckBox.setChecked(
-                Preferences.getEditor(
-                    "CppVerbatimStringEscapeSequencesAllowed"))
-        else:
-            self.cppHighlightBackQuotedCheckBox.setEnabled(False)
-            self.cppHighlightEsacepSequencesCheckBox.setEnabled(False)
-            self.cppVerbatimStringEscapeAllowedCheckBox.setEnabled(False)
+        self.cppStylePreprocessorCheckBox.setChecked(
+            Preferences.getEditor("CppStylePreprocessor"))
+        self.cppHighlightTripleQuotedCheckBox.setChecked(
+            Preferences.getEditor("CppHighlightTripleQuotedStrings"))
+        self.cppHighlightHashQuotedCheckBox.setChecked(
+            Preferences.getEditor("CppHighlightHashQuotedStrings"))
+        self.cppHighlightBackQuotedCheckBox.setChecked(
+            Preferences.getEditor("CppHighlightBackQuotedStrings"))
+        self.cppHighlightEsacepSequencesCheckBox.setChecked(
+            Preferences.getEditor("CppHighlightEscapeSequences"))
+        self.cppVerbatimStringEscapeAllowedCheckBox.setChecked(
+            Preferences.getEditor(
+                "CppVerbatimStringEscapeSequencesAllowed"))
         
         # CMake
         self.cmakeFoldAtElseCheckBox.setChecked(
@@ -103,17 +89,12 @@
         # CSS
         self.foldCssCommentCheckBox.setChecked(
             Preferences.getEditor("CssFoldComment"))
-        if QSCINTILLA_VERSION() >= 0x020700:
-            self.cssHssCheckBox.setChecked(
-                Preferences.getEditor("CssHssSupport"))
-            self.cssLessCheckBox.setChecked(
-                Preferences.getEditor("CssLessSupport"))
-            self.cssSassyCheckBox.setChecked(
-                Preferences.getEditor("CssSassySupport"))
-        else:
-            self.cssHssCheckBox.setEnabled(False)
-            self.cssLessCheckBox.setEnabled(False)
-            self.cssSassyCheckBox.setEnabled(False)
+        self.cssHssCheckBox.setChecked(
+            Preferences.getEditor("CssHssSupport"))
+        self.cssLessCheckBox.setChecked(
+            Preferences.getEditor("CssLessSupport"))
+        self.cssSassyCheckBox.setChecked(
+            Preferences.getEditor("CssSassySupport"))
         
         # D
         self.foldDCommentCheckBox.setChecked(
@@ -141,29 +122,28 @@
             Preferences.getEditor("HtmlFoldScriptComments"))
         self.foldHtmlScriptHereDocsCheckBox.setChecked(
             Preferences.getEditor("HtmlFoldScriptHeredocs"))
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.htmlDjangoCheckBox.setChecked(
-                Preferences.getEditor("HtmlDjangoTemplates"))
-            self.htmlMakoCheckBox.setChecked(
-                Preferences.getEditor("HtmlMakoTemplates"))
+        self.htmlDjangoCheckBox.setChecked(
+            Preferences.getEditor("HtmlDjangoTemplates"))
+        self.htmlMakoCheckBox.setChecked(
+            Preferences.getEditor("HtmlMakoTemplates"))
+        
+        # JSON
+        if "JSON" in self.languages:
+            self.jsonHighlightCommentsCheckBox.setChecked(
+                Preferences.getEditor("JSONHightlightComments"))
+            self.jsonHighlightEscapeCheckBox.setChecked(
+                Preferences.getEditor("JSONHighlightEscapeSequences"))
         else:
-            self.htmlDjangoCheckBox.setEnabled(False)
-            self.htmlMakoCheckBox.setEnabled(False)
+            self.jsonGroup.setEnabled(False)
         
         # Pascal
-        if "Pascal" in self.languages:
-            self.pascalGroup.setEnabled(True)
-            self.foldPascalCommentCheckBox.setChecked(
-                Preferences.getEditor("PascalFoldComment"))
-            self.foldPascalPreprocessorCheckBox.setChecked(
-                Preferences.getEditor("PascalFoldPreprocessor"))
-            if QSCINTILLA_VERSION() >= 0x020400:
-                self.pascalSmartHighlightingCheckBox.setChecked(
-                    Preferences.getEditor("PascalSmartHighlighting"))
-            else:
-                self.pascalSmartHighlightingCheckBox.setEnabled(False)
-        else:
-            self.pascalGroup.setEnabled(False)
+        self.pascalGroup.setEnabled(True)
+        self.foldPascalCommentCheckBox.setChecked(
+            Preferences.getEditor("PascalFoldComment"))
+        self.foldPascalPreprocessorCheckBox.setChecked(
+            Preferences.getEditor("PascalFoldPreprocessor"))
+        self.pascalSmartHighlightingCheckBox.setChecked(
+            Preferences.getEditor("PascalSmartHighlighting"))
         
         # Perl
         self.foldPerlCommentCheckBox.setChecked(
@@ -172,23 +152,17 @@
             Preferences.getEditor("PerlFoldPackages"))
         self.foldPerlPODBlocksCheckBox.setChecked(
             Preferences.getEditor("PerlFoldPODBlocks"))
-        if QSCINTILLA_VERSION() >= 0x020600:
-            self.foldPerlAtElseCheckBox.setChecked(
-                Preferences.getEditor("PerlFoldAtElse"))
-        else:
-            self.foldPerlAtElseCheckBox.setEnabled(False)
+        self.foldPerlAtElseCheckBox.setChecked(
+            Preferences.getEditor("PerlFoldAtElse"))
         
         # PostScript
-        if "PostScript" in self.languages:
-            self.postscriptGroup.setEnabled(True)
-            self.psFoldAtElseCheckBox.setChecked(
-                Preferences.getEditor("PostScriptFoldAtElse"))
-            self.psMarkTokensCheckBox.setChecked(
-                Preferences.getEditor("PostScriptTokenize"))
-            self.psLevelSpinBox.setValue(
-                Preferences.getEditor("PostScriptLevel"))
-        else:
-            self.postscriptGroup.setEnabled(False)
+        self.postscriptGroup.setEnabled(True)
+        self.psFoldAtElseCheckBox.setChecked(
+            Preferences.getEditor("PostScriptFoldAtElse"))
+        self.psMarkTokensCheckBox.setChecked(
+            Preferences.getEditor("PostScriptTokenize"))
+        self.psLevelSpinBox.setValue(
+            Preferences.getEditor("PostScriptLevel"))
         
         # Povray
         self.foldPovrayCommentCheckBox.setChecked(
@@ -197,11 +171,8 @@
             Preferences.getEditor("PovFoldDirectives"))
         
         # Properties
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.propertiesInitialSpacesCheckBox.setChecked(
-                Preferences.getEditor("PropertiesInitialSpaces"))
-        else:
-            self.propertiesInitialSpacesCheckBox.setEnabled(False)
+        self.propertiesInitialSpacesCheckBox.setChecked(
+            Preferences.getEditor("PropertiesInitialSpaces"))
         
         # Python
         self.pythonBadIndentationComboBox.addItems([
@@ -225,69 +196,44 @@
             Preferences.getEditor("PythonAllowV3Binary"))
         self.pythonV3BytesAllowedCheckBox.setChecked(
             Preferences.getEditor("PythonAllowV3Bytes"))
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.foldPythonQuotesCheckBox.setChecked(
-                Preferences.getEditor("PythonFoldQuotes"))
-            self.pythonStringsOverNewlineCheckBox.setChecked(
-                Preferences.getEditor("PythonStringsOverNewLineAllowed"))
-        else:
-            self.foldPythonQuotesCheckBox.setEnabled(False)
-            self.pythonStringsOverNewlineCheckBox.setEnabled(False)
-        if QSCINTILLA_VERSION() >= 0x020600:
-            self.pythonHighlightSubidentifierCheckBox.setChecked(
-                Preferences.getEditor("PythonHighlightSubidentifier"))
-        else:
-            self.pythonHighlightSubidentifierCheckBox.setEnabled(False)
+        self.foldPythonQuotesCheckBox.setChecked(
+            Preferences.getEditor("PythonFoldQuotes"))
+        self.pythonStringsOverNewlineCheckBox.setChecked(
+            Preferences.getEditor("PythonStringsOverNewLineAllowed"))
+        self.pythonHighlightSubidentifierCheckBox.setChecked(
+            Preferences.getEditor("PythonHighlightSubidentifier"))
         
         # Ruby
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.foldRubyCommentCheckBox.setChecked(
-                Preferences.getEditor("RubyFoldComment"))
-        else:
-            self.foldRubyCommentCheckBox.setEnabled(False)
+        self.foldRubyCommentCheckBox.setChecked(
+            Preferences.getEditor("RubyFoldComment"))
         
         # SQL
         self.foldSqlCommentCheckBox.setChecked(
             Preferences.getEditor("SqlFoldComment"))
         self.sqlBackslashEscapesCheckBox.setChecked(
             Preferences.getEditor("SqlBackslashEscapes"))
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.sqlFoldAtElseCheckBox.setChecked(
-                Preferences.getEditor("SqlFoldAtElse"))
-            self.sqlFoldOnlyBeginCheckBox.setChecked(
-                Preferences.getEditor("SqlFoldOnlyBegin"))
-            self.sqlDottedWordsCheckBox.setChecked(
-                Preferences.getEditor("SqlDottedWords"))
-            self.sqlHashCommentsCheckBox.setChecked(
-                Preferences.getEditor("SqlHashComments"))
-            self.sqlQuotedIdentifiersCheckBox.setChecked(
-                Preferences.getEditor("SqlQuotedIdentifiers"))
-        else:
-            self.sqlFoldAtElseCheckBox.setEnabled(False)
-            self.sqlFoldOnlyBeginCheckBox.setEnabled(False)
-            self.sqlDottedWordsCheckBox.setEnabled(False)
-            self.sqlHashCommentsCheckBox.setEnabled(False)
-            self.sqlQuotedIdentifiersCheckBox.setEnabled(False)
+        self.sqlFoldAtElseCheckBox.setChecked(
+            Preferences.getEditor("SqlFoldAtElse"))
+        self.sqlFoldOnlyBeginCheckBox.setChecked(
+            Preferences.getEditor("SqlFoldOnlyBegin"))
+        self.sqlDottedWordsCheckBox.setChecked(
+            Preferences.getEditor("SqlDottedWords"))
+        self.sqlHashCommentsCheckBox.setChecked(
+            Preferences.getEditor("SqlHashComments"))
+        self.sqlQuotedIdentifiersCheckBox.setChecked(
+            Preferences.getEditor("SqlQuotedIdentifiers"))
         
         # TCL
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.foldTclCommentCheckBox.setChecked(
-                Preferences.getEditor("TclFoldComment"))
-        else:
-            self.foldTclCommentCheckBox.setEnabled(False)
+        self.foldTclCommentCheckBox.setChecked(
+            Preferences.getEditor("TclFoldComment"))
         
         # TeX
-        if QSCINTILLA_VERSION() >= 0x020500:
-            self.foldTexCommentCheckBox.setChecked(
-                Preferences.getEditor("TexFoldComment"))
-            self.texProcessCommentsCheckBox.setChecked(
-                Preferences.getEditor("TexProcessComments"))
-            self.texProcessIfCheckBox.setChecked(
-                Preferences.getEditor("TexProcessIf"))
-        else:
-            self.foldTexCommentCheckBox.setEnabled(False)
-            self.texProcessCommentsCheckBox.setEnabled(False)
-            self.texProcessIfCheckBox.setEnabled(False)
+        self.foldTexCommentCheckBox.setChecked(
+            Preferences.getEditor("TexFoldComment"))
+        self.texProcessCommentsCheckBox.setChecked(
+            Preferences.getEditor("TexProcessComments"))
+        self.texProcessIfCheckBox.setChecked(
+            Preferences.getEditor("TexProcessIf"))
         
         # VHDL
         self.vhdlFoldCommentCheckBox.setChecked(
@@ -304,12 +250,9 @@
             Preferences.getEditor("XMLStyleScripts"))
         
         # YAML
-        if "YAML" in self.languages:
-            self.yamlGroup.setEnabled(True)
-            self.foldYamlCommentCheckBox.setChecked(
-                Preferences.getEditor("YAMLFoldComment"))
-        else:
-            self.yamlGroup.setEnabled(False)
+        self.yamlGroup.setEnabled(True)
+        self.foldYamlCommentCheckBox.setChecked(
+            Preferences.getEditor("YAMLFoldComment"))
         
     def save(self):
         """
@@ -352,18 +295,15 @@
         Preferences.setEditor(
             "CppDollarsAllowed",
             self.cppDollarAllowedCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "CppStylePreprocessor",
-                self.cppStylePreprocessorCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020600:
-            Preferences.setEditor(
-                "CppHighlightTripleQuotedStrings",
-                self.cppHighlightTripleQuotedCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020700:
-            Preferences.setEditor(
-                "CppHighlightHashQuotedStrings",
-                self.cppHighlightHashQuotedCheckBox.isChecked())
+        Preferences.setEditor(
+            "CppStylePreprocessor",
+            self.cppStylePreprocessorCheckBox.isChecked())
+        Preferences.setEditor(
+            "CppHighlightTripleQuotedStrings",
+            self.cppHighlightTripleQuotedCheckBox.isChecked())
+        Preferences.setEditor(
+            "CppHighlightHashQuotedStrings",
+            self.cppHighlightHashQuotedCheckBox.isChecked())
         if QSCINTILLA_VERSION() >= 0x020900:
             Preferences.setEditor(
                 "CppHighlightBackQuotedStrings",
@@ -396,16 +336,15 @@
         Preferences.setEditor(
             "CssFoldComment",
             self.foldCssCommentCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020700:
-            Preferences.setEditor(
-                "CssHssSupport",
-                self.cssHssCheckBox.isChecked())
-            Preferences.setEditor(
-                "CssLessSupport",
-                self.cssLessCheckBox.isChecked())
-            Preferences.setEditor(
-                "CssSassySupport",
-                self.cssSassyCheckBox.isChecked())
+        Preferences.setEditor(
+            "CssHssSupport",
+            self.cssHssCheckBox.isChecked())
+        Preferences.setEditor(
+            "CssLessSupport",
+            self.cssLessCheckBox.isChecked())
+        Preferences.setEditor(
+            "CssSassySupport",
+            self.cssSassyCheckBox.isChecked())
         
         # D
         Preferences.setEditor(
@@ -440,25 +379,30 @@
         Preferences.setEditor(
             "HtmlFoldScriptHeredocs",
             self.foldHtmlScriptHereDocsCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "HtmlDjangoTemplates",
-                self.htmlDjangoCheckBox.isChecked())
-            Preferences.setEditor(
-                "HtmlMakoTemplates",
-                self.htmlMakoCheckBox.isChecked())
+        Preferences.setEditor(
+            "HtmlDjangoTemplates",
+            self.htmlDjangoCheckBox.isChecked())
+        Preferences.setEditor(
+            "HtmlMakoTemplates",
+            self.htmlMakoCheckBox.isChecked())
+        
+        # JSON
+        if "JSON" in self.languages:
+            Preferences.setEditor("JSONHightlightComments",
+                self.jsonHighlightCommentsCheckBox.isChecked())
+            Preferences.setEditor("JSONHighlightEscapeSequences",
+                self.jsonHighlightEscapeCheckBox.isChecked())
         
         # Pascal
-        if "Pascal" in self.languages:
-            Preferences.setEditor(
-                "PascalFoldComment",
-                self.foldPascalCommentCheckBox.isChecked())
-            Preferences.setEditor(
-                "PascalFoldPreprocessor",
-                self.foldPascalPreprocessorCheckBox.isChecked())
-            Preferences.setEditor(
-                "PascalSmartHighlighting",
-                self.pascalSmartHighlightingCheckBox.isChecked())
+        Preferences.setEditor(
+            "PascalFoldComment",
+            self.foldPascalCommentCheckBox.isChecked())
+        Preferences.setEditor(
+            "PascalFoldPreprocessor",
+            self.foldPascalPreprocessorCheckBox.isChecked())
+        Preferences.setEditor(
+            "PascalSmartHighlighting",
+            self.pascalSmartHighlightingCheckBox.isChecked())
         
         # Perl
         Preferences.setEditor(
@@ -470,22 +414,20 @@
         Preferences.setEditor(
             "PerlFoldPODBlocks",
             self.foldPerlPODBlocksCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020600:
-            Preferences.setEditor(
-                "PerlFoldAtElse",
-                self.foldPerlAtElseCheckBox.isChecked())
+        Preferences.setEditor(
+            "PerlFoldAtElse",
+            self.foldPerlAtElseCheckBox.isChecked())
         
         # PostScript
-        if "PostScript" in self.languages:
-            Preferences.setEditor(
-                "PostScriptFoldAtElse",
-                self.psFoldAtElseCheckBox.isChecked())
-            Preferences.setEditor(
-                "PostScriptTokenize",
-                self.psMarkTokensCheckBox.isChecked())
-            Preferences.setEditor(
-                "PostScriptLevel",
-                self.psLevelSpinBox.value())
+        Preferences.setEditor(
+            "PostScriptFoldAtElse",
+            self.psFoldAtElseCheckBox.isChecked())
+        Preferences.setEditor(
+            "PostScriptTokenize",
+            self.psMarkTokensCheckBox.isChecked())
+        Preferences.setEditor(
+            "PostScriptLevel",
+            self.psLevelSpinBox.value())
         
         # Povray
         Preferences.setEditor(
@@ -496,10 +438,9 @@
             self.foldPovrayDirectivesCheckBox.isChecked())
         
         # Properties
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "PropertiesInitialSpaces",
-                self.propertiesInitialSpacesCheckBox.isChecked())
+        Preferences.setEditor(
+            "PropertiesInitialSpaces",
+            self.propertiesInitialSpacesCheckBox.isChecked())
         
         # Python
         Preferences.setEditor(
@@ -523,23 +464,20 @@
         Preferences.setEditor(
             "PythonAllowV3Bytes",
             self.pythonV3BytesAllowedCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "PythonFoldQuotes",
-                self.foldPythonQuotesCheckBox.isChecked())
-            Preferences.setEditor(
-                "PythonStringsOverNewLineAllowed",
-                self.pythonStringsOverNewlineCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020600:
-            Preferences.setEditor(
-                "PythonHighlightSubidentifier",
-                self.pythonHighlightSubidentifierCheckBox.isChecked())
+        Preferences.setEditor(
+            "PythonFoldQuotes",
+            self.foldPythonQuotesCheckBox.isChecked())
+        Preferences.setEditor(
+            "PythonStringsOverNewLineAllowed",
+            self.pythonStringsOverNewlineCheckBox.isChecked())
+        Preferences.setEditor(
+            "PythonHighlightSubidentifier",
+            self.pythonHighlightSubidentifierCheckBox.isChecked())
         
         # Ruby
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "RubyFoldComment",
-                self.foldRubyCommentCheckBox.isChecked())
+        Preferences.setEditor(
+            "RubyFoldComment",
+            self.foldRubyCommentCheckBox.isChecked())
         
         # SQL
         Preferences.setEditor(
@@ -548,40 +486,37 @@
         Preferences.setEditor(
             "SqlBackslashEscapes",
             self.sqlBackslashEscapesCheckBox.isChecked())
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "SqlFoldAtElse",
-                self.sqlFoldAtElseCheckBox.isChecked())
-            Preferences.setEditor(
-                "SqlFoldOnlyBegin",
-                self.sqlFoldOnlyBeginCheckBox.isChecked())
-            Preferences.setEditor(
-                "SqlDottedWords",
-                self.sqlDottedWordsCheckBox.isChecked())
-            Preferences.setEditor(
-                "SqlHashComments",
-                self.sqlHashCommentsCheckBox.isChecked())
-            Preferences.setEditor(
-                "SqlQuotedIdentifiers",
-                self.sqlQuotedIdentifiersCheckBox.isChecked())
+        Preferences.setEditor(
+            "SqlFoldAtElse",
+            self.sqlFoldAtElseCheckBox.isChecked())
+        Preferences.setEditor(
+            "SqlFoldOnlyBegin",
+            self.sqlFoldOnlyBeginCheckBox.isChecked())
+        Preferences.setEditor(
+            "SqlDottedWords",
+            self.sqlDottedWordsCheckBox.isChecked())
+        Preferences.setEditor(
+            "SqlHashComments",
+            self.sqlHashCommentsCheckBox.isChecked())
+        Preferences.setEditor(
+            "SqlQuotedIdentifiers",
+            self.sqlQuotedIdentifiersCheckBox.isChecked())
         
         # TCL
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "TclFoldComment",
-                self.foldTclCommentCheckBox.isChecked())
+        Preferences.setEditor(
+            "TclFoldComment",
+            self.foldTclCommentCheckBox.isChecked())
         
         # TeX
-        if QSCINTILLA_VERSION() >= 0x020500:
-            Preferences.setEditor(
-                "TexFoldComment",
-                self.foldTexCommentCheckBox.isChecked())
-            Preferences.setEditor(
-                "TexProcessComments",
-                self.texProcessCommentsCheckBox.isChecked())
-            Preferences.setEditor(
-                "TexProcessIf",
-                self.texProcessIfCheckBox.isChecked())
+        Preferences.setEditor(
+            "TexFoldComment",
+            self.foldTexCommentCheckBox.isChecked())
+        Preferences.setEditor(
+            "TexProcessComments",
+            self.texProcessCommentsCheckBox.isChecked())
+        Preferences.setEditor(
+            "TexProcessIf",
+            self.texProcessIfCheckBox.isChecked())
         
         # VHDL
         Preferences.setEditor(
@@ -603,10 +538,9 @@
             self.xmlSyleScriptsCheckBox.isChecked())
         
         # YAML
-        if "YAML" in self.languages:
-            Preferences.setEditor(
-                "YAMLFoldComment",
-                self.foldYamlCommentCheckBox.isChecked())
+        Preferences.setEditor(
+            "YAMLFoldComment",
+            self.foldYamlCommentCheckBox.isChecked())
 
 
 def create(dlg):
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.ui	Thu Jan 12 19:26:13 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.ui	Sat Jan 14 14:12:42 2017 +0100
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>558</width>
-    <height>2611</height>
+    <height>2930</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -472,6 +472,35 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="jsonGroup">
+     <property name="title">
+      <string>JSON</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_12">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="jsonHighlightCommentsCheckBox">
+        <property name="toolTip">
+         <string>Select to enable highlighting of line/block comments</string>
+        </property>
+        <property name="text">
+         <string>Highlight comments</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="jsonHighlightEscapeCheckBox">
+        <property name="toolTip">
+         <string>Select to enable highlighting of escape sequences in strings</string>
+        </property>
+        <property name="text">
+         <string>Highlight escape sequences</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="pascalGroup">
      <property name="title">
       <string>Pascal Lexer Properties</string>
@@ -1077,6 +1106,8 @@
   <tabstop>htmlDjangoCheckBox</tabstop>
   <tabstop>htmlMakoCheckBox</tabstop>
   <tabstop>xmlSyleScriptsCheckBox</tabstop>
+  <tabstop>jsonHighlightCommentsCheckBox</tabstop>
+  <tabstop>jsonHighlightEscapeCheckBox</tabstop>
   <tabstop>foldPascalCommentCheckBox</tabstop>
   <tabstop>foldPascalPreprocessorCheckBox</tabstop>
   <tabstop>pascalSmartHighlightingCheckBox</tabstop>
--- a/Preferences/__init__.py	Thu Jan 12 19:26:13 2017 +0100
+++ b/Preferences/__init__.py	Sat Jan 14 14:12:42 2017 +0100
@@ -523,6 +523,10 @@
         "HtmlDjangoTemplates": False,
         "HtmlMakoTemplates": False,
         
+        # JSON specifics
+        "JSONHightlightComments": True,
+        "JSONHighlightEscapeSequences": True,
+        
         # Pascal specifics
         "PascalFoldComment": True,
         "PascalFoldPreprocessor": False,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QScintilla/Lexers/LexerJSON.py	Sat Jan 14 14:12:42 2017 +0100
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a JSON lexer with some additional methods.
+"""
+
+from __future__ import unicode_literals
+
+from PyQt5.Qsci import QsciLexerJSON
+
+from .Lexer import Lexer
+import Preferences
+
+
+class LexerJSON(Lexer, QsciLexerJSON):
+    """
+    Subclass to implement some additional lexer dependent methods.
+    """
+    def __init__(self, parent=None):
+        """
+        Constructor
+        
+        @param parent parent widget of this lexer
+        """
+        QsciLexerJSON.__init__(self, parent)
+        Lexer.__init__(self)
+        
+        self.commentString = "//"
+        self.streamCommentString = {
+            'start': '/* ',
+            'end': ' */'
+        }
+
+    def initProperties(self):
+        """
+        Public slot to initialize the properties.
+        """
+        self.setHighlightComments(
+            Preferences.getEditor("JSONHightlightComments"))
+        self.setHighlightEscapeSequences(
+            Preferences.getEditor("JSONHighlightEscapeSequences"))
+        self.setFoldCompact(
+            Preferences.getEditor("AllFoldCompact"))
+    
+    def isCommentStyle(self, style):
+        """
+        Public method to check, if a style is a comment style.
+        
+        @param style style to check (integer)
+        @return flag indicating a comment style (boolean)
+        """
+        return style in [QsciLexerJSON.CommentLine,
+                         QsciLexerJSON.CommentBlock]
+    
+    def isStringStyle(self, style):
+        """
+        Public method to check, if a style is a string style.
+        
+        @param style style to check (integer)
+        @return flag indicating a string style (boolean)
+        """
+        return style in [QsciLexerJSON.String,
+                         QsciLexerJSON.UnclosedString]
+    
+    def defaultKeywords(self, kwSet):
+        """
+        Public method to get the default keywords.
+        
+        @param kwSet number of the keyword set (integer)
+        @return string giving the keywords (string) or None
+        """
+        return QsciLexerJSON.keywords(self, kwSet)
+    
+    def maximumKeywordSet(self):
+        """
+        Public method to get the maximum keyword set.
+        
+        @return maximum keyword set (integer)
+        """
+        return 2
--- a/QScintilla/Lexers/__init__.py	Thu Jan 12 19:26:13 2017 +0100
+++ b/QScintilla/Lexers/__init__.py	Sat Jan 14 14:12:42 2017 +0100
@@ -112,6 +112,10 @@
                 "lexerLua.png"],
         "Makefile": [QCoreApplication.translate('Lexers', "Makefile"),
                      'dummy.mak', "lexerMakefile.png"],
+        "Matlab": [QCoreApplication.translate('Lexers', "Matlab"),
+                   'dummy.m.matlab', "lexerMatlab.png"],
+        "Octave": [QCoreApplication.translate('Lexers', "Octave"),
+                   'dummy.m.octave', "lexerOctave.png"],
         "Pascal": [QCoreApplication.translate('Lexers', "Pascal"), 'dummy.pas',
                    "lexerPascal.png"],
         "Perl": [QCoreApplication.translate('Lexers', "Perl"), 'dummy.pl',
@@ -144,14 +148,6 @@
                  "lexerYAML.png"],
     }
     
-    if QSCINTILLA_VERSION() >= 0x020501:
-        supportedLanguages.update({
-            "Matlab": [QCoreApplication.translate('Lexers', "Matlab"),
-                       'dummy.m.matlab', "lexerMatlab.png"],
-            "Octave": [QCoreApplication.translate('Lexers', "Octave"),
-                       'dummy.m.octave', "lexerOctave.png"],
-        })
-    
     if QSCINTILLA_VERSION() >= 0x020802:
         supportedLanguages["Gettext"] = \
             [QCoreApplication.translate('Lexers', "Gettext"), 'dummy.po',
@@ -162,6 +158,11 @@
             [QCoreApplication.translate('Lexers', "CoffeeScript"),
              'dummy.coffee', "lexerCoffeeScript.png"]
     
+    if QSCINTILLA_VERSION() >= 0x020a00:
+        supportedLanguages["JSON"] = \
+            [QCoreApplication.translate('Lexers', "JSON"),
+             'dummy.json', "lexerJSON.png"]
+    
     for name in LexerRegistry:
         if not name.startswith("Pygments|"):
             supportedLanguages[name] = \
@@ -319,6 +320,9 @@
             elif language == "CoffeeScript":
                 from .LexerCoffeeScript import LexerCoffeeScript
                 return LexerCoffeeScript(parent)
+            elif language == "JSON":
+                from .LexerJSON import LexerJSON
+                return LexerJSON(parent)
             
             elif language in LexerRegistry:
                 return LexerRegistry[language][2](parent)
@@ -473,18 +477,14 @@
         QCoreApplication.translate(
             'Lexers',
             'YAML Files (*.yaml *.yml)'),
+        QCoreApplication.translate(
+            'Lexers',
+            'Matlab Files (*.m *.m.matlab)'),
+        QCoreApplication.translate(
+            'Lexers',
+            'Octave Files (*.m *.m.octave)'),
     ]
     
-    if QSCINTILLA_VERSION() >= 0x020501:
-        openFileFiltersList.extend([
-            QCoreApplication.translate(
-                'Lexers',
-                'Matlab Files (*.m *.m.matlab)'),
-            QCoreApplication.translate(
-                'Lexers',
-                'Octave Files (*.m *.m.octave)'),
-        ])
-    
     if QSCINTILLA_VERSION() >= 0x020802:
         openFileFiltersList.append(
             QCoreApplication.translate(
@@ -499,6 +499,13 @@
                 'CoffeeScript Files (*.coffee)'),
         )
     
+    if QSCINTILLA_VERSION() >= 0x020a00:
+        openFileFiltersList.append(
+            QCoreApplication.translate(
+                'Lexers',
+                'JSON Files (*.json)'),
+        )
+    
     for name in LexerRegistry:
         openFileFiltersList.extend(LexerRegistry[name][3])
     
@@ -678,18 +685,14 @@
         QCoreApplication.translate(
             'Lexers',
             'YAML Files (*.yml)'),
+        QCoreApplication.translate(
+            'Lexers',
+            'Matlab Files (*.m)'),
+        QCoreApplication.translate(
+            'Lexers',
+            'Octave Files (*.m.octave)'),
     ]
     
-    if QSCINTILLA_VERSION() >= 0x020501:
-        saveFileFiltersList.extend([
-            QCoreApplication.translate(
-                'Lexers',
-                'Matlab Files (*.m)'),
-            QCoreApplication.translate(
-                'Lexers',
-                'Octave Files (*.m.octave)'),
-        ])
-    
     if QSCINTILLA_VERSION() >= 0x020802:
         saveFileFiltersList.append(
             QCoreApplication.translate(
@@ -704,6 +707,13 @@
                 'CoffeeScript Files (*.coffee)'),
         )
     
+    if QSCINTILLA_VERSION() >= 0x020a00:
+        saveFileFiltersList.append(
+            QCoreApplication.translate(
+                'Lexers',
+                'JSON Files (*.json)'),
+        )
+    
     for name in LexerRegistry:
         saveFileFiltersList.extend(LexerRegistry[name][4])
     
@@ -827,6 +837,9 @@
         "*.xul": "XML",
         "*.yaml": "YAML",
         "*.yml": "YAML",
+        '*.m': "Matlab",
+        '*.m.matlab': "Matlab",
+        '*.m.octave': "Octave",
         '*.e4d': "XML",
         '*.e4k': "XML",
         '*.e4m': "XML",
@@ -850,16 +863,15 @@
         '*.e6t': "XML",
     }
     
-    if QSCINTILLA_VERSION() >= 0x020501:
-        assocs.update({
-            '*.m': "Matlab",
-            '*.m.matlab': "Matlab",
-            '*.m.octave': "Octave",
-        })
+    if QSCINTILLA_VERSION() >= 0x020802:
+        assocs['*.po'] = "Gettext"
     
     if QSCINTILLA_VERSION() >= 0x020803:
         assocs['*.coffee'] = "CoffeeScript"
     
+    if QSCINTILLA_VERSION() >= 0x020a00:
+        assocs['*.json'] = "JSON"
+    
     for name in LexerRegistry:
         for pattern in LexerRegistry[name][5]:
             assocs[pattern] = name
--- a/changelog	Thu Jan 12 19:26:13 2017 +0100
+++ b/changelog	Sat Jan 14 14:12:42 2017 +0100
@@ -5,6 +5,7 @@
 - Editor
   -- added a bar with formatting options for HTML, Markdown and reStructured
      Text files
+  -- added support for the new QScintilla JSON lexer
 - Web Browser
   -- added functionality to manage the plug-in provided documentation sets
 
--- a/eric6.e4p	Thu Jan 12 19:26:13 2017 +0100
+++ b/eric6.e4p	Sat Jan 14 14:12:42 2017 +0100
@@ -859,6 +859,7 @@
     <Source>QScintilla/Lexers/LexerFortran77.py</Source>
     <Source>QScintilla/Lexers/LexerHTML.py</Source>
     <Source>QScintilla/Lexers/LexerIDL.py</Source>
+    <Source>QScintilla/Lexers/LexerJSON.py</Source>
     <Source>QScintilla/Lexers/LexerJava.py</Source>
     <Source>QScintilla/Lexers/LexerJavaScript.py</Source>
     <Source>QScintilla/Lexers/LexerLua.py</Source>
--- a/i18n/eric6_cs.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_cs.ts	Sat Jan 14 14:12:42 2017 +0100
@@ -390,7 +390,7 @@
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
         <source>Add Bookmark</source>
         <translation>Přidat záložku</translation>
     </message>
@@ -1797,7 +1797,7 @@
         <translation>Editovat &amp;adresu</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation>&amp;Smazat</translation>
     </message>
@@ -2490,12 +2490,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2661,7 +2661,7 @@
         <translation>Stisknutím zrušit sdílený editor</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
@@ -2959,7 +2959,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
         <source>ClickToFlash Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4900,7 +4900,7 @@
         <translation type="unfinished">Doména:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7666,7 +7666,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8136,92 +8136,92 @@
         <translation type="unfinished">Standardní tlačítka</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
         <source>Abort</source>
         <translation type="unfinished">Přerušit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
         <source>Apply</source>
         <translation type="unfinished">Použít</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
         <source>Cancel</source>
         <translation type="unfinished">Zrušit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
         <source>Close</source>
         <translation type="unfinished">Zavřít</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
         <source>Discard</source>
         <translation type="unfinished">Zahodit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
         <source>Ignore</source>
         <translation type="unfinished">Ignorovat</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
         <source>No</source>
         <translation type="unfinished">Ne</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
         <source>No to all</source>
         <translation type="unfinished">Ne pro všechno</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
         <source>Ok</source>
         <translation type="unfinished">Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
         <source>Open</source>
         <translation type="unfinished">Otevřít</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
         <source>Restore defaults</source>
         <translation type="unfinished">Obnovit defaulty</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
         <source>Retry</source>
         <translation type="unfinished">Vrátit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
         <source>Save</source>
         <translation type="unfinished">Uložit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
         <source>Save all</source>
         <translation type="unfinished">Uložit vše</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
         <source>Yes</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
         <source>Yes to all</source>
         <translation type="unfinished">Ano pro všechno</translation>
     </message>
@@ -10231,7 +10231,7 @@
         <translation>Stiskněte pro výběr API souboru ze seznamu instalovaných API</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/>
         <source>Add from installed APIs</source>
         <translation>Přidat z instalovaných API</translation>
     </message>
@@ -10241,7 +10241,7 @@
         <translation>Stiskněte pro kompilování vybrané API definici</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation>Kompilovat API</translation>
     </message>
@@ -10306,7 +10306,7 @@
         <translation>Stiskněte pro výběr API souboru ze seznamu API souborů instalovaných z pluginů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/>
         <source>Add from Plugin APIs</source>
         <translation>Přidat z API pluginů</translation>
     </message>
@@ -11413,7 +11413,7 @@
         <translation>Výběr výplně konce řádku.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
         <source>Fill to end of line</source>
         <translation>Vyplnit do konce řádku</translation>
     </message>
@@ -11458,7 +11458,7 @@
         <translation>Vybrat font.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation></translation>
     </message>
@@ -11700,12 +11700,12 @@
         <translation>Bash Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/>
         <source>Select whether folding of comments shall be possible</source>
         <translation>Vybrat, jestliže je možné skládat komentáře</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Skládat komentáře</translation>
     </message>
@@ -11735,22 +11735,22 @@
         <translation>Odsadit levé složené závorky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
         <source>Select whether folding at else statement should be possible</source>
         <translation>Vybrat, jestliže je možné skládat výrazy else</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
         <source>Fold at else</source>
         <translation>Skládat else</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/>
         <source>Select whether folding of preprocessor directives shall be possible</source>
         <translation>Vybrat, jestliže mají být možné příkazy preprocesoru skládání</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/>
         <source>Fold preprocessor directives</source>
         <translation>Příkazy preprocesoru skládání</translation>
     </message>
@@ -11795,127 +11795,127 @@
         <translation>Tagy rozlišují velké/malé znaky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
         <source>Perl Lexer Properties</source>
         <translation>Perl Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
         <source>Povray Lexer Properties</source>
         <translation>Povray Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
         <source>Select whether folding of directives shall be possible</source>
         <translation>Vybrat jestliže je možné skládání direktiv</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>Skládat direktivy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
         <source>Python Lexer Properties</source>
         <translation>Python Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/>
         <source>Select whether bad indentation shall be highlighted</source>
         <translation>Vybrat, má-li se zvýraznit chybné odsazení</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/>
         <source>Select whether text should be autoindented after a &apos;:&apos;</source>
         <translation>Vybrat, má-li se text automaticky odsadit po &apos;:&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/>
         <source>Auto indentation after &apos;:&apos;</source>
         <translation>Automatické odsazení po &apos;:&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/>
         <source>Select whether folding of strings shall be possible</source>
         <translation>Vybrat, jestliže je možné skládat stringy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Skládat stringy</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
         <source>SQL Lexer Properties</source>
         <translation>SQL Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/>
         <source>Select to enable Backslash Escapes</source>
         <translation>Vybrat pro aktivaci backslash escape sekvencí</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation>Escape sekvence</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
         <source>VHDL Lexer Properties</source>
         <translation>VHDL Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/>
         <source>Select whether folding of blocks at a parenthesis shall be possible</source>
         <translation>Vybrat jestliže je možné skládání bloků na závorkách</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/>
         <source>Fold at parenthesis</source>
         <translation>Skládat na závorkách</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/>
         <source>Select whether folding of begin blocks shall be possible</source>
         <translation>Vybrat jestliže je možné skládání začátků bloků</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/>
         <source>Fold at begin</source>
         <translation>Skládat na začátku</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
         <source>Pascal Lexer Properties</source>
         <translation>Pascal Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/>
         <source>PostScript Lexer Properties</source>
         <translation>PostScript Lexer vlastnosti</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/>
         <source>Select to mark tokens</source>
         <translation>Vybrat pro označnení tokenů</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation>Oznařit tokeny</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/>
         <source>PostScript Level:</source>
         <translation>PostScript úroveň:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/>
         <source>Select the PostScript level</source>
         <translation>Vybrat PostScript úroveň</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/>
         <source>YAML Lexer Properties</source>
         <translation>YAML Lexer vlastnosti</translation>
     </message>
@@ -11965,62 +11965,62 @@
         <translation>Stylovat skripty</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
         <source>Select to enable smart highlighting of keywords</source>
         <translation>Vybrat pro zapnutí zvýraznění klíčových slov</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation>Zvýraznění</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Vybrat pro zapnutí skládání Perl balíčků</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
+        <source>Smart Highlighting</source>
+        <translation>Zvýraznění</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Vybrat pro zapnutí skládání Perl balíčků</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
         <source>Fold packages</source>
         <translation>Skládat balíčky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/>
         <source>Select to enable folding of Perl POD blocks</source>
         <translation>Vybrat pro zapnutí skládání Perl POD bloků</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/>
         <source>Fold POD blocks</source>
         <translation>Skládat POD bloky</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/>
         <source>Select to allow Python v2 unicode string literals (e.g. u&quot;utf8&quot;)</source>
         <translation>Vybrat pro umožnění Python v2 unicode string literály (např. u&quot;utf8&quot;)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/>
         <source>Allow v2 unicode string literals</source>
         <translation>Povolit v2 unicode string literály</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/>
         <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
         <translation>Vybrat pro povolení Python v3 binárních a oktalových literálů (např. 0b1011, 0o712)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
         <source>Allow v3 binary and octal literals</source>
         <translation>Povolit v3 binární a oktalové literály</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/>
         <source>Select to allow Python v3 bytes string literals (e.g. b&quot;bytes&quot;)</source>
         <translation>Povolit Python v3 bytové string literály (např. b&quot;bytes&quot;)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/>
         <source>Allow v3 bytes string literals</source>
         <translation>Povolit v3 bytové string literály</translation>
     </message>
@@ -12055,112 +12055,112 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/>
         <source>Properties Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
         <source>Select to allow initial spaces in a line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
         <source>Allow initial spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/>
         <source>Select whether folding of triple quoted strings shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/>
         <source>Fold triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/>
         <source>Select to allow strings to span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/>
         <source>Strings may span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/>
         <source>Ruby Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/>
         <source>Select whether only BEGIN blocks can be folded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/>
         <source>Only BEGIN blocks can be folded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/>
         <source>Select if words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/>
         <source>Words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/>
         <source>Select to allow &apos;#&apos; as a comment character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/>
         <source>Allow &apos;#&apos; as comment character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/>
         <source>Select to enable quoted identifiers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <source>Enable quoted identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <source>Select to treat comments as TeX source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <source>Treat comments as TeX source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12170,7 +12170,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12180,7 +12180,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/>
         <source>Select to highlight sub-identifiers defined in keyword set 2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12235,32 +12235,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/>
         <source>Highlight bad indentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs after Spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation type="unfinished">Taby</translation>
     </message>
@@ -12280,7 +12280,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
         <source>Highlight escape sequences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12294,6 +12294,21 @@
         <source>Allow verbatim string escape sequences</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <source>JSON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/>
+        <source>Select to enable highlighting of line/block comments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/>
+        <source>Highlight comments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
@@ -12909,7 +12924,7 @@
         <translation>Mód:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Vypnuto</translation>
     </message>
@@ -13703,7 +13718,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.ui" line="13"/>
+        <location filename="../UI/EmailDialog.py" line="339"/>
         <source>Send bug report</source>
         <translation>Odeslat hlášení o chybách</translation>
     </message>
@@ -15148,12 +15163,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
         <source>Permission</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15168,7 +15183,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
         <source>Geolocation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16312,7 +16327,7 @@
         <translation type="unfinished">Jméno:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16322,7 +16337,7 @@
         <translation type="unfinished">Velikost:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
         <source>Origin:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16357,7 +16372,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
         <source>Remove Cookie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16783,7 +16798,7 @@
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
     <message>
-        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
+        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
         <source>GreaseMonkey Script Installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22490,7 +22505,7 @@
 <context>
     <name>HgAddSubrepositoryDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
         <source>Add Sub-repository</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23665,7 +23680,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
         <source>Resolved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23675,7 +23690,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
         <source>Unresolved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24299,7 +24314,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
         <source>Revision</source>
         <translation type="unfinished">Revize</translation>
     </message>
@@ -24671,7 +24686,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24812,7 +24827,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
         <source>Mercurial Log</source>
         <translation></translation>
     </message>
@@ -24842,17 +24857,17 @@
         <translation>Vybrat pole pro filtrování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
         <source>Revision</source>
         <translation>Revize</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
@@ -28799,7 +28814,7 @@
 <context>
     <name>HgStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
         <source>Mercurial Status</source>
         <translation>Mercurial status</translation>
     </message>
@@ -28940,7 +28955,7 @@
         <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation>Zapsat měny</translation>
     </message>
@@ -29060,7 +29075,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30340,7 +30355,7 @@
         <translation>Stisknout pro odebrání vybraných položek</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>Odeb&amp;rat</translation>
     </message>
@@ -35376,317 +35391,317 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
         <source>Perl</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
         <source>Povray</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
         <source>Properties</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
-        <source>SQL</source>
-        <translation></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
+        <source>SQL</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
         <source>TeX</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="143"/>
+        <source>VHDL</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="554"/>
+        <source>Pyrex Files (*.pyx)</source>
+        <translation>Pyrex soubory (*.pyx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
+        <source>Quixote Template Files (*.ptl)</source>
+        <translation>Quixote Template soubory (*.ptl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
+        <source>Ruby Files (*.rb)</source>
+        <translation>Ruby soubory (*.rb)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
+        <source>IDL Files (*.idl)</source>
+        <translation>IDL soubory (*.idl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
+        <source>C Files (*.h *.c)</source>
+        <translation>C soubory (*.h *.c)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
+        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
+        <translation>C++ soubory (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
+        <source>C# Files (*.cs)</source>
+        <translation>C# soubory (*.cs)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
+        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
+        <translation>HTML soubory (*.html *.htm *.asp *.shtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
+        <source>CSS Files (*.css)</source>
+        <translation>CSS soubory (*.css)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
+        <source>QSS Files (*.qss)</source>
+        <translation>QSS soubory (*.qss)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
+        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
+        <translation>PHP soubory (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
+        <source>Qt Resource Files (*.qrc)</source>
+        <translation>Qt Resource soubory (*.qrc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
+        <source>D Files (*.d *.di)</source>
+        <translation>D soubory (*.d *.di)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
+        <source>Java Files (*.java)</source>
+        <translation>Java soubory (*.java)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
+        <source>JavaScript Files (*.js)</source>
+        <translation>JavaScript soubory (*.js)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
+        <source>SQL Files (*.sql)</source>
+        <translation>SQL soubory (*.sql)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
+        <source>Docbook Files (*.docbook)</source>
+        <translation>Docbook soubory (*.docbook)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
+        <source>Perl Files (*.pl *.pm *.ph)</source>
+        <translation>Perl soubory (*.pl *.pm *.ph)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
+        <source>Lua Files (*.lua)</source>
+        <translation>Lua soubory (*.lua)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
+        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
+        <translation>Tex soubory (*.tex *.sty *.aux *.toc *.idx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
+        <source>Shell Files (*.sh)</source>
+        <translation>Shell soubory (*.sh)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
+        <source>Batch Files (*.bat *.cmd)</source>
+        <translation>Batch soubory (*.bat *.cmd)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
+        <source>Diff Files (*.diff *.patch)</source>
+        <translation>Diff soubory (*.diff *.patch)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
+        <source>Makefiles (*.mak)</source>
+        <translation>Makefiles (*.mak)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="450"/>
+        <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
+        <translation>Properties soubory (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
+        <source>Povray Files (*.pov)</source>
+        <translation>Povray soubory (*.pov)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
+        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
+        <translation>CMake soubory (CMakeLists.txt *.cmake *.ctest)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
+        <source>VHDL Files (*.vhd *.vhdl)</source>
+        <translation>VHDL soubory (*.vhd *.vhdl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
+        <source>All Files (*)</source>
+        <translation>Všechny soubory (*)</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="547"/>
-        <source>Pyrex Files (*.pyx)</source>
-        <translation>Pyrex soubory (*.pyx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
-        <source>Quixote Template Files (*.ptl)</source>
-        <translation>Quixote Template soubory (*.ptl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
-        <source>Ruby Files (*.rb)</source>
-        <translation>Ruby soubory (*.rb)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
-        <source>IDL Files (*.idl)</source>
-        <translation>IDL soubory (*.idl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
-        <source>C Files (*.h *.c)</source>
-        <translation>C soubory (*.h *.c)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
-        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
-        <translation>C++ soubory (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
-        <source>C# Files (*.cs)</source>
-        <translation>C# soubory (*.cs)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
-        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
-        <translation>HTML soubory (*.html *.htm *.asp *.shtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
-        <source>CSS Files (*.css)</source>
-        <translation>CSS soubory (*.css)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
-        <source>QSS Files (*.qss)</source>
-        <translation>QSS soubory (*.qss)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
-        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
-        <translation>PHP soubory (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
-        <source>Qt Resource Files (*.qrc)</source>
-        <translation>Qt Resource soubory (*.qrc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
-        <source>D Files (*.d *.di)</source>
-        <translation>D soubory (*.d *.di)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
-        <source>Java Files (*.java)</source>
-        <translation>Java soubory (*.java)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
-        <source>JavaScript Files (*.js)</source>
-        <translation>JavaScript soubory (*.js)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
-        <source>SQL Files (*.sql)</source>
-        <translation>SQL soubory (*.sql)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
-        <source>Docbook Files (*.docbook)</source>
-        <translation>Docbook soubory (*.docbook)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
-        <source>Perl Files (*.pl *.pm *.ph)</source>
-        <translation>Perl soubory (*.pl *.pm *.ph)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
-        <source>Lua Files (*.lua)</source>
-        <translation>Lua soubory (*.lua)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
-        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
-        <translation>Tex soubory (*.tex *.sty *.aux *.toc *.idx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
-        <source>Shell Files (*.sh)</source>
-        <translation>Shell soubory (*.sh)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
-        <source>Batch Files (*.bat *.cmd)</source>
-        <translation>Batch soubory (*.bat *.cmd)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
-        <source>Diff Files (*.diff *.patch)</source>
-        <translation>Diff soubory (*.diff *.patch)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
-        <source>Makefiles (*.mak)</source>
-        <translation>Makefiles (*.mak)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="446"/>
-        <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
-        <translation>Properties soubory (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
-        <source>Povray Files (*.pov)</source>
-        <translation>Povray soubory (*.pov)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
-        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
-        <translation>CMake soubory (CMakeLists.txt *.cmake *.ctest)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
-        <source>VHDL Files (*.vhd *.vhdl)</source>
-        <translation>VHDL soubory (*.vhd *.vhdl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
-        <source>All Files (*)</source>
-        <translation>Všechny soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
         <source>TCL</source>
         <translation>TCL</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="459"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="463"/>
         <source>TCL/Tk Files (*.tcl *.tk)</source>
         <translation>TCL/Tk soubory (*.tcl *.tk)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="559"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="566"/>
         <source>C Files (*.c)</source>
         <translation>C soubory (*.c)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="562"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="569"/>
         <source>C++ Files (*.cpp)</source>
         <translation>C++ soubory (*.cpp)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="565"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="572"/>
         <source>C++/C Header Files (*.h)</source>
         <translation>C++/C hlavičkové soubory (*.h)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="571"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="578"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML soubory (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="574"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="581"/>
         <source>PHP Files (*.php)</source>
         <translation>PHP soubory (*.php)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="577"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="584"/>
         <source>ASP Files (*.asp)</source>
         <translation>ASP soubory (*.asp)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="586"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="593"/>
         <source>XML Files (*.xml)</source>
         <translation>XML soubory (*.xml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="589"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="596"/>
         <source>XSL Files (*.xsl)</source>
         <translation>XSL soubory (*.xsl)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="592"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="599"/>
         <source>DTD Files (*.dtd)</source>
         <translation>DTD soubory (*.dtd)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="598"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="605"/>
         <source>D Files (*.d)</source>
         <translation>D soubory (*.d)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="601"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="608"/>
         <source>D Interface Files (*.di)</source>
         <translation>D Interface soubory (*.di)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="616"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="623"/>
         <source>Perl Files (*.pl)</source>
         <translation>Perl soubory (*.pl)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="619"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="626"/>
         <source>Perl Module Files (*.pm)</source>
         <translation>Perl Module soubory (*.pm)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="628"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="635"/>
         <source>Batch Files (*.bat)</source>
         <translation>Batch soubory (*.bat)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="631"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="638"/>
         <source>TeX Files (*.tex)</source>
         <translation>TeX soubory (*.tex)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="634"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="641"/>
         <source>TeX Template Files (*.sty)</source>
         <translation>TeX Template soubory (*.sty)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="637"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="644"/>
         <source>Diff Files (*.diff)</source>
         <translation>Diff soubory (*.diff)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="640"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="647"/>
         <source>Make Files (*.mak)</source>
         <translation>Make soubory (*.mak)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="643"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="650"/>
         <source>Properties Files (*.ini)</source>
         <translation>Properties soubory (*.ini)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="646"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="653"/>
         <source>Configuration Files (*.cfg)</source>
         <translation>Konfigurační soubory (*.cfg)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="652"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="659"/>
         <source>CMake Files (CMakeLists.txt)</source>
         <translation>CMake soubory (CMakeLists.txt)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="655"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="662"/>
         <source>CMake Macro Files (*.cmake)</source>
         <translation>CMake makro soubory (*.cmake)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="658"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="665"/>
         <source>VHDL Files (*.vhd)</source>
         <translation>VHDL soubory (*.vhd)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="661"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="668"/>
         <source>TCL Files (*.tcl)</source>
         <translation>TCL soubory (*.tcl)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="664"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="671"/>
         <source>Tk Files (*.tk)</source>
         <translation>Tk soubory (*.tk)</translation>
     </message>
@@ -35701,175 +35716,185 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
         <source>Pascal</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="462"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="466"/>
         <source>Fortran Files (*.f90 *.f95 *.f2k)</source>
         <translation>Fortran soubory (*.f90 *.f95 *.f2k)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="465"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="469"/>
         <source>Fortran77 Files (*.f *.for)</source>
         <translation>Fortran77 soubory (*.f *.for)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="468"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="472"/>
         <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source>
         <translation>Pascal soubory (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="667"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="674"/>
         <source>Fortran Files (*.f95)</source>
         <translation>Fortran soubory (*.f95)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="670"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="677"/>
         <source>Fortran77 Files (*.f)</source>
         <translation>Fortran77 soubory (*.f)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="673"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="680"/>
         <source>Pascal Files (*.pas)</source>
         <translation>Pascal soubory (*.pas)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
         <source>PostScript</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="145"/>
         <source>XML</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="143"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="404"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="408"/>
         <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source>
         <translation>XML soubory (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="676"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="683"/>
         <source>PostScript Files (*.ps)</source>
         <translation>PostScript soubory (*.ps)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="474"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="478"/>
         <source>YAML Files (*.yaml *.yml)</source>
         <translation>YAML soubory (*.yaml *.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="679"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="686"/>
         <source>YAML Files (*.yml)</source>
         <translation>YAML soubory (*.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="171"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="172"/>
         <source>Pygments</source>
         <translation>Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="365"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="369"/>
         <source>Python Files (*.py *.py2 *.py3)</source>
         <translation>Python soubory (*.py *.py2 *.py3)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="368"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="372"/>
         <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source>
         <translation>Python GUI soubory (*.pyw *.pyw2 *.pyw3)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="538"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="545"/>
         <source>Python3 Files (*.py)</source>
         <translation>Python3 soubory (*.py)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="544"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="551"/>
         <source>Python3 GUI Files (*.pyw)</source>
         <translation>Python3 GUI soubory (*.pyw)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="535"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="542"/>
         <source>Python2 Files (*.py2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="541"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="548"/>
         <source>Python2 GUI Files (*.pyw2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Matlab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Matlab Files (*.m *.m.matlab)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <source>Matlab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
+        <source>Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="481"/>
+        <source>Matlab Files (*.m *.m.matlab)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
         <source>QSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="157"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="153"/>
         <source>Gettext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="695"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="698"/>
         <source>Gettext Files (*.po)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="162"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="158"/>
         <source>CoffeeScript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="702"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="705"/>
         <source>CoffeeScript Files (*.coffee)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="163"/>
+        <source>JSON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="712"/>
+        <source>JSON Files (*.json)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LfConvertDataDialog</name>
@@ -36486,92 +36511,92 @@
         <translation>Standardní tlačítka</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
         <source>Apply</source>
         <translation>Použít</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
         <source>Abort</source>
         <translation>Přerušit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
         <source>Ignore</source>
         <translation>Ignorovat</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
         <source>Save all</source>
         <translation>Uložit vše</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
         <source>Discard</source>
         <translation>Zahodit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
         <source>Yes to all</source>
         <translation>Ano pro všechno</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
         <source>No to all</source>
         <translation>Ne pro všechno</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
         <source>Retry</source>
         <translation>Vrátit</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
         <source>Restore defaults</source>
         <translation>Obnovit defaulty</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -38331,7 +38356,7 @@
 <context>
     <name>NoCacheHostsDialog</name>
     <message>
-        <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
+        <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
         <source>Not Cached Hosts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38439,7 +38464,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39110,7 +39135,7 @@
 <context>
     <name>PasswordsDialog</name>
     <message>
-        <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
         <source>Saved Passwords</source>
         <translation>Uložená hesla</translation>
     </message>
@@ -40284,27 +40309,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1526"/>
+        <location filename="../Preferences/__init__.py" line="1530"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43943,7 +43968,7 @@
         <translation>Vykonáno</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Pokrytí</translation>
     </message>
@@ -44024,7 +44049,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -44032,7 +44057,7 @@
 <context>
     <name>PyProfileDialog</name>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation>Výsledky profilování</translation>
     </message>
@@ -48738,7 +48763,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
         <source>Remove Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -48748,7 +48773,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
         <source>Remove Attributes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50229,7 +50254,7 @@
 <context>
     <name>SendRefererWhitelistDialog</name>
     <message>
-        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
         <source>Send Referer Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51431,7 +51456,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54144,7 +54169,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
         <source>Subversion Diff</source>
         <translation></translation>
     </message>
@@ -54421,12 +54446,12 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
         <source>Revision</source>
         <translation>Revize</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
@@ -54436,7 +54461,7 @@
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
@@ -54908,7 +54933,7 @@
         <translation>Prot&amp;otokol:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -55020,7 +55045,7 @@
         <translation>Výběr protokolu pro přístup do repozitáře</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL:</translation>
     </message>
@@ -56264,7 +56289,7 @@
 <context>
     <name>SvnStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation></translation>
     </message>
@@ -56511,7 +56536,7 @@
         <translation>Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
         <source>Commit</source>
         <translation>Commit</translation>
     </message>
@@ -61821,7 +61846,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_de.ts	Sat Jan 14 14:12:42 2017 +0100
@@ -11376,12 +11376,12 @@
         <translation>Bash-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/>
         <source>Select whether folding of comments shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Kommentaren möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Kommentare falten</translation>
     </message>
@@ -11411,22 +11411,22 @@
         <translation>Öffnende geschweifte Klammer einrücken</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
         <source>Select whether folding at else statement should be possible</source>
         <translation>Wähle aus, ob die Faltung bei Else möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
         <source>Fold at else</source>
         <translation>Bei Else falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/>
         <source>Select whether folding of preprocessor directives shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Präprozessoranweisungen möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/>
         <source>Fold preprocessor directives</source>
         <translation>Falte Preprozessoranweisungen</translation>
     </message>
@@ -11471,127 +11471,127 @@
         <translation>Schreibweise der Tags beachten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
         <source>Perl Lexer Properties</source>
         <translation>Perl-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
         <source>Povray Lexer Properties</source>
         <translation>Povray-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
         <source>Select whether folding of directives shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Direktiven möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>Direktiven falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
         <source>Python Lexer Properties</source>
         <translation>Python-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/>
         <source>Select whether bad indentation shall be highlighted</source>
         <translation>Wähle aus, ob fehlerhafte Einrückungen hervorgehoben werden sollen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/>
         <source>Select whether text should be autoindented after a &apos;:&apos;</source>
         <translation>Wähle aus, ob Text nach einem „:“ automatisch eingerückt werden soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/>
         <source>Auto indentation after &apos;:&apos;</source>
         <translation>Automatische Einrückung nach „:“</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/>
         <source>Select whether folding of strings shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Zeichenketten möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Zeichenketten falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
         <source>SQL Lexer Properties</source>
         <translation>SQL-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/>
         <source>Select to enable Backslash Escapes</source>
         <translation>Auswählen, um „Backslash-Escapes“ zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation>Backslash-Escapes</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
         <source>VHDL Lexer Properties</source>
         <translation>VHDL-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/>
         <source>Select whether folding of blocks at a parenthesis shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Blöcken an einer Klammer möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/>
         <source>Fold at parenthesis</source>
         <translation>Bei Klammer falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/>
         <source>Select whether folding of begin blocks shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Begin-Blöcken möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/>
         <source>Fold at begin</source>
         <translation>Bei Begin falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
         <source>Pascal Lexer Properties</source>
         <translation>Pascal-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/>
         <source>PostScript Lexer Properties</source>
         <translation>PostScript-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/>
         <source>Select to mark tokens</source>
         <translation>Auswählen, um Tokens zu markieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation>Tokens markieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/>
         <source>PostScript Level:</source>
         <translation>PostScript-Level:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/>
         <source>Select the PostScript level</source>
         <translation>Wähle das PostScript-Level aus</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/>
         <source>YAML Lexer Properties</source>
         <translation>YAML-Lexereinstellungen</translation>
     </message>
@@ -11641,62 +11641,62 @@
         <translation>Skripts einfärben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
         <source>Select to enable smart highlighting of keywords</source>
         <translation>Auswählen, um Smart-Highlighting von Schlüsselwörtern zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation>Smart-Highlighting</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Auswählen, um Perl-Pakete zu falten</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
+        <source>Smart Highlighting</source>
+        <translation>Smart-Highlighting</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Auswählen, um Perl-Pakete zu falten</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
         <source>Fold packages</source>
         <translation>Pakete falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/>
         <source>Select to enable folding of Perl POD blocks</source>
         <translation>Auswählen, um Perl-POD-Blöcke zu falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/>
         <source>Fold POD blocks</source>
         <translation>POD-Blöcke falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/>
         <source>Select to allow Python v2 unicode string literals (e.g. u&quot;utf8&quot;)</source>
         <translation>Auswählen, um Python 2-Unicode-Zeichenketten (z.B. u&quot;utf8&quot;) zuzulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/>
         <source>Allow v2 unicode string literals</source>
         <translation>v2-Unicode-Zeichenketten zulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/>
         <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
         <translation>Auswählen, um Python 3-Binär- und -Oktalzahlen (z.B. 0b1011, 0o712) zuzulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
         <source>Allow v3 binary and octal literals</source>
         <translation>v3-Binär- und -Oktalzahlen zulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/>
         <source>Select to allow Python v3 bytes string literals (e.g. b&quot;bytes&quot;)</source>
         <translation>Auswählen, um Python 3-Byte-Zeichenketten (z.B. b&quot;bytes&quot;) zulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/>
         <source>Allow v3 bytes string literals</source>
         <translation>v3-Bytes-Zeichenketten zulassen</translation>
     </message>
@@ -11731,112 +11731,112 @@
         <translation>Aktiviere Mako-Schablonen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/>
         <source>Properties Lexer Properties</source>
         <translation>Properties-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
         <source>Select to allow initial spaces in a line</source>
         <translation>Auswählen, um führende Leerzeichen in einer Zeile zuzulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
         <source>Allow initial spaces</source>
         <translation>führende Leerzeichen zulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/>
         <source>Select whether folding of triple quoted strings shall be possible</source>
         <translation>Wähle aus, ob die Faltung von Zeichenketten in dreifachen Anführungszeichen möglich sein soll</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/>
         <source>Fold triple quoted strings</source>
         <translation>Zeichenketten in dreifachen Anführungszeichen falten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/>
         <source>Select to allow strings to span newline characters</source>
         <translation>Auswählen, wenn Zeichenketten über das Zeilenendezeichen hinausgehen dürfen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/>
         <source>Strings may span newline characters</source>
         <translation>Zeichenketten können Zeilenendezeichen überspannen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/>
         <source>Ruby Lexer Properties</source>
         <translation>Ruby-Lexereinstellungen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/>
         <source>Select whether only BEGIN blocks can be folded</source>
         <translation>Auswählen, wenn nur BEGIN-Blöcke gefaltet werden sollen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/>
         <source>Only BEGIN blocks can be folded</source>
         <translation>Faltung nur für BEGIN-Blöcke</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/>
         <source>Select if words may contain dots</source>
         <translation>Auswählen, wenn Worte Punkte enthalten dürfen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/>
         <source>Words may contain dots</source>
         <translation>Worte dürfen Punkte enthalten</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/>
         <source>Select to allow &apos;#&apos; as a comment character</source>
         <translation>Auswählen, um „#“ als Kommentarzeichen zuzulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/>
         <source>Allow &apos;#&apos; as comment character</source>
         <translation>„#“ als Kommentarzeichen zulassen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/>
         <source>Select to enable quoted identifiers</source>
         <translation>Auswählen, um Bezeichner in Anführungszeichen zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation>Bezeichner in Anführungszeichen zulassen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation>TCL-Lexereinstellungen</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation>TeX-Lexereinstellungen</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation>Auswählen, um Kommentare wie TeX-Quelltext zu behandeln</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation>Behandle Kommentare als TeX-Quelltext</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
-        <translation>Auswählen, um \if&lt;unknown&gt; als Kommando zu behandeln</translation>
+        <source>Enable quoted identifiers</source>
+        <translation>Bezeichner in Anführungszeichen zulassen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
+        <translation>TCL-Lexereinstellungen</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation>TeX-Lexereinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <source>Select to treat comments as TeX source</source>
+        <translation>Auswählen, um Kommentare wie TeX-Quelltext zu behandeln</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <source>Treat comments as TeX source</source>
+        <translation>Behandle Kommentare als TeX-Quelltext</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation>Auswählen, um \if&lt;unknown&gt; als Kommando zu behandeln</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation>Behandle \if&lt;unknown&gt; als Kommando</translation>
     </message>
@@ -11846,7 +11846,7 @@
         <translation>Zeichenketten in dreifachen Anführungszeichen hervorheben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/>
         <source>Highlight sub-identifiers</source>
         <translation>Unteridentifizierer hervorheben</translation>
     </message>
@@ -11856,7 +11856,7 @@
         <translation>Auswählen, um Zeichenketten in dreifachen Anführungszeichen hervorzuheben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/>
         <source>Select to highlight sub-identifiers defined in keyword set 2</source>
         <translation>Auswählen, um in Schlüsselwortgruppe 2 definierte Unteridentifizierer hervorzuheben</translation>
     </message>
@@ -11911,32 +11911,32 @@
         <translation>CoffeeScript</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/>
         <source>Highlight bad indentation:</source>
         <translation>Fehlerhafte Einrückung hervorheben:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation>keine Warnung</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation>Inkonsistent</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs after Spaces</source>
         <translation>Tabulatoren nach Leerzeichen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation>Leerzeichen</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation>Tabulatoren</translation>
     </message>
@@ -11956,7 +11956,7 @@
         <translation>Auswählen, um Escape-Sequenzen hervorzuheben</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
         <source>Highlight escape sequences</source>
         <translation>Escape-Sequenzen hervorheben</translation>
     </message>
@@ -11970,6 +11970,26 @@
         <source>Allow verbatim string escape sequences</source>
         <translation>Escape-Sequenzen in &apos;wörtlichen&apos; Zeichenketten zulassen</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <source>JSON</source>
+        <translation>JSON</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/>
+        <source>Select to enable highlighting of line/block comments</source>
+        <translation>Auswählen, um die Hervorhebung von Zeilen-/Blockkommentaren zu aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/>
+        <source>Highlight comments</source>
+        <translation>Kommentare hervorheben</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/>
+        <source>Select to enable highlighting of escape sequences in strings</source>
+        <translation>Auswählen, um die Hervorhebung von Escape-Sequenzen zu aktivieren</translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
@@ -34744,317 +34764,317 @@
         <translation>Makefile</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
         <source>Perl</source>
         <translation>Perl</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
         <source>Povray</source>
         <translation>Povray</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
         <source>Properties</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
         <source>Ruby</source>
         <translation>Ruby</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
-        <source>SQL</source>
-        <translation>SQL</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
+        <source>SQL</source>
+        <translation>SQL</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
         <source>TeX</source>
         <translation>TeX</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="143"/>
+        <source>VHDL</source>
+        <translation>VHDL</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="554"/>
+        <source>Pyrex Files (*.pyx)</source>
+        <translation>Pyrex-Dateien (*.pyx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
+        <source>Quixote Template Files (*.ptl)</source>
+        <translation>Quixote-Templatedateien (*.ptl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
+        <source>Ruby Files (*.rb)</source>
+        <translation>Ruby-Dateien (*.rb)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
+        <source>IDL Files (*.idl)</source>
+        <translation>IDL-Dateien (*.idl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
+        <source>C Files (*.h *.c)</source>
+        <translation>C-Dateien (*.h *.c)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
+        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
+        <translation>C++-Dateien (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
+        <source>C# Files (*.cs)</source>
+        <translation>C#-Dateien (*.cs)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
+        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
+        <translation>HTML-Dateien (*.html *.htm *.asp *.shtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
+        <source>CSS Files (*.css)</source>
+        <translation>CSS-Dateien (*.css)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
+        <source>QSS Files (*.qss)</source>
+        <translation>QSS-Dateien (*.qss)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
+        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
+        <translation>PHP-Dateien (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
+        <source>Qt Resource Files (*.qrc)</source>
+        <translation>Qt-Ressourcendateien (*.qrc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
+        <source>D Files (*.d *.di)</source>
+        <translation>D-Dateien (*.d *.di)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
+        <source>Java Files (*.java)</source>
+        <translation>Java-Dateien (*.java)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
+        <source>JavaScript Files (*.js)</source>
+        <translation>JavaScript-Dateien (*.js)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
+        <source>SQL Files (*.sql)</source>
+        <translation>SQL-Dateien (*.sql)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
+        <source>Docbook Files (*.docbook)</source>
+        <translation>Docbook-Dateien (*.docbook)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
+        <source>Perl Files (*.pl *.pm *.ph)</source>
+        <translation>Perl-Dateien (*.pl *,pm *.ph)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
+        <source>Lua Files (*.lua)</source>
+        <translation>Lua-Dateien (*.lua)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
+        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
+        <translation>TeX-Dateien (*.tex *.sty *.aux *.toc *.idx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
+        <source>Shell Files (*.sh)</source>
+        <translation>Shell dateien (*.sh)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
+        <source>Batch Files (*.bat *.cmd)</source>
+        <translation>Batch-Dateien (*.bat *.cmd)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
+        <source>Diff Files (*.diff *.patch)</source>
+        <translation>Diff-Dateien (*.diff *.patch)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
+        <source>Makefiles (*.mak)</source>
+        <translation>Make-Dateien (*.mak)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="450"/>
+        <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
+        <translation>Properties-Dateien (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
+        <source>Povray Files (*.pov)</source>
+        <translation>Povray-Dateien (*.pov)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
+        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
+        <translation>CMakeDateien (CMakeLists.txt *.cmake *.ctest)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
+        <source>VHDL Files (*.vhd *.vhdl)</source>
+        <translation>VHDLDateien (*.vhd *.vhdl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
+        <source>All Files (*)</source>
+        <translation>Alle Dateien (*)</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
-        <translation>VHDL</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="547"/>
-        <source>Pyrex Files (*.pyx)</source>
-        <translation>Pyrex-Dateien (*.pyx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
-        <source>Quixote Template Files (*.ptl)</source>
-        <translation>Quixote-Templatedateien (*.ptl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
-        <source>Ruby Files (*.rb)</source>
-        <translation>Ruby-Dateien (*.rb)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
-        <source>IDL Files (*.idl)</source>
-        <translation>IDL-Dateien (*.idl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
-        <source>C Files (*.h *.c)</source>
-        <translation>C-Dateien (*.h *.c)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
-        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
-        <translation>C++-Dateien (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
-        <source>C# Files (*.cs)</source>
-        <translation>C#-Dateien (*.cs)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
-        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
-        <translation>HTML-Dateien (*.html *.htm *.asp *.shtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
-        <source>CSS Files (*.css)</source>
-        <translation>CSS-Dateien (*.css)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
-        <source>QSS Files (*.qss)</source>
-        <translation>QSS-Dateien (*.qss)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
-        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
-        <translation>PHP-Dateien (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
-        <source>Qt Resource Files (*.qrc)</source>
-        <translation>Qt-Ressourcendateien (*.qrc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
-        <source>D Files (*.d *.di)</source>
-        <translation>D-Dateien (*.d *.di)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
-        <source>Java Files (*.java)</source>
-        <translation>Java-Dateien (*.java)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
-        <source>JavaScript Files (*.js)</source>
-        <translation>JavaScript-Dateien (*.js)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
-        <source>SQL Files (*.sql)</source>
-        <translation>SQL-Dateien (*.sql)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
-        <source>Docbook Files (*.docbook)</source>
-        <translation>Docbook-Dateien (*.docbook)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
-        <source>Perl Files (*.pl *.pm *.ph)</source>
-        <translation>Perl-Dateien (*.pl *,pm *.ph)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
-        <source>Lua Files (*.lua)</source>
-        <translation>Lua-Dateien (*.lua)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
-        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
-        <translation>TeX-Dateien (*.tex *.sty *.aux *.toc *.idx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
-        <source>Shell Files (*.sh)</source>
-        <translation>Shell dateien (*.sh)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
-        <source>Batch Files (*.bat *.cmd)</source>
-        <translation>Batch-Dateien (*.bat *.cmd)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
-        <source>Diff Files (*.diff *.patch)</source>
-        <translation>Diff-Dateien (*.diff *.patch)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
-        <source>Makefiles (*.mak)</source>
-        <translation>Make-Dateien (*.mak)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="446"/>
-        <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
-        <translation>Properties-Dateien (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
-        <source>Povray Files (*.pov)</source>
-        <translation>Povray-Dateien (*.pov)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
-        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
-        <translation>CMakeDateien (CMakeLists.txt *.cmake *.ctest)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
-        <source>VHDL Files (*.vhd *.vhdl)</source>
-        <translation>VHDLDateien (*.vhd *.vhdl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
-        <source>All Files (*)</source>
-        <translation>Alle Dateien (*)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
         <source>TCL</source>
         <translation>TCL</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="459"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="463"/>
         <source>TCL/Tk Files (*.tcl *.tk)</source>
         <translation>TCL-/Tk-Dateien (*.tcl *.tk)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="559"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="566"/>
         <source>C Files (*.c)</source>
         <translation>C-Dateien (*.c)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="562"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="569"/>
         <source>C++ Files (*.cpp)</source>
         <translation>C++-Dateien (*.cpp)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="565"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="572"/>
         <source>C++/C Header Files (*.h)</source>
         <translation>C++-/C-Header Dateien (*.h)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="571"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="578"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML-Dateien (*.html)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="574"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="581"/>
         <source>PHP Files (*.php)</source>
         <translation>PHP-Dateien (*.php)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="577"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="584"/>
         <source>ASP Files (*.asp)</source>
         <translation>ASP-Dateien (*.asp)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="586"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="593"/>
         <source>XML Files (*.xml)</source>
         <translation>XML-Dateien (*.xml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="589"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="596"/>
         <source>XSL Files (*.xsl)</source>
         <translation>XSL-Dateien (*.xsl)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="592"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="599"/>
         <source>DTD Files (*.dtd)</source>
         <translation>DTD-Dateien (*.dtd)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="598"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="605"/>
         <source>D Files (*.d)</source>
         <translation>D-Dateien (*.d)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="601"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="608"/>
         <source>D Interface Files (*.di)</source>
         <translation>D-Interfacedateien (*.di)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="616"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="623"/>
         <source>Perl Files (*.pl)</source>
         <translation>Perl-Dateien (*.pl)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="619"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="626"/>
         <source>Perl Module Files (*.pm)</source>
         <translation>Perl-Moduldateien (*.pm)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="628"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="635"/>
         <source>Batch Files (*.bat)</source>
         <translation>Batch-Dateien (*.bat)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="631"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="638"/>
         <source>TeX Files (*.tex)</source>
         <translation>TeX-Dateien (*.tex)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="634"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="641"/>
         <source>TeX Template Files (*.sty)</source>
         <translation>TeX-Templatedateien (*.sty)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="637"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="644"/>
         <source>Diff Files (*.diff)</source>
         <translation>Diff-Dateien (*.diff)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="640"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="647"/>
         <source>Make Files (*.mak)</source>
         <translation>Make-Dateien (*.mak)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="643"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="650"/>
         <source>Properties Files (*.ini)</source>
         <translation>Properties-Dateien (*.ini)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="646"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="653"/>
         <source>Configuration Files (*.cfg)</source>
         <translation>Konfigurationsdateien (*.cfg)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="652"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="659"/>
         <source>CMake Files (CMakeLists.txt)</source>
         <translation>CMake-Dateien (CMakeLists.txt)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="655"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="662"/>
         <source>CMake Macro Files (*.cmake)</source>
         <translation>CMake-Makrodateien (*.cmake)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="658"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="665"/>
         <source>VHDL Files (*.vhd)</source>
         <translation>VHDL-Dateien (*.vhd)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="661"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="668"/>
         <source>TCL Files (*.tcl)</source>
         <translation>TCL-Dateien (*.tcl)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="664"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="671"/>
         <source>Tk Files (*.tk)</source>
         <translation>Tk-Dateien (*.tk)</translation>
     </message>
@@ -35069,175 +35089,185 @@
         <translation>Fortran77</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
         <source>Pascal</source>
         <translation>Pascal</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="462"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="466"/>
         <source>Fortran Files (*.f90 *.f95 *.f2k)</source>
         <translation>Fortran-Dateien (*.f90 *.f95 *.f2k)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="465"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="469"/>
         <source>Fortran77 Files (*.f *.for)</source>
         <translation>Fortran77-Dateien (*.f *.for)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="468"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="472"/>
         <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source>
         <translation>Pascal-Dateien (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="667"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="674"/>
         <source>Fortran Files (*.f95)</source>
         <translation>Fortran-Dateien (*.f95)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="670"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="677"/>
         <source>Fortran77 Files (*.f)</source>
         <translation>Fortran77-Dateien (*.f)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="673"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="680"/>
         <source>Pascal Files (*.pas)</source>
         <translation>Pascal-Dateien (*.pas)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
         <source>PostScript</source>
         <translation>PostScript</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="145"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="143"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation>YAML</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="404"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="408"/>
         <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source>
         <translation>XML-Dateien (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="676"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="683"/>
         <source>PostScript Files (*.ps)</source>
         <translation>PostScript-Dateien (*.ps)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="474"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="478"/>
         <source>YAML Files (*.yaml *.yml)</source>
         <translation>YAML-Dateien (*.yaml *.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="679"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="686"/>
         <source>YAML Files (*.yml)</source>
         <translation>YAML-Dateien (*.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="171"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="172"/>
         <source>Pygments</source>
         <translation>Pygments</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="365"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="369"/>
         <source>Python Files (*.py *.py2 *.py3)</source>
         <translation>Python-Dateien (*.py *.py2 *.py3)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="368"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="372"/>
         <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source>
         <translation>Python-GUI-Dateien (*.pyw *.pyw2 *.pyw3)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="538"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="545"/>
         <source>Python3 Files (*.py)</source>
         <translation>Python 3-Dateien (*.py)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="544"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="551"/>
         <source>Python3 GUI Files (*.pyw)</source>
         <translation>Python 3-GUI-Dateien (*.pyw)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="535"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="542"/>
         <source>Python2 Files (*.py2)</source>
         <translation>Python 2-Dateien (*.py2)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="541"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="548"/>
         <source>Python2 GUI Files (*.pyw2)</source>
         <translation>Python 2-GUI-Dateien (*.pyw2)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation>Python 2</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation>Python 3</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Matlab</source>
-        <translation>Matlab</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Octave</source>
-        <translation>Octave</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Matlab Files (*.m *.m.matlab)</source>
-        <translation>Matlab-Dateien (*.m *.m.matlab)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation>Matlab-Dateien (*.m)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation>Octave-Dateien (*.m.octave)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation>Octave-Dateien (*.m *.m.octave)</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation>Python 2</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation>Python 3</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <source>Matlab</source>
+        <translation>Matlab</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
+        <source>Octave</source>
+        <translation>Octave</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="481"/>
+        <source>Matlab Files (*.m *.m.matlab)</source>
+        <translation>Matlab-Dateien (*.m *.m.matlab)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation>Matlab-Dateien (*.m)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation>Octave-Dateien (*.m.octave)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation>Octave-Dateien (*.m *.m.octave)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
         <source>QSS</source>
         <translation>QSS</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="157"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="153"/>
         <source>Gettext</source>
         <translation>Gettext</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="695"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="698"/>
         <source>Gettext Files (*.po)</source>
         <translation>Gettext-Dateien (*.po)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="162"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="158"/>
         <source>CoffeeScript</source>
         <translation>CoffeeScript</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="702"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="705"/>
         <source>CoffeeScript Files (*.coffee)</source>
         <translation>CoffeeScript Dateien (*.coffee)</translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="163"/>
+        <source>JSON</source>
+        <translation>JSON</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="712"/>
+        <source>JSON Files (*.json)</source>
+        <translation>JSON-Dateien (*.json)</translation>
+    </message>
 </context>
 <context>
     <name>LfConvertDataDialog</name>
@@ -39630,27 +39660,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1526"/>
+        <location filename="../Preferences/__init__.py" line="1530"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties-Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Wähle den Python{0}-Interpreter</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python{0}-Interpreter aus:</translation>
     </message>
--- a/i18n/eric6_empty.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_empty.ts	Sat Jan 14 14:12:42 2017 +0100
@@ -390,7 +390,7 @@
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1681,7 +1681,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2409,12 +2409,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2517,7 +2517,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,7 +2862,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
         <source>ClickToFlash Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4771,7 +4771,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7314,7 +7314,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7763,92 +7763,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
         <source>No to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
         <source>Restore defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
         <source>Save all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
         <source>Yes to all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9848,7 +9848,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/>
         <source>Add from installed APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9858,7 +9858,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/>
         <source>Add from Plugin APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9868,7 +9868,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11009,7 +11009,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11019,7 +11019,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
         <source>Fill to end of line</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11276,12 +11276,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/>
         <source>Select whether folding of comments shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11291,22 +11291,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
         <source>Select whether folding at else statement should be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
         <source>Fold at else</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/>
         <source>Select whether folding of preprocessor directives shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/>
         <source>Fold preprocessor directives</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11396,7 +11396,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
         <source>Highlight escape sequences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11536,340 +11536,355 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
         <source>Pascal Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/>
-        <source>Select to enable smart highlighting of keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
-        <source>Perl Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
+        <source>Select to enable smart highlighting of keywords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
-        <source>Fold packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/>
-        <source>Select to enable folding of Perl POD blocks</source>
+        <source>Smart Highlighting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <source>Perl Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
+        <source>Fold packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/>
+        <source>Select to enable folding of Perl POD blocks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/>
         <source>Fold POD blocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/>
         <source>PostScript Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/>
         <source>Select to mark tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/>
         <source>PostScript Level:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/>
         <source>Select the PostScript level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/>
-        <source>Povray Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/>
-        <source>Select whether folding of directives shall be possible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
-        <source>Fold directives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
-        <source>Properties Lexer Properties</source>
+        <source>Povray Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
-        <source>Select to allow initial spaces in a line</source>
+        <source>Select whether folding of directives shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
-        <source>Allow initial spaces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/>
-        <source>Python Lexer Properties</source>
+        <source>Fold directives</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/>
+        <source>Properties Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
-        <source>Select whether folding of strings shall be possible</source>
+        <source>Select to allow initial spaces in a line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
-        <source>Fold strings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
-        <source>Select whether folding of triple quoted strings shall be possible</source>
+        <source>Allow initial spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
+        <source>Python Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/>
+        <source>Select whether folding of strings shall be possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
+        <source>Fold strings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/>
+        <source>Select whether folding of triple quoted strings shall be possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/>
         <source>Fold triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/>
         <source>Select whether text should be autoindented after a &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/>
         <source>Auto indentation after &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/>
         <source>Select to allow strings to span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/>
         <source>Strings may span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/>
         <source>Select to allow Python v2 unicode string literals (e.g. u&quot;utf8&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/>
         <source>Allow v2 unicode string literals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/>
         <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/>
-        <source>Allow v3 binary and octal literals</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/>
-        <source>Select to allow Python v3 bytes string literals (e.g. b&quot;bytes&quot;)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/>
-        <source>Allow v3 bytes string literals</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/>
-        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/>
-        <source>Highlight sub-identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
+        <source>Allow v3 binary and octal literals</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/>
+        <source>Select to allow Python v3 bytes string literals (e.g. b&quot;bytes&quot;)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/>
+        <source>Allow v3 bytes string literals</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/>
+        <source>Select to highlight sub-identifiers defined in keyword set 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/>
+        <source>Highlight sub-identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/>
         <source>Highlight bad indentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/>
         <source>Select whether bad indentation shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/>
         <source>Ruby Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/>
-        <source>SQL Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/>
-        <source>Select whether only BEGIN blocks can be folded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
+        <source>SQL Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/>
+        <source>Select whether only BEGIN blocks can be folded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/>
         <source>Only BEGIN blocks can be folded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/>
         <source>Select to enable Backslash Escapes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/>
         <source>Select if words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/>
         <source>Words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/>
         <source>Select to allow &apos;#&apos; as a comment character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/>
         <source>Allow &apos;#&apos; as comment character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/>
         <source>Select to enable quoted identifiers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <source>Enable quoted identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
-        <source>Treat \if&lt;unknown&gt; as command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/>
-        <source>VHDL Lexer Properties</source>
+        <source>TeX Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
-        <source>Select whether folding of blocks at a parenthesis shall be possible</source>
+        <source>Select to treat comments as TeX source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
-        <source>Fold at parenthesis</source>
+        <source>Treat comments as TeX source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
-        <source>Select whether folding of begin blocks shall be possible</source>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
+        <source>Treat \if&lt;unknown&gt; as command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
+        <source>VHDL Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/>
+        <source>Select whether folding of blocks at a parenthesis shall be possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/>
+        <source>Fold at parenthesis</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/>
+        <source>Select whether folding of begin blocks shall be possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/>
         <source>Fold at begin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/>
         <source>YAML Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs after Spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <source>JSON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/>
+        <source>Select to enable highlighting of line/block comments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/>
+        <source>Highlight comments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
@@ -12595,7 +12610,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13249,7 +13264,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.ui" line="13"/>
+        <location filename="../UI/EmailDialog.py" line="339"/>
         <source>Send bug report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14642,12 +14657,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
         <source>Permission</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14662,7 +14677,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
         <source>Geolocation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15782,7 +15797,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15792,7 +15807,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
         <source>Origin:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15827,7 +15842,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
         <source>Remove Cookie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16252,7 +16267,7 @@
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
     <message>
-        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
+        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
         <source>GreaseMonkey Script Installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21835,7 +21850,7 @@
 <context>
     <name>HgAddSubrepositoryDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
         <source>Add Sub-repository</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23010,7 +23025,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
         <source>Resolved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23020,7 +23035,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
         <source>Unresolved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23597,7 +23612,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23969,7 +23984,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24110,7 +24125,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
         <source>Mercurial Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24180,7 +24195,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24190,7 +24205,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24200,7 +24215,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28063,7 +28078,7 @@
 <context>
     <name>HgStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
         <source>Mercurial Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28084,7 +28099,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28169,7 +28184,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29583,7 +29598,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34477,12 +34492,12 @@
 <context>
     <name>Lexers</name>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="365"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="369"/>
         <source>Python Files (*.py *.py2 *.py3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="538"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="545"/>
         <source>Python3 Files (*.py)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34567,480 +34582,490 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
         <source>Pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
-        <source>Perl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
-        <source>PostScript</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
-        <source>Povray</source>
+        <source>Perl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
-        <source>Properties</source>
+        <source>PostScript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
+        <source>Povray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
+        <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
-        <source>QSS</source>
+        <source>Python2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
-        <source>Ruby</source>
+        <source>Python3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
-        <source>SQL</source>
+        <source>QSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
-        <source>TCL</source>
+        <source>Ruby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
-        <source>TeX</source>
+        <source>SQL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
+        <source>TCL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
-        <source>XML</source>
+        <source>TeX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="143"/>
+        <source>VHDL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="145"/>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
         <source>Matlab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
         <source>Octave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="157"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="153"/>
         <source>Gettext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="162"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="158"/>
         <source>CoffeeScript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="171"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="172"/>
         <source>Pygments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="368"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="372"/>
         <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="547"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="554"/>
         <source>Pyrex Files (*.pyx)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
         <source>Quixote Template Files (*.ptl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
         <source>Ruby Files (*.rb)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
         <source>IDL Files (*.idl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
         <source>C Files (*.h *.c)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
         <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
         <source>C# Files (*.cs)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
         <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
         <source>CSS Files (*.css)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
         <source>QSS Files (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
         <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="404"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="408"/>
         <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
         <source>Qt Resource Files (*.qrc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
         <source>D Files (*.d *.di)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
         <source>Java Files (*.java)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
         <source>SQL Files (*.sql)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
         <source>Docbook Files (*.docbook)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
         <source>Perl Files (*.pl *.pm *.ph)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
         <source>Lua Files (*.lua)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
         <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
         <source>Shell Files (*.sh)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
         <source>Batch Files (*.bat *.cmd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
         <source>Diff Files (*.diff *.patch)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
         <source>Makefiles (*.mak)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="446"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="450"/>
         <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
         <source>Povray Files (*.pov)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
         <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
         <source>VHDL Files (*.vhd *.vhdl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="459"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="463"/>
         <source>TCL/Tk Files (*.tcl *.tk)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="462"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="466"/>
         <source>Fortran Files (*.f90 *.f95 *.f2k)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="465"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="469"/>
         <source>Fortran77 Files (*.f *.for)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="468"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="472"/>
         <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="676"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="683"/>
         <source>PostScript Files (*.ps)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="474"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="478"/>
         <source>YAML Files (*.yaml *.yml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="481"/>
         <source>Matlab Files (*.m *.m.matlab)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
         <source>Octave Files (*.m *.m.octave)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="695"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="698"/>
         <source>Gettext Files (*.po)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="702"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="705"/>
         <source>CoffeeScript Files (*.coffee)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
         <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="535"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="542"/>
         <source>Python2 Files (*.py2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="541"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="548"/>
         <source>Python2 GUI Files (*.pyw2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="544"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="551"/>
         <source>Python3 GUI Files (*.pyw)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="559"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="566"/>
         <source>C Files (*.c)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="562"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="569"/>
         <source>C++ Files (*.cpp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="565"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="572"/>
         <source>C++/C Header Files (*.h)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="571"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="578"/>
         <source>HTML Files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="574"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="581"/>
         <source>PHP Files (*.php)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="577"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="584"/>
         <source>ASP Files (*.asp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="586"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="593"/>
         <source>XML Files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="589"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="596"/>
         <source>XSL Files (*.xsl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="592"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="599"/>
         <source>DTD Files (*.dtd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="598"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="605"/>
         <source>D Files (*.d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="601"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="608"/>
         <source>D Interface Files (*.di)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="616"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="623"/>
         <source>Perl Files (*.pl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="619"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="626"/>
         <source>Perl Module Files (*.pm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="628"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="635"/>
         <source>Batch Files (*.bat)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="631"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="638"/>
         <source>TeX Files (*.tex)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="634"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="641"/>
         <source>TeX Template Files (*.sty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="637"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="644"/>
         <source>Diff Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="640"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="647"/>
         <source>Make Files (*.mak)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="643"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="650"/>
         <source>Properties Files (*.ini)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="646"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="653"/>
         <source>Configuration Files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="652"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="659"/>
         <source>CMake Files (CMakeLists.txt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="655"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="662"/>
         <source>CMake Macro Files (*.cmake)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="658"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="665"/>
         <source>VHDL Files (*.vhd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="661"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="668"/>
         <source>TCL Files (*.tcl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="664"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="671"/>
         <source>Tk Files (*.tk)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="667"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="674"/>
         <source>Fortran Files (*.f95)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="670"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="677"/>
         <source>Fortran77 Files (*.f)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="673"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="680"/>
         <source>Pascal Files (*.pas)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="679"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="686"/>
         <source>YAML Files (*.yml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
         <source>Matlab Files (*.m)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
         <source>Octave Files (*.m.octave)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="163"/>
+        <source>JSON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="712"/>
+        <source>JSON Files (*.json)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LfConvertDataDialog</name>
@@ -35712,92 +35737,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
         <source>Save all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
         <source>Yes to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
         <source>No to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
         <source>Restore defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37482,7 +37507,7 @@
 <context>
     <name>NoCacheHostsDialog</name>
     <message>
-        <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
+        <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
         <source>Not Cached Hosts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37590,7 +37615,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38260,7 +38285,7 @@
 <context>
     <name>PasswordsDialog</name>
     <message>
-        <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
         <source>Saved Passwords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39423,27 +39448,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1526"/>
+        <location filename="../Preferences/__init__.py" line="1530"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43009,7 +43034,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43040,7 +43065,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43095,7 +43120,7 @@
 <context>
     <name>PyProfileDialog</name>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47677,7 +47702,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
         <source>Remove Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47687,7 +47712,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
         <source>Remove Attributes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49173,7 +49198,7 @@
 <context>
     <name>SendRefererWhitelistDialog</name>
     <message>
-        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
         <source>Send Referer Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50162,7 +50187,7 @@
 <context>
     <name>SnapWidget</name>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52942,7 +52967,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
         <source>Subversion Diff</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53244,17 +53269,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53690,7 +53715,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
         <source>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53783,7 +53808,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
         <source>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55004,7 +55029,7 @@
 <context>
     <name>SvnStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55025,7 +55050,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60461,7 +60486,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_en.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_en.ts	Sat Jan 14 14:12:42 2017 +0100
@@ -390,7 +390,7 @@
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1681,7 +1681,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2399,12 +2399,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2512,7 +2512,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2862,7 +2862,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
         <source>ClickToFlash Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4778,7 +4778,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7321,7 +7321,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7767,92 +7767,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
         <source>No to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
         <source>Restore defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
         <source>Save all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
         <source>Yes to all</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9867,7 +9867,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/>
         <source>Add from installed APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9877,7 +9877,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/>
         <source>Add from Plugin APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9887,7 +9887,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11023,7 +11023,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11033,7 +11033,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
         <source>Fill to end of line</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11290,12 +11290,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/>
         <source>Select whether folding of comments shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11305,22 +11305,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
         <source>Select whether folding at else statement should be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
         <source>Fold at else</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/>
         <source>Select whether folding of preprocessor directives shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/>
         <source>Fold preprocessor directives</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11430,187 +11430,187 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
         <source>Pascal Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/>
-        <source>Select to enable smart highlighting of keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
-        <source>Perl Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
+        <source>Select to enable smart highlighting of keywords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
-        <source>Fold packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/>
-        <source>Select to enable folding of Perl POD blocks</source>
+        <source>Smart Highlighting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <source>Perl Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
+        <source>Fold packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/>
+        <source>Select to enable folding of Perl POD blocks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/>
         <source>Fold POD blocks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="565"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="594"/>
         <source>PostScript Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="581"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="610"/>
         <source>Select to mark tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/>
         <source>PostScript Level:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="600"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="629"/>
         <source>Select the PostScript level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="637"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
         <source>Povray Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
         <source>Select whether folding of directives shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
         <source>Python Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="796"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="825"/>
         <source>Select whether bad indentation shall be highlighted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="730"/>
         <source>Select whether folding of strings shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="750"/>
         <source>Select whether text should be autoindented after a &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/>
         <source>Auto indentation after &apos;:&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="770"/>
         <source>Select to allow Python v2 unicode string literals (e.g. u&quot;utf8&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="773"/>
         <source>Allow v2 unicode string literals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="780"/>
         <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
         <source>Allow v3 binary and octal literals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="761"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="790"/>
         <source>Select to allow Python v3 bytes string literals (e.g. b&quot;bytes&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="793"/>
         <source>Allow v3 bytes string literals</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="827"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
         <source>SQL Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="863"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="892"/>
         <source>Select to enable Backslash Escapes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="964"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
         <source>VHDL Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="999"/>
         <source>Select whether folding of blocks at a parenthesis shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1002"/>
         <source>Fold at parenthesis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1009"/>
         <source>Select whether folding of begin blocks shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1012"/>
         <source>Fold at begin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1013"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1042"/>
         <source>YAML Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11645,112 +11645,112 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="695"/>
         <source>Properties Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="672"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
         <source>Select to allow initial spaces in a line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
         <source>Allow initial spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="740"/>
         <source>Select whether folding of triple quoted strings shall be possible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="743"/>
         <source>Fold triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="760"/>
         <source>Select to allow strings to span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="763"/>
         <source>Strings may span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="837"/>
         <source>Ruby Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="853"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="882"/>
         <source>Select whether only BEGIN blocks can be folded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="856"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="885"/>
         <source>Only BEGIN blocks can be folded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="873"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="902"/>
         <source>Select if words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="876"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="905"/>
         <source>Words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="883"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="912"/>
         <source>Select to allow &apos;#&apos; as a comment character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="886"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="915"/>
         <source>Allow &apos;#&apos; as comment character</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="893"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="922"/>
         <source>Select to enable quoted identifiers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <source>Enable quoted identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <source>Select to treat comments as TeX source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <source>Treat comments as TeX source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11760,7 +11760,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="774"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="803"/>
         <source>Highlight sub-identifiers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11770,7 +11770,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="771"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="800"/>
         <source>Select to highlight sub-identifiers defined in keyword set 2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11825,32 +11825,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/>
         <source>Highlight bad indentation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs after Spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11870,7 +11870,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="194"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
         <source>Highlight escape sequences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -11884,6 +11884,21 @@
         <source>Allow verbatim string escape sequences</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="477"/>
+        <source>JSON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="483"/>
+        <source>Select to enable highlighting of line/block comments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="486"/>
+        <source>Highlight comments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
@@ -12544,7 +12559,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13263,7 +13278,7 @@
 <context>
     <name>EmailDialog</name>
     <message>
-        <location filename="../UI/EmailDialog.ui" line="13"/>
+        <location filename="../UI/EmailDialog.py" line="339"/>
         <source>Send bug report</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14656,12 +14671,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
         <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
         <source>Permission</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14676,7 +14691,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
         <source>Geolocation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15798,7 +15813,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15808,7 +15823,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
         <source>Origin:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15843,7 +15858,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
         <source>Remove Cookie</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16268,7 +16283,7 @@
 <context>
     <name>GreaseMonkeyAddScriptDialog</name>
     <message>
-        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
+        <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
         <source>GreaseMonkey Script Installation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -21856,7 +21871,7 @@
 <context>
     <name>HgAddSubrepositoryDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
         <source>Add Sub-repository</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23031,7 +23046,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
         <source>Resolved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23041,7 +23056,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
         <source>Unresolved</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23618,7 +23633,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23990,7 +24005,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
         <source>Edit Plan</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24131,7 +24146,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
         <source>Mercurial Log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24171,17 +24186,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28087,7 +28102,7 @@
 <context>
     <name>HgStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
         <source>Mercurial Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28228,7 +28243,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28348,7 +28363,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
         <source>Differences</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29613,7 +29628,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34595,490 +34610,500 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
         <source>Pascal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
-        <source>Perl</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
-        <source>PostScript</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
-        <source>Povray</source>
+        <source>Perl</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
+        <source>PostScript</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
+        <source>Povray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
-        <source>Ruby</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
-        <source>SQL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
-        <source>TCL</source>
+        <source>Ruby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
-        <source>TeX</source>
+        <source>SQL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
+        <source>TCL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
-        <source>XML</source>
+        <source>TeX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="143"/>
+        <source>VHDL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="145"/>
+        <source>XML</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="171"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="172"/>
         <source>Pygments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="365"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="369"/>
         <source>Python Files (*.py *.py2 *.py3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="368"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="372"/>
         <source>Python GUI Files (*.pyw *.pyw2 *.pyw3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="547"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="554"/>
         <source>Pyrex Files (*.pyx)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
         <source>Quixote Template Files (*.ptl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
         <source>Ruby Files (*.rb)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
         <source>IDL Files (*.idl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
         <source>C Files (*.h *.c)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
         <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
         <source>C# Files (*.cs)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
         <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
         <source>CSS Files (*.css)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
         <source>QSS Files (*.qss)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
         <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="404"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="408"/>
         <source>XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
         <source>Qt Resource Files (*.qrc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
         <source>D Files (*.d *.di)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
         <source>Java Files (*.java)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
         <source>SQL Files (*.sql)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
         <source>Docbook Files (*.docbook)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
         <source>Perl Files (*.pl *.pm *.ph)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
         <source>Lua Files (*.lua)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
         <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
         <source>Shell Files (*.sh)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
         <source>Batch Files (*.bat *.cmd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
         <source>Diff Files (*.diff *.patch)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
         <source>Makefiles (*.mak)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="446"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="450"/>
         <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
         <source>Povray Files (*.pov)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
         <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
         <source>VHDL Files (*.vhd *.vhdl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="459"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="463"/>
         <source>TCL/Tk Files (*.tcl *.tk)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="462"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="466"/>
         <source>Fortran Files (*.f90 *.f95 *.f2k)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="465"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="469"/>
         <source>Fortran77 Files (*.f *.for)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="468"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="472"/>
         <source>Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="676"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="683"/>
         <source>PostScript Files (*.ps)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="474"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="478"/>
         <source>YAML Files (*.yaml *.yml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
         <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="538"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="545"/>
         <source>Python3 Files (*.py)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="544"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="551"/>
         <source>Python3 GUI Files (*.pyw)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="559"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="566"/>
         <source>C Files (*.c)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="562"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="569"/>
         <source>C++ Files (*.cpp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="565"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="572"/>
         <source>C++/C Header Files (*.h)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="571"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="578"/>
         <source>HTML Files (*.html)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="574"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="581"/>
         <source>PHP Files (*.php)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="577"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="584"/>
         <source>ASP Files (*.asp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="586"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="593"/>
         <source>XML Files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="589"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="596"/>
         <source>XSL Files (*.xsl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="592"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="599"/>
         <source>DTD Files (*.dtd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="598"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="605"/>
         <source>D Files (*.d)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="601"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="608"/>
         <source>D Interface Files (*.di)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="616"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="623"/>
         <source>Perl Files (*.pl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="619"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="626"/>
         <source>Perl Module Files (*.pm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="628"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="635"/>
         <source>Batch Files (*.bat)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="631"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="638"/>
         <source>TeX Files (*.tex)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="634"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="641"/>
         <source>TeX Template Files (*.sty)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="637"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="644"/>
         <source>Diff Files (*.diff)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="640"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="647"/>
         <source>Make Files (*.mak)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="643"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="650"/>
         <source>Properties Files (*.ini)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="646"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="653"/>
         <source>Configuration Files (*.cfg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="652"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="659"/>
         <source>CMake Files (CMakeLists.txt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="655"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="662"/>
         <source>CMake Macro Files (*.cmake)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="658"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="665"/>
         <source>VHDL Files (*.vhd)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="661"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="668"/>
         <source>TCL Files (*.tcl)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="664"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="671"/>
         <source>Tk Files (*.tk)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="667"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="674"/>
         <source>Fortran Files (*.f95)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="670"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="677"/>
         <source>Fortran77 Files (*.f)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="673"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="680"/>
         <source>Pascal Files (*.pas)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="679"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="686"/>
         <source>YAML Files (*.yml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="535"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="542"/>
         <source>Python2 Files (*.py2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="541"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="548"/>
         <source>Python2 GUI Files (*.pyw2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Matlab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Octave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Matlab Files (*.m *.m.matlab)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <source>Matlab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="117"/>
+        <source>Octave</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="481"/>
+        <source>Matlab Files (*.m *.m.matlab)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="133"/>
         <source>QSS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="157"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="153"/>
         <source>Gettext</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="695"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="698"/>
         <source>Gettext Files (*.po)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="162"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="158"/>
         <source>CoffeeScript</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="702"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="705"/>
         <source>CoffeeScript Files (*.coffee)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="163"/>
+        <source>JSON</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="712"/>
+        <source>JSON Files (*.json)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LfConvertDataDialog</name>
@@ -35735,92 +35760,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
         <source>Save all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
         <source>Yes to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
         <source>No to all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
         <source>Restore defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
+        <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37520,7 +37545,7 @@
 <context>
     <name>NoCacheHostsDialog</name>
     <message>
-        <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
+        <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
         <source>Not Cached Hosts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -37628,7 +37653,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38298,7 +38323,7 @@
 <context>
     <name>PasswordsDialog</name>
     <message>
-        <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
         <source>Saved Passwords</source>
         <translation type="unfinished"></translation>
     </message>
@@ -39461,27 +39486,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../Preferences/__init__.py" line="1526"/>
+        <location filename="../Preferences/__init__.py" line="1530"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select the Python{0} interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43048,7 +43073,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43127,7 +43152,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -43135,7 +43160,7 @@
 <context>
     <name>PyProfileDialog</name>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47727,7 +47752,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
         <source>Remove Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -47737,7 +47762,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
         <source>Remove Attributes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -49213,7 +49238,7 @@
 <context>
     <name>SendRefererWhitelistDialog</name>
     <message>
-        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
+        <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
         <source>Send Referer Whitelist</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50413,7 +50438,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation type="unfinished"></translation>
     </message>
@@ -52983,7 +53008,7 @@
 <context>
     <name>SvnDiffDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
         <source>Subversion Diff</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53285,17 +53310,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
         <source>Revision</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53747,7 +53772,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
         <source>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -53839,7 +53864,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
         <source>&amp;URL:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55045,7 +55070,7 @@
 <context>
     <name>SvnStatusDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation type="unfinished"></translation>
     </message>
@@ -55321,7 +55346,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
         <source>Commit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -60502,7 +60527,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_es.ts	Sat Jan 14 14:12:42 2017 +0100
@@ -390,7 +390,7 @@
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+        <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
         <source>Add Bookmark</source>
         <translation>Añadir Marcador</translation>
     </message>
@@ -1724,7 +1724,7 @@
         <translation>Editar &amp;Dirección</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation>&amp;Borrar</translation>
     </message>
@@ -2421,12 +2421,12 @@
         <translation>Pulsar para guardar el trazado de llamadas como archivo de texto</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation>Desde</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation>Hasta</translation>
     </message>
@@ -2592,7 +2592,7 @@
         <translation>Pulsar para cancelar la edición compartida</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
@@ -2892,7 +2892,7 @@
 <context>
     <name>ClickToFlashWhitelistDialog</name>
     <message>
-        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+        <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
         <source>ClickToFlash Whitelist</source>
         <translation>Lista Blanca de ClickToFlash</translation>
     </message>
@@ -4816,7 +4816,7 @@
         <translation>Dominio:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation>&lt;no hay cookie seleccionada&gt;</translation>
     </message>
@@ -7385,7 +7385,7 @@
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+        <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
         <source>Downloads</source>
         <translation>Descargas</translation>
     </message>
@@ -7844,92 +7844,92 @@
         <translation>Botones Estándar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
         <source>No to all</source>
         <translation>No a todo</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
         <source>Reset</source>
         <translation>Restaurar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
         <source>Restore defaults</source>
         <translation>Restaurar valores por defecto</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
         <source>Retry</source>
         <translation>Reintentar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
         <source>Save all</source>
         <translation>Guardar todo</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+        <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
         <source>Yes to all</source>
         <translation>Si a todo</translation>
     </message>
@@ -9918,7 +9918,7 @@
         <translation>Presione para seleccionar un archivo API desde la lista de APIs instaladas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/>
         <source>Add from installed APIs</source>
         <translation>Añadir de las APIs instaladas</translation>
     </message>
@@ -9928,7 +9928,7 @@
         <translation>Pulse para compilar la definición de las APIs seleccionadas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation>Compilar APIs</translation>
     </message>
@@ -9983,7 +9983,7 @@
         <translation>Pulse para seleccionar un archivo de API de la lista de archivos de API instalados por los plugins</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="266"/>
         <source>Add from Plugin APIs</source>
         <translation>Añadir desde las APIs de plugins</translation>
     </message>
@@ -11085,7 +11085,7 @@
         <translation>Selecciona llenar hasta el fin de la línea.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
         <source>Fill to end of line</source>
         <translation>Llenar hasta el final de la línea</translation>
     </message>
@@ -11130,7 +11130,7 @@
         <translation>Selección de Fuente.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Fuente</translation>
     </message>
@@ -11372,12 +11372,12 @@
         <translation>Analizador léxico de Bash</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1048"/>
         <source>Select whether folding of comments shall be possible</source>
         <translation>Seleccionar si el plegado de comentarios será posible</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Plegado de comentarios</translation>
     </message>
@@ -11407,22 +11407,22 @@
         <translation>Indentar al abrir llave (&apos;{&apos;)</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="990"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1019"/>
         <source>Select whether folding at else statement should be possible</source>
         <translation>Seleccionar si el plegado en las sentencias else debe ser posible</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="993"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
         <source>Fold at else</source>
         <translation>Plegado en los else</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="493"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="522"/>
         <source>Select whether folding of preprocessor directives shall be possible</source>
         <translation>Seleccionar si el plegado de directivas de preprocesamiento debe ser posible</translation>
     </message>