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>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="496"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="525"/>
         <source>Fold preprocessor directives</source>
         <translation>Plegado en directivas de preprocesamiento</translation>
     </message>
@@ -11467,127 +11467,127 @@
         <translation>Etiquetas sensibles a mayúsculas/minúsculas</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>Propiedades del Analizador Léxico de Perl</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>Propiedades del Analizador Léxico de Povray</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>Selecciona si el plegado de directivas será posible</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>Plegado en directivas</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>Propiedades del Analizador Léxico de Python</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>Seleccionar si la indentación errónea debe ser resaltada</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>Seleccionar si el texto se debe autoindentar despues de un &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>Autoindentación despues de &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>Seleccionar si el plegado de cadenas debe ser posible</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Plegado de cadenas</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>Propiedades del Analizador Léxico de SQL</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>Seleccionar hara habilitar secuencias de Escape con Backslash</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation>Secuencias de Escape con Backslash</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>Propiedades del Analizador Léxico de VHDL</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>Seleccionar si el plegado de bloques en los paréntesis debe ser posible</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>Plegar en los paréntesis</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>Selecciona si el plegado de bloques begin debe ser posible</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>Plegar en begin</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>Propiedades del Analizador Léxico de Pascal</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>Propiedades del Analizador Léxico de PostScript</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>Seleccione para marcar 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>Marcar Tokens</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/>
         <source>PostScript Level:</source>
         <translation>Nivel de PostScript:</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>Seleccione el nivel de PostScript</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>Propiedades del Analizador Léxico de YAML</translation>
     </message>
@@ -11637,62 +11637,62 @@
         <translation>Estilos en los scripts</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>Seleccionar para permitir resaltado inteligente de palabras clave</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation>Resaltado inteligente</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Seleccionar para permitir plegado de paquetes Perl</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
+        <source>Smart Highlighting</source>
+        <translation>Resaltado inteligente</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Seleccionar para permitir plegado de paquetes Perl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
         <source>Fold packages</source>
         <translation>Plegado de paquetes</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>Seleccionar para permitir plegado de bloques POD de Perl</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>Plegado de bloques POD</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>Seleccionar para permitir literales de cadena unicode Python v2 (p. e. 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>Permitir literales de cadena unicode v2</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>Seleccionar para permitir literales binarios y octales Python v3 (p. e. 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>Permitir literales binarios y octales v3</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>Seleccionar para permitir literales de cadena de bytes Python v3 (p. e. 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>Permitir literales de cadena de bytes v3</translation>
     </message>
@@ -11727,112 +11727,112 @@
         <translation>Habilitar plantillas Mako</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>Propiedades del Analizador Léxico de Propiedades</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>Seleccionar para permitir espacios al inicio en una línea</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>Permitir espacios al inicio</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>Seleccionar si el plegado de cadenas con triple comilla debe ser posible</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>Plegado de cadenas de triple comilla</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>Seleccionar para permitir a las cadenas generar caracteres de nueva línea</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>Las cadenas pueden generar caracteres de nueva línea</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>Propiedades del Analizador Léxico de Ruby</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>Selecciona si solamente los bloques BEGIN pueden ser plegados</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>Solamente los bloques BEGIN pueden ser plegados</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>Seleccionar si las palabras pueden contener puntos</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>Las palabras pueden contener puntos</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>Seleccionar para permitir &apos;#&apos; como carácter de comentario</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>Permitir &apos;#&apos; como carácter de comentario</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>Seleccionar para habilitar identificadores entre comillas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation>Habilitar identificadores entre comillas</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation>Propiedades del Analizador Léxico de TCL</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation>Propiedades del Analizador Léxico de TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation>Seleccionar para tratar comentarios como fuente TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation>Tratar comentarios como fuente TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
-        <translation>Seleccionar para tratar \if&lt;unknown&gt; como un comando</translation>
+        <source>Enable quoted identifiers</source>
+        <translation>Habilitar identificadores entre comillas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
+        <translation>Propiedades del Analizador Léxico de TCL</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation>Propiedades del Analizador Léxico de TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <source>Select to treat comments as TeX source</source>
+        <translation>Seleccionar para tratar comentarios como fuente TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <source>Treat comments as TeX source</source>
+        <translation>Tratar comentarios como fuente TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation>Seleccionar para tratar \if&lt;unknown&gt; como un comando</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation>Tratar \if&lt;unknown&gt; como comando</translation>
     </message>
@@ -11842,7 +11842,7 @@
         <translation>Resaltar cadenas de triple comilla</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>Resaltar sub-identificadores</translation>
     </message>
@@ -11852,7 +11852,7 @@
         <translation>Seleccionar para resaltar cadenas de triple comilla</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>Seleccionar para resaltar sub-identificadores definidos en el conjunto de palabras clave 2</translation>
     </message>
@@ -11907,32 +11907,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>Resaltar indentación errónea:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation>Sin Advertencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation>Inconsistente</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>Tabuladores despues de Espacios</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation>Espacios</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation>Tabuladores</translation>
     </message>
@@ -11952,7 +11952,7 @@
         <translation>Seleccionar para resaltar secuencias de escape</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>Resaltar secuencias de escape</translation>
     </message>
@@ -11966,6 +11966,21 @@
         <source>Allow verbatim string escape sequences</source>
         <translation>Permitir secuencias de escape con cadenas literales</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>
@@ -12561,7 +12576,7 @@
         <translation>Modo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
@@ -13355,7 +13370,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>Enviar informe de bugs</translation>
     </message>
@@ -14751,12 +14766,12 @@
         <translation>Notificaciones</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
         <source>Permission</source>
         <translation>Permiso</translation>
     </message>
@@ -14771,7 +14786,7 @@
         <translation>Eliminar Todo</translation>
     </message>
     <message>
-        <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+        <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
         <source>Geolocation</source>
         <translation>Geolocalización</translation>
     </message>
@@ -15895,7 +15910,7 @@
         <translation>Nombre:</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>&lt;no hay cookie de flash seleccionada&gt;</translation>
     </message>
@@ -15905,7 +15920,7 @@
         <translation>Tamaño:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
         <source>Origin:</source>
         <translation>Origen:</translation>
     </message>
@@ -15940,7 +15955,7 @@
         <translation>Pulsar para eliminar las cookies de flash seleccionadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
         <source>Remove Cookie</source>
         <translation>Eliminar Cookie</translation>
     </message>
@@ -16368,7 +16383,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>Instalación de Script de GreaseMonkey</translation>
     </message>
@@ -21964,7 +21979,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>Añadir Sub-repositorio</translation>
     </message>
@@ -23147,7 +23162,7 @@
         <translation>Pulsar para marcar las entradas seleccionadas como &apos;resolved&apos;</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>Resolved</translation>
     </message>
@@ -23157,7 +23172,7 @@
         <translation>Pulsar para marcar las entradas seleccionadas como &apos;unresolved&apos;</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>Unresolved</translation>
     </message>
@@ -23750,7 +23765,7 @@
         <translation>Seleccionar la categoría sobre la que filtrar</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>Revisión</translation>
     </message>
@@ -24122,7 +24137,7 @@
         <translation>&lt;p&gt;El archivo &lt;b&gt;{0}&lt;/b&gt; no puede ser leído.&lt;/p&gt;&lt;p&gt;Causa: {1}&lt;/p&gt;</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>Plan de Edición</translation>
     </message>
@@ -24263,7 +24278,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>Registro de Mercurial</translation>
     </message>
@@ -24293,17 +24308,17 @@
         <translation>Seleccione el campo de filtrado</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>Revisión</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>Mensaje</translation>
     </message>
@@ -28239,7 +28254,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>
@@ -28381,7 +28396,7 @@
         <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation>Commit</translation>
     </message>
@@ -28501,7 +28516,7 @@
         <translation>todo</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>Diferencias</translation>
     </message>
@@ -29771,7 +29786,7 @@
         <translation>Pulse para eliminar las entradas seleccionadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
@@ -34745,317 +34760,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>Propiedades</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>Archivos Pyrex(*.pyx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
+        <source>Quixote Template Files (*.ptl)</source>
+        <translation>Archivos de Plantilla Quixote (*.ptl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
+        <source>Ruby Files (*.rb)</source>
+        <translation>Archivos Ruby (*.rb)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
+        <source>IDL Files (*.idl)</source>
+        <translation>Archivos IDL (*.idl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
+        <source>C Files (*.h *.c)</source>
+        <translation>Archivos C (*.h *.c)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
+        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
+        <translation>Archivos C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
+        <source>C# Files (*.cs)</source>
+        <translation>Archivos C# (*.cs)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
+        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
+        <translation>Archivos HTML (*.html *.htm *.asp *.shtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
+        <source>CSS Files (*.css)</source>
+        <translation>Archivos CSS (*.css)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
+        <source>QSS Files (*.qss)</source>
+        <translation>Archivos QSS (*.qss)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
+        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
+        <translation>Archivos PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
+        <source>Qt Resource Files (*.qrc)</source>
+        <translation>Archivos de Recursos Qt (*.qrc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
+        <source>D Files (*.d *.di)</source>
+        <translation>Archivos D (*.d *.di)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
+        <source>Java Files (*.java)</source>
+        <translation>Archivos Java (*.java)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
+        <source>JavaScript Files (*.js)</source>
+        <translation>Archivos JavaScript (*.js)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
+        <source>SQL Files (*.sql)</source>
+        <translation>Archivos SQL (*.sql)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
+        <source>Docbook Files (*.docbook)</source>
+        <translation>Archivos DocBook (*.docbook)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
+        <source>Perl Files (*.pl *.pm *.ph)</source>
+        <translation>Archivos Perl (*.pl *.pm *.ph)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
+        <source>Lua Files (*.lua)</source>
+        <translation>Archivos Lua (^.lua)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
+        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
+        <translation>Archivos TeX (*.tex *.sty *.aux *.toc *.idx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
+        <source>Shell Files (*.sh)</source>
+        <translation>Archivos Shell (*.sh)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
+        <source>Batch Files (*.bat *.cmd)</source>
+        <translation>Archivos Batch (*.bat *.cmd)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
+        <source>Diff Files (*.diff *.patch)</source>
+        <translation>Archivos Diff (*.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>Archivos de Propiedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
+        <source>Povray Files (*.pov)</source>
+        <translation>Archivos Povray (*.pov)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
+        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
+        <translation>Archivos CMake (CMakeLists.txt *.cmake *.ctest)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
+        <source>VHDL Files (*.vhd *.vhdl)</source>
+        <translation>Archivos VHDL (*.vhd *.vhdl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
+        <source>All Files (*)</source>
+        <translation>Todos los archivos (*)</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>Archivos Pyrex(*.pyx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
-        <source>Quixote Template Files (*.ptl)</source>
-        <translation>Archivos de Plantilla Quixote (*.ptl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
-        <source>Ruby Files (*.rb)</source>
-        <translation>Archivos Ruby (*.rb)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
-        <source>IDL Files (*.idl)</source>
-        <translation>Archivos IDL (*.idl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
-        <source>C Files (*.h *.c)</source>
-        <translation>Archivos C (*.h *.c)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
-        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
-        <translation>Archivos C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
-        <source>C# Files (*.cs)</source>
-        <translation>Archivos C# (*.cs)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
-        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
-        <translation>Archivos HTML (*.html *.htm *.asp *.shtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
-        <source>CSS Files (*.css)</source>
-        <translation>Archivos CSS (*.css)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
-        <source>QSS Files (*.qss)</source>
-        <translation>Archivos QSS (*.qss)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
-        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
-        <translation>Archivos PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
-        <source>Qt Resource Files (*.qrc)</source>
-        <translation>Archivos de Recursos Qt (*.qrc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
-        <source>D Files (*.d *.di)</source>
-        <translation>Archivos D (*.d *.di)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
-        <source>Java Files (*.java)</source>
-        <translation>Archivos Java (*.java)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
-        <source>JavaScript Files (*.js)</source>
-        <translation>Archivos JavaScript (*.js)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
-        <source>SQL Files (*.sql)</source>
-        <translation>Archivos SQL (*.sql)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
-        <source>Docbook Files (*.docbook)</source>
-        <translation>Archivos DocBook (*.docbook)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
-        <source>Perl Files (*.pl *.pm *.ph)</source>
-        <translation>Archivos Perl (*.pl *.pm *.ph)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
-        <source>Lua Files (*.lua)</source>
-        <translation>Archivos Lua (^.lua)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
-        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
-        <translation>Archivos TeX (*.tex *.sty *.aux *.toc *.idx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
-        <source>Shell Files (*.sh)</source>
-        <translation>Archivos Shell (*.sh)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
-        <source>Batch Files (*.bat *.cmd)</source>
-        <translation>Archivos Batch (*.bat *.cmd)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
-        <source>Diff Files (*.diff *.patch)</source>
-        <translation>Archivos Diff (*.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>Archivos de Propiedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
-        <source>Povray Files (*.pov)</source>
-        <translation>Archivos Povray (*.pov)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
-        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
-        <translation>Archivos CMake (CMakeLists.txt *.cmake *.ctest)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
-        <source>VHDL Files (*.vhd *.vhdl)</source>
-        <translation>Archivos VHDL (*.vhd *.vhdl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
-        <source>All Files (*)</source>
-        <translation>Todos los archivos (*)</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>Archivos TCL/Tk (*.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>Archivos C (*.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>Archivos C++ (*.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>Archivos de cabecera C++ (*.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>Archivos HTML (*.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>Archivos PHP (*.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>Archivos ASP (*.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>Archivos XML (*.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>Archivos XSL (*.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>Archivos DTD (*.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>Archivos D (*.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>Archivos de interfaces D (*.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>Archivos Perl (*.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>Archivos de módulo Perl (*.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>Archivos Batch (*.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>Archivos TeX (*.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>Archivos de plantilla TeX (*.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>Archivos Diff (*.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>Archivos Make (*.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>Archivos de Propiedades (*.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>Archivos de Configuración (*.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>Archivos CMake (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>Archivos de Macro CMake (*.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>Archivos VHDL (*.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>Archivos TCL (*.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>Archivos Tk (*.tk)</translation>
     </message>
@@ -35070,175 +35085,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="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>Archivos XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>Archivos Fortran (*.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>Archivos Fortran77 (*.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>Archivos Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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>Archivos PostScript (*.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>Archivos YAML (*.yaml *.yml)</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>Archivos Fortran (*.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>Archivos Fortran77 (*.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>Archivos Pascal (*.pas)</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>Archivos YAML (*.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>Archivos Python (*.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>Archivos de GUI Python (*.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>Archivos Python (*.py3)</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>Archivos de GUI Python3 (*.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>Archivos Python2 (*.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>Archivos de GUI Python2 (*.pyw2)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation>Python2</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation>Python3</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>Archivos Matlab (*.m *.m.matlab)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation>Archivos Matlab (*.m)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation>Archivos Octave (*.m.octave)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation>Archivos Octave (*.m *.m.octave)</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation>Python2</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation>Python3</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>Archivos Matlab (*.m *.m.matlab)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation>Archivos Matlab (*.m)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation>Archivos Octave (*.m.octave)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation>Archivos Octave (*.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>Archivos Gettext (*.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>Archivos CoffeeScript (*.coffee)</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>
@@ -35857,92 +35882,92 @@
         <translation>Botones Estándar</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>Aplicar</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>Abortar</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>Cancelar</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>Ignorar</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>Guardar todo</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>Guardar</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>Descartar</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>Si a todo</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>Abrir</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>Reiniciar</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>No</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>Ayuda</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>No a todo</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>Reintentar</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>Restaurar valores por defecto</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>Si</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>Cerrar</translation>
     </message>
@@ -37682,7 +37707,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>Hosts no en Caché</translation>
     </message>
@@ -37790,7 +37815,7 @@
         <translation>Pulsar para seleccionar la posición visualmente, soltar para asignar</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation>Selección Visual</translation>
     </message>
@@ -38463,7 +38488,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>Contraseñas Almacenadas</translation>
     </message>
@@ -39630,27 +39655,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>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</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>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Seleccionar intérprete de Python{0}</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>Seleccionar el intérprete de Python{0} a utilizar:</translation>
     </message>
@@ -43232,7 +43257,7 @@
         <translation>Ejecutadas</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Cobertura</translation>
     </message>
@@ -43312,7 +43337,7 @@
         </translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
         <source>%v/%m Files</source>
         <translation>%v/%m Archivos</translation>
     </message>
@@ -43320,7 +43345,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>Resultados de Profiling</translation>
     </message>
@@ -48054,7 +48079,7 @@
         <translation>Pulsar para eliminar los filtros seleccionados</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
         <source>Remove Filters</source>
         <translation>Eliminar Filtros</translation>
     </message>
@@ -48064,7 +48089,7 @@
         <translation>Pulsar para eliminar los atributos seleccionados</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+        <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
         <source>Remove Attributes</source>
         <translation>Eliminar Atributos</translation>
     </message>
@@ -49587,7 +49612,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>Enviar Lista Blanca de Referers</translation>
     </message>
@@ -50797,7 +50822,7 @@
         <translation>Copiar y Vista &amp;Preliminar</translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation>Captura de Pantalla de eric6</translation>
     </message>
@@ -53408,7 +53433,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>Diff de Subversion</translation>
     </message>
@@ -53711,17 +53736,17 @@
         <translation>Seleccione el campo de filtrado</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>Revisión</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>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
@@ -54176,7 +54201,7 @@
         <translation>&amp;Protocolo:</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>
@@ -54276,7 +54301,7 @@
         <translation>Seleccionar el protocolo para acceder al repositorio</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>
@@ -55486,7 +55511,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>Estado de Subversion</translation>
     </message>
@@ -55743,7 +55768,7 @@
         <translation>Error de Generación de Proceso</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>
@@ -60985,7 +61010,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Test Unitario</translation>
     </message>
--- a/i18n/eric6_fr.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_fr.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>Ajouter un signet</translation>
     </message>
@@ -1804,7 +1804,7 @@
         <translation>Éditer &amp;Adresse</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;Supprimer</translation>
     </message>
@@ -2512,12 +2512,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">De</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation type="unfinished">A</translation>
     </message>
@@ -2679,7 +2679,7 @@
         <translation>Cliquer pour annuler l&apos;éditeur partagé</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
@@ -2975,7 +2975,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>
@@ -4910,7 +4910,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>
@@ -7650,7 +7650,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>
@@ -8122,92 +8122,92 @@
         <translation type="unfinished">Boutons standards</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">Appliquer</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">Annuler</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">Fermer</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">Abondonner les modifications</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">Aide</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">Ignorer</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">Non</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">Non à tout</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">Ouvrir</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">Réinitialiser</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">Restaurer les valeurs par défaut</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">Réessayer</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">Tout enregistrer</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">Oui</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">Oui à tout</translation>
     </message>
@@ -10257,7 +10257,7 @@
         <translation>Cliquer pour sélectionner un fichier API à partir des fichiers installés</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>Ajouter à partir des APIs installés</translation>
     </message>
@@ -10267,7 +10267,7 @@
         <translation>Cliquer pour compiler les APIs sélectionnés</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation>Compiler les APIs</translation>
     </message>
@@ -10292,7 +10292,7 @@
         <translation>Cliquer pour sélectionner un fichier API à partir de  la liste des APIs installés pour les 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>Ajouter à partir des APIs de plugins</translation>
     </message>
@@ -11404,7 +11404,7 @@
         <translation>Cocher pour appliquer le style jusqu&apos;en fin de ligne.</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>Appliquer jusqu&apos;à la fin de ligne</translation>
     </message>
@@ -11449,7 +11449,7 @@
         <translation>Sélectionner la police.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
@@ -11696,12 +11696,12 @@
         <translation>Configuration de l&apos;analyse 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>Indique si les commentaires sur plusieurs lignes doivent être contractés</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Contraction des commentaires</translation>
     </message>
@@ -11731,22 +11731,22 @@
         <translation>Indentation parenthèse ouvrante</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>Indique si les instructions &quot;else&quot; doivent être contractées</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>Contraction des &quot;else&quot;</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>Indique si les instructions de préprocessing doivent être contractées</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>Contraction des instructions de préprocessing</translation>
     </message>
@@ -11791,127 +11791,127 @@
         <translation>Balises tiennent compte de la casse</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>Configuration pour Perl</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>Configuration de Povray</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>Cocher si le pliage de code doit être activé quand c&apos;est possible</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>Contraction de code pour les directives</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>Configuration pour Python</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>Sélectionner si les indentations incorrectes doivent être signalées</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>Indique si le texte doit être automatiquement indenté après &quot;:&quot;</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>Auto-indentation après &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>Indique si les chaines de caractères sur plusieurs lignes doivent être contractées</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Contraction des chaines de caractères</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>Configuration du SQL</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>Cocher pour activer l&apos;échappement avec Backslash</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation>Echappement avec Backslash</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>Configuration pour VHLD</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>Cocher pour plier le code entre des parenthèses quand c&apos;est possible</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>Contraction du code entre les parenthèses</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>Cocher pour plier le code entre les blocs begin quand c&apos;est possible</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>Contraction du code entre les &quot;begin&quot;</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>Configuration pour Pascal</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>Configuration pour PostScript</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>Cocher pour marquer les opérateurs &apos;tokens&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation>Marquer les &apos;tokens&apos;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="622"/>
         <source>PostScript Level:</source>
         <translation>Niveau de PostScript:</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>Sélectionne les niveau de PostScript</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>Configuration de YAML</translation>
     </message>
@@ -11961,62 +11961,62 @@
         <translation type="unfinished"></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 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="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
+        <source>Smart Highlighting</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="542"/>
+        <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="545"/>
+        <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="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>
@@ -12051,112 +12051,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>
@@ -12166,7 +12166,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>
@@ -12176,7 +12176,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>
@@ -12231,32 +12231,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>
@@ -12276,7 +12276,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>
@@ -12290,6 +12290,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>
@@ -12916,7 +12931,7 @@
         <translation>Mode:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Désactivé</translation>
     </message>
@@ -13713,7 +13728,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>Envoyer un rapport de bug</translation>
     </message>
@@ -15155,12 +15170,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>
@@ -15175,7 +15190,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>
@@ -16317,7 +16332,7 @@
         <translation type="unfinished">Nom:</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>
@@ -16327,7 +16342,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>
@@ -16362,7 +16377,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>
@@ -16788,7 +16803,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>
@@ -22446,7 +22461,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>
@@ -23622,7 +23637,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>
@@ -23632,7 +23647,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>
@@ -24252,7 +24267,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">Révision</translation>
     </message>
@@ -24624,7 +24639,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>
@@ -24765,7 +24780,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>
@@ -24795,17 +24810,17 @@
         <translation type="unfinished">Sélectionner le champ à filtrer</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">Révision</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">Auteur</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">Message</translation>
     </message>
@@ -28749,7 +28764,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>
@@ -28890,7 +28905,7 @@
         <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu&apos;il est bien dans le chemin de recherche.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation type="unfinished">Commit</translation>
     </message>
@@ -29010,7 +29025,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>
@@ -30277,7 +30292,7 @@
         <translation type="unfinished">Cliquer pour supprimer les entrées sélectionnées</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">Supp&amp;rimer</translation>
     </message>
@@ -35302,317 +35317,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>Propriétés</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>Fichiers Pyrex (*.pyx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
+        <source>Quixote Template Files (*.ptl)</source>
+        <translation>Fichiers gabarits Quixote (*.ptl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
+        <source>Ruby Files (*.rb)</source>
+        <translation>Fichiers Ruby (*.rb)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
+        <source>IDL Files (*.idl)</source>
+        <translation>Fichiers IDL (*.idl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
+        <source>C Files (*.h *.c)</source>
+        <translation>Fichiers C (*.h *.c)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
+        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
+        <translation>Fichiers C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
+        <source>C# Files (*.cs)</source>
+        <translation>Fichiers C# (*.cs)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
+        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
+        <translation>Fichiers HTML (*.html *.htm *.asp *.shtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
+        <source>CSS Files (*.css)</source>
+        <translation>Fichiers CSS (*.css)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
+        <source>QSS Files (*.qss)</source>
+        <translation>Fichiers QSS (*.qss)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
+        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
+        <translation>Fichiers PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
+        <source>Qt Resource Files (*.qrc)</source>
+        <translation>Fichiers Qt Resource (*.qrc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
+        <source>D Files (*.d *.di)</source>
+        <translation>Fichiers D (*.d *.di)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
+        <source>Java Files (*.java)</source>
+        <translation>Fichiers Java (*.java)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
+        <source>JavaScript Files (*.js)</source>
+        <translation>Fichiers JavaScript (*.js)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
+        <source>SQL Files (*.sql)</source>
+        <translation>Fichiers SQL (*.sql)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
+        <source>Docbook Files (*.docbook)</source>
+        <translation>Fichiers Docbook (*.docbook)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
+        <source>Perl Files (*.pl *.pm *.ph)</source>
+        <translation>Fichiers Perl (*.pl *.pm *.ph)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
+        <source>Lua Files (*.lua)</source>
+        <translation>Fichiers Lua (*.lua)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
+        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
+        <translation>Fichiers Tex (*.tex *.sty *.aux *.toc *.idx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
+        <source>Shell Files (*.sh)</source>
+        <translation>Fichiers Shell (*.sh)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
+        <source>Batch Files (*.bat *.cmd)</source>
+        <translation>Fichiers Batch (*.bat *.cmd)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
+        <source>Diff Files (*.diff *.patch)</source>
+        <translation>Fichiers Diff (*.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>Fichiers de configuration (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
+        <source>Povray Files (*.pov)</source>
+        <translation>Fichiers Povray (*.pov)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
+        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
+        <translation>Fichiers CMake (CMakeLists.txt *.cmake *.ctest)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
+        <source>VHDL Files (*.vhd *.vhdl)</source>
+        <translation>Fichiers VHDL (*.vhd *.vhdl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
+        <source>All Files (*)</source>
+        <translation>Tous fichiers (*)</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>Fichiers Pyrex (*.pyx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
-        <source>Quixote Template Files (*.ptl)</source>
-        <translation>Fichiers gabarits Quixote (*.ptl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
-        <source>Ruby Files (*.rb)</source>
-        <translation>Fichiers Ruby (*.rb)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
-        <source>IDL Files (*.idl)</source>
-        <translation>Fichiers IDL (*.idl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
-        <source>C Files (*.h *.c)</source>
-        <translation>Fichiers C (*.h *.c)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
-        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
-        <translation>Fichiers C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
-        <source>C# Files (*.cs)</source>
-        <translation>Fichiers C# (*.cs)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
-        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
-        <translation>Fichiers HTML (*.html *.htm *.asp *.shtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
-        <source>CSS Files (*.css)</source>
-        <translation>Fichiers CSS (*.css)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
-        <source>QSS Files (*.qss)</source>
-        <translation>Fichiers QSS (*.qss)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
-        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
-        <translation>Fichiers PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
-        <source>Qt Resource Files (*.qrc)</source>
-        <translation>Fichiers Qt Resource (*.qrc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
-        <source>D Files (*.d *.di)</source>
-        <translation>Fichiers D (*.d *.di)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
-        <source>Java Files (*.java)</source>
-        <translation>Fichiers Java (*.java)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
-        <source>JavaScript Files (*.js)</source>
-        <translation>Fichiers JavaScript (*.js)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
-        <source>SQL Files (*.sql)</source>
-        <translation>Fichiers SQL (*.sql)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
-        <source>Docbook Files (*.docbook)</source>
-        <translation>Fichiers Docbook (*.docbook)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
-        <source>Perl Files (*.pl *.pm *.ph)</source>
-        <translation>Fichiers Perl (*.pl *.pm *.ph)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
-        <source>Lua Files (*.lua)</source>
-        <translation>Fichiers Lua (*.lua)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
-        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
-        <translation>Fichiers Tex (*.tex *.sty *.aux *.toc *.idx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
-        <source>Shell Files (*.sh)</source>
-        <translation>Fichiers Shell (*.sh)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
-        <source>Batch Files (*.bat *.cmd)</source>
-        <translation>Fichiers Batch (*.bat *.cmd)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
-        <source>Diff Files (*.diff *.patch)</source>
-        <translation>Fichiers Diff (*.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>Fichiers de configuration (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
-        <source>Povray Files (*.pov)</source>
-        <translation>Fichiers Povray (*.pov)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
-        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
-        <translation>Fichiers CMake (CMakeLists.txt *.cmake *.ctest)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
-        <source>VHDL Files (*.vhd *.vhdl)</source>
-        <translation>Fichiers VHDL (*.vhd *.vhdl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
-        <source>All Files (*)</source>
-        <translation>Tous fichiers (*)</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>Fichiers TCL/Tk (*.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>Fichiers C (*.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>Fichiers C++ (*.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>Fichiers headers C++/C (*.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>Fichiers HTML (*.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>Fichiers PHP (*.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>Fichiers ASP (*.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>Fichiers XML (*.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>Fichiers XSL (*.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>Fichiers DTD (*.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>Fichiers D (*.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>Fichiers Interface D (*.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>Fichiers Perl (*.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>Fichiers module Perl (*.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>Fichiers Batch (*.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>Fichiers TeX (*.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>Fichiers Template TeX (*.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>Fichiers Diff (*.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>Fichiers Make (*.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>Fichiers de propriétés (*.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>Fichiers de configuration (*.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>Fichiers CMake (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>Fichiers Macro CMake (*.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>Fichiers VHDL (*.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>Fichiers TCL (*.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>Fichiers Tk (*.tk)</translation>
     </message>
@@ -35627,175 +35642,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="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>Fichiers XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>Fichiers Fortran (*.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>Fichiers Fortran77 (*.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>Fichiers Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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>Fichiers PostScript (*.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>Fichiers YAML (*.yaml *.yml)</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>Fichiers Fortran (*.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>Fichiers Fortran77 (*.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>Fichiers Pascal (*.pas)</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>Fichiers YAML (*.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 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="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="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>
@@ -36412,92 +36437,92 @@
         <translation>Boutons standards</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>Appliquer</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>Abandon</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>Annuler</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>Ignorer</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>Tout enregistrer</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>Enregistrer</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>Abondonner les modifications</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>Oui à tout</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>Ouvrir</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>Réinitialiser</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>Non</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>Aide</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>Non à tout</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>Réessayer</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>Restaurer les valeurs par défaut</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>Oui</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>Fermer</translation>
     </message>
@@ -38257,7 +38282,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>
@@ -38365,7 +38390,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>
@@ -39035,7 +39060,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>
@@ -40209,27 +40234,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>Export des préférences</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</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>
@@ -43889,7 +43914,7 @@
         <translation>Executées</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Coverage</translation>
     </message>
@@ -43939,7 +43964,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>
@@ -43967,7 +43992,7 @@
         <translation>Effacer toutes les infos</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation>Résultats du profiling</translation>
     </message>
@@ -48678,7 +48703,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>
@@ -48688,7 +48713,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>
@@ -50169,7 +50194,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>
@@ -51375,7 +51400,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>
@@ -54086,7 +54111,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>Subversion Diff</translation>
     </message>
@@ -54363,12 +54388,12 @@
         <translation>Log Subversion</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>Révision</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>Auteur</translation>
     </message>
@@ -54378,7 +54403,7 @@
         <translation>Date</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>Message</translation>
     </message>
@@ -54865,7 +54890,7 @@
         <translation>&amp;Protocole:</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>
@@ -54976,7 +55001,7 @@
         <translation>Sélectionner le protocole d&apos;accès au référentiel</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>
@@ -56275,7 +56300,7 @@
         <translation>ignoré</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation>Status Subversion</translation>
     </message>
@@ -56285,7 +56310,7 @@
         <translation>Commit des changements dans le référentiel...</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>
@@ -61773,7 +61798,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Tests unitaires</translation>
     </message>
--- a/i18n/eric6_it.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_it.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>Aggiungere segnalibro</translation>
     </message>
@@ -1802,7 +1802,7 @@
         <translation>Modifica &amp;Indirizzo</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
         <source>&amp;Delete</source>
         <translation>Can&amp;cella</translation>
     </message>
@@ -2514,12 +2514,12 @@
         <translation>Premi per salvare il tracciamento chiamate su un file di testo</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>From</source>
         <translation>Da</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation>A</translation>
     </message>
@@ -2684,7 +2684,7 @@
         <translation>Premi per cancellare un edit condiviso</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
@@ -2983,7 +2983,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 privilegiata ClickToFlash</translation>
     </message>
@@ -4952,7 +4952,7 @@
         <translation type="unfinished">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 type="unfinished"></translation>
     </message>
@@ -7758,7 +7758,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>Downloads</translation>
     </message>
@@ -8256,92 +8256,92 @@
         <translation>Pulsanti standard</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>Termina</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>Applica</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>Cancella</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>Chiudi</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>Dimentica</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>Aiuto</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>Ignora</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 tutto</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>Apri</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>Resetta</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>Ripristina default</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>Ritenta</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>Salva</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>Salva tutto</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 tutto</translation>
     </message>
@@ -10395,7 +10395,7 @@
         <translation>Premi per selezionare il file API dalla lista dei file API installati</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>Aggiungi dalle APIs installate</translation>
     </message>
@@ -10405,7 +10405,7 @@
         <translation>Premi per compilare le definizioni APIs selezionate</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation>Compila APIs</translation>
     </message>
@@ -10430,7 +10430,7 @@
         <translation>Premi per selezionare un file delle API dalla lista di quelli installati dai 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>Aggiungi dalle API dei plugin</translation>
     </message>
@@ -11533,7 +11533,7 @@
         <translation>Seleziona il riempimento di fine linea.</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>Riempi fino a fine linea</translation>
     </message>
@@ -11578,7 +11578,7 @@
         <translation>Seleziona il font.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
@@ -11825,12 +11825,12 @@
         <translation>Proprietà analizzatore lessicale della 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>Selezione quando la compressione dei commenti deve essere possibile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Comprimi commenti</translation>
     </message>
@@ -11860,22 +11860,22 @@
         <translation>Indenta la parentesi aperta</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>Selezione nel caso la compressione al costrutto else deve essere possibile</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>Comprimi all&apos;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>Selezione nel caso la compressione delle direttive del preprocessore deve essere possibile</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>Comprimi direttive del preprocessore</translation>
     </message>
@@ -11920,127 +11920,127 @@
         <translation>Tag case sensitive</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>Proprietà analizzatore lessicale del Perl</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>Proprietà analizzatore lessicale di Povray</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>Seleziona quando la compressione delle direttive deve essere possibile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>Comprimi direttive</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>Proprietà analizzatore lessicale di Python</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>Seleziona quando una errata indentazione deve essere evidenziata</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>Seleziona quando un testo deve essere indentato automaticamente dopo i &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>Indenta automaticamento dopo &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>Selezione se la compressione delle stringhe deve essere possibile</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Comprimi stringhe</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>Proprietà analizzatore lessicale dell&apos;SQL</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>Seleziona per abilitare i Backslash Escapes</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>Proprietà analizzatore lessicale di VHDL</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>Selezione se la compressione di blocchi alla parentesi deve essere possibile</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>Comprimi alle parentesi</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>Seleziona se la compressione all&apos;inizio dei blocchi deve essere possibile</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>Comprimi all&apos;inizio</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>Proprietà analizzatore lessicale del Pascal</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>Proprietà analizzatore lessicale di PostScript</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>Seleziona per marcare i 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>Marca i token</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>Selezione il PostScript level</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>Proprietà analizzatore lessicale di YAML</translation>
     </message>
@@ -12090,62 +12090,62 @@
         <translation>Style scripts</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>Seleziona per abilitare l&apos;evidenziazione furba delle parole chiave</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation>Evidenziazione furba</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Seleziona per abilitare la compressione dei pacchetti Perl</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
+        <source>Smart Highlighting</source>
+        <translation>Evidenziazione furba</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Seleziona per abilitare la compressione dei pacchetti Perl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
         <source>Fold packages</source>
         <translation>Comprimi packages</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>Seleziona per abilitare la compressione dei blocchi POD di perl</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>Comprimi blocchi POD</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>Seleziona per permettere caratteri unicode Python v2 (es. 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>Permetti caratteri unicode v2</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>Seleziona per permettere caratteri binari e ottali Python v3 (es. 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>Consenti caratteri binari e ottali v3</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>Seleziona per permettere byte Python v3 (es. 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>Permetti byte unicode v3</translation>
     </message>
@@ -12180,112 +12180,112 @@
         <translation>Abilita modelli Mako</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>Proprietà dell&apos;analizzatore lessicale</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>Seleziona per permettere gli spazi iniziali nella riga</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>Permetti spazi iniziali</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>Seleziona se deve essere possibile la chiusura stringa tra virgolette triple</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>Racchiudi stringhe tra virgolette triple</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>Seleziona per permettere alle stringhe di unire i caratteri a capo</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>Le stringhe possono congiungere i caratteri a capo</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>Proprietà dell&apos;analizzatore lessicale Ruby</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>Seleziona se i soli blocchi BEGIN possono essere congiunti</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>Solo i blocchi BEGIN possono venir congiunti</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>Seleziona se le voci possono contenere punti</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>Le vosi possono contenere punti</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>Seleziona per consentire &apos;#&apos; come carattere di commento</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>Consenti &apos;#&apos; come carattere di commento</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>Seleziona per abilitare identificatore tra virgolette</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation>Abilita identificatori tra virgolette</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation>Proprietà dell&apos;analizzatore lessicale TCL</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation>Proprietà dell&apos;analizzatore lessicale TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation>Seleziona per gestire i commenti come sorgenti TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation>Gestisci i commenti come sorgenti TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
-        <translation>Seleziona per gestire \if&lt;unknown&gt; come un comando</translation>
+        <source>Enable quoted identifiers</source>
+        <translation>Abilita identificatori tra virgolette</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
+        <translation>Proprietà dell&apos;analizzatore lessicale TCL</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation>Proprietà dell&apos;analizzatore lessicale TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <source>Select to treat comments as TeX source</source>
+        <translation>Seleziona per gestire i commenti come sorgenti TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <source>Treat comments as TeX source</source>
+        <translation>Gestisci i commenti come sorgenti TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation>Seleziona per gestire \if&lt;unknown&gt; come un comando</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation>Gestisci \if&lt;unknown&gt; come un comando</translation>
     </message>
@@ -12295,7 +12295,7 @@
         <translation>Evidenzia stringhe tra virgolette triple</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>Evidenzia sotto-identificatori</translation>
     </message>
@@ -12305,7 +12305,7 @@
         <translation>Seleziona per evidenziare stringhe tra virgolette triple</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>Seleziona per evidenziare i sotto-identificatori definiti nell&apos;insieme 2 di parole-chiave</translation>
     </message>
@@ -12360,32 +12360,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">Schede</translation>
     </message>
@@ -12405,7 +12405,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>
@@ -12419,6 +12419,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>
@@ -13044,7 +13059,7 @@
         <translation>Modo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Disabilitato</translation>
     </message>
@@ -13838,7 +13853,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>Invia un bug report</translation>
     </message>
@@ -15291,12 +15306,12 @@
         <translation type="unfinished">Notificazioni</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">Host</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>
@@ -15311,7 +15326,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>
@@ -16455,7 +16470,7 @@
         <translation type="unfinished">Nome:</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>
@@ -16465,7 +16480,7 @@
         <translation type="unfinished">DImensione:</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>
@@ -16500,7 +16515,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>
@@ -16928,7 +16943,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>Installazione script GreaseMonkey</translation>
     </message>
@@ -22654,7 +22669,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>
@@ -23833,7 +23848,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>
@@ -23843,7 +23858,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>
@@ -24478,7 +24493,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>Revisione</translation>
     </message>
@@ -24850,7 +24865,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>
@@ -24991,7 +25006,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>Mercurial Log</translation>
     </message>
@@ -25021,17 +25036,17 @@
         <translation>Seleziona il campo su cui filtrare</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>Revisione</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>Autore</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>Messaggio</translation>
     </message>
@@ -28989,7 +29004,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>
@@ -29131,7 +29146,7 @@
         <translation>Il processo {0}  non può essere avviato. Assicurarsi che sia nel path.</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>Commit</translation>
     </message>
@@ -29256,7 +29271,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>
@@ -30543,7 +30558,7 @@
         <translation>Premi per rimuovere gli elementi selezionati</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>&amp;Rimuovi</translation>
     </message>
@@ -35572,317 +35587,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>Proprietà</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>File Pyrex (*.pyx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="557"/>
+        <source>Quixote Template Files (*.ptl)</source>
+        <translation>File template Quixote</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="560"/>
+        <source>Ruby Files (*.rb)</source>
+        <translation>File Ruby (*.rb)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="563"/>
+        <source>IDL Files (*.idl)</source>
+        <translation>File IDL (*.idl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="387"/>
+        <source>C Files (*.h *.c)</source>
+        <translation>File C (*.h *.c)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="390"/>
+        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
+        <translation>File C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="575"/>
+        <source>C# Files (*.cs)</source>
+        <translation>File C# (*.cs)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="396"/>
+        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
+        <translation>File HTML (*.html *.htm *.asp *.shtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="587"/>
+        <source>CSS Files (*.css)</source>
+        <translation>File CSS (*.css)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="590"/>
+        <source>QSS Files (*.qss)</source>
+        <translation>File QSS (*.qss)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="405"/>
+        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
+        <translation>File PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="602"/>
+        <source>Qt Resource Files (*.qrc)</source>
+        <translation>File Risorse Qt (*.qrc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="414"/>
+        <source>D Files (*.d *.di)</source>
+        <translation>File D (*.d *.di)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="611"/>
+        <source>Java Files (*.java)</source>
+        <translation>File Java (*.java)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="614"/>
+        <source>JavaScript Files (*.js)</source>
+        <translation>File JavaScript (*.js)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="617"/>
+        <source>SQL Files (*.sql)</source>
+        <translation>File SQL (*.sql)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="620"/>
+        <source>Docbook Files (*.docbook)</source>
+        <translation>File Docbook (*.docbook)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="429"/>
+        <source>Perl Files (*.pl *.pm *.ph)</source>
+        <translation>File Perl (*.pl *.pm *.ph)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="629"/>
+        <source>Lua Files (*.lua)</source>
+        <translation>File Lua (*.lua)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="435"/>
+        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
+        <translation>File TeX (*.tex *.sty *.aux *.toc *.idx)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="632"/>
+        <source>Shell Files (*.sh)</source>
+        <translation>File Shell (*.sh)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="441"/>
+        <source>Batch Files (*.bat *.cmd)</source>
+        <translation>File Batch (*.bat *.cmd)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="444"/>
+        <source>Diff Files (*.diff *.patch)</source>
+        <translation>File Diff (*.diff *.patch)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
+        <source>Makefiles (*.mak)</source>
+        <translation>Makefile (*,mak)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="450"/>
+        <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
+        <translation>File proprietà (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="656"/>
+        <source>Povray Files (*.pov)</source>
+        <translation>File Povray (*.pov)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="457"/>
+        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
+        <translation>File CMake (CMakeLists.txt *.cmake *.ctest)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="460"/>
+        <source>VHDL Files (*.vhd *.vhdl)</source>
+        <translation>File VHDL (*.vhd *.vhdl)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
+        <source>All Files (*)</source>
+        <translation>Tutti i file (*)</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>File Pyrex (*.pyx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="550"/>
-        <source>Quixote Template Files (*.ptl)</source>
-        <translation>File template Quixote</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="553"/>
-        <source>Ruby Files (*.rb)</source>
-        <translation>File Ruby (*.rb)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="556"/>
-        <source>IDL Files (*.idl)</source>
-        <translation>File IDL (*.idl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="383"/>
-        <source>C Files (*.h *.c)</source>
-        <translation>File C (*.h *.c)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="386"/>
-        <source>C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)</source>
-        <translation>File C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="568"/>
-        <source>C# Files (*.cs)</source>
-        <translation>File C# (*.cs)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="392"/>
-        <source>HTML Files (*.html *.htm *.asp *.shtml)</source>
-        <translation>File HTML (*.html *.htm *.asp *.shtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="580"/>
-        <source>CSS Files (*.css)</source>
-        <translation>File CSS (*.css)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="583"/>
-        <source>QSS Files (*.qss)</source>
-        <translation>File QSS (*.qss)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="401"/>
-        <source>PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)</source>
-        <translation>File PHP (*.php *.php3 *.php4 *.php5 *.phtml)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="595"/>
-        <source>Qt Resource Files (*.qrc)</source>
-        <translation>File Risorse Qt (*.qrc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="410"/>
-        <source>D Files (*.d *.di)</source>
-        <translation>File D (*.d *.di)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="604"/>
-        <source>Java Files (*.java)</source>
-        <translation>File Java (*.java)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="607"/>
-        <source>JavaScript Files (*.js)</source>
-        <translation>File JavaScript (*.js)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="610"/>
-        <source>SQL Files (*.sql)</source>
-        <translation>File SQL (*.sql)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="613"/>
-        <source>Docbook Files (*.docbook)</source>
-        <translation>File Docbook (*.docbook)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="425"/>
-        <source>Perl Files (*.pl *.pm *.ph)</source>
-        <translation>File Perl (*.pl *.pm *.ph)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="622"/>
-        <source>Lua Files (*.lua)</source>
-        <translation>File Lua (*.lua)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="431"/>
-        <source>Tex Files (*.tex *.sty *.aux *.toc *.idx)</source>
-        <translation>File TeX (*.tex *.sty *.aux *.toc *.idx)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="625"/>
-        <source>Shell Files (*.sh)</source>
-        <translation>File Shell (*.sh)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="437"/>
-        <source>Batch Files (*.bat *.cmd)</source>
-        <translation>File Batch (*.bat *.cmd)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="440"/>
-        <source>Diff Files (*.diff *.patch)</source>
-        <translation>File Diff (*.diff *.patch)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
-        <source>Makefiles (*.mak)</source>
-        <translation>Makefile (*,mak)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="446"/>
-        <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
-        <translation>File proprietà (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="649"/>
-        <source>Povray Files (*.pov)</source>
-        <translation>File Povray (*.pov)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="453"/>
-        <source>CMake Files (CMakeLists.txt *.cmake *.ctest)</source>
-        <translation>File CMake (CMakeLists.txt *.cmake *.ctest)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="456"/>
-        <source>VHDL Files (*.vhd *.vhdl)</source>
-        <translation>File VHDL (*.vhd *.vhdl)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
-        <source>All Files (*)</source>
-        <translation>Tutti i file (*)</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>File TCL/Tk (*.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>File C (*.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>File C++ (*.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>File Header C/C++ (*.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>File HTML (*.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>File PHP (*.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>File ASP (*.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>File XML (*.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>File XSL (*.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>File DTD (*.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>File D (*.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>File interfaccia D (*.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>File Perl (*.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>File moduli Perl (*.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>File Batch (*.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>File TeX (*.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>File Template TeX (*.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>File Diff (*.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>File Make (*.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>File proprietà (*.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>File configurazione (*.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>File CMake (CMakeList.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>File Macro CMake (*.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>File VHDL (*.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>File TCL (*.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>File Tk (*.tk)</translation>
     </message>
@@ -35897,175 +35912,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="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>File XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>File Fortran (*.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>File Fortran77 (*.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>File Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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>File PostScript (*.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>File YAML (*.yaml *.yml)</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>File Fortran (*.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>File Fortran77 (*.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>File Pascal (*.pas)</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>File YAML (*.yaml *.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 Files (*.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 Files (*.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 Files (*.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 Files (*.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 Files (*.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 GUI Files (*.pyw2)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation>Python2</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation>Python3</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>File Matlab (*.m *.m.matlab)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation>File Octave (*.m *.m.octave)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation>File Matlab (*.m)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation>File Octave (*.m.octave)</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation>Python2</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation>Python3</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>File Matlab (*.m *.m.matlab)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation>File Octave (*.m *.m.octave)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation>File Matlab (*.m)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation>File Octave (*.m.octave)</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>
@@ -36682,92 +36707,92 @@
         <translation>Pulsanti standard</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>Applica</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>Termina</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>Cancella</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>Ignora</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>Salva tutto</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>Salva</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>Dimentica</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>Si a tutto</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>Apri</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>Resetta</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>No</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>Aiuto</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>No a tutto</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>Ritenta</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>Ripristina default</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>Si</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>Chiudi</translation>
     </message>
@@ -38544,7 +38569,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>
@@ -38652,7 +38677,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>
@@ -39324,7 +39349,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>Password salvate</translation>
     </message>
@@ -40502,27 +40527,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>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</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>File proprietà (*.ini);;Tutti i file(*)</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>
@@ -44202,7 +44227,7 @@
         <translation>Eseguite</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Coverage</translation>
     </message>
@@ -44252,7 +44277,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>
@@ -44280,7 +44305,7 @@
         <translation>Cancella tutte le informazioni</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+        <location filename="../DataViews/PyProfileDialog.py" line="233"/>
         <source>Profile Results</source>
         <translation>Risultati profilazione</translation>
     </message>
@@ -48970,7 +48995,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>
@@ -48980,7 +49005,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>
@@ -50461,7 +50486,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>
@@ -51665,7 +51690,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>
@@ -54406,7 +54431,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>Subversion Diff</translation>
     </message>
@@ -54684,12 +54709,12 @@
         <translation>Log Subversion</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>Revisione</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>Autore</translation>
     </message>
@@ -54699,7 +54724,7 @@
         <translation>Data</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>Messaggio</translation>
     </message>
@@ -55186,7 +55211,7 @@
         <translation>&amp;Protocollo:</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>
@@ -55297,7 +55322,7 @@
         <translation>Seleziona il protocollo per accedere al repository</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>
@@ -56597,7 +56622,7 @@
         <translation>ignorato</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
         <source>Subversion Status</source>
         <translation>Stato Subversion</translation>
     </message>
@@ -56607,7 +56632,7 @@
         <translation>Committa modifiche nel repository...</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>
@@ -62146,7 +62171,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Unittest</translation>
     </message>
--- a/i18n/eric6_pt.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_pt.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>Adicionar Marcador</translation>
     </message>
@@ -1787,7 +1787,7 @@
         <translation>Pressionar para apagar as entradas selecionadas</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;Apagar</translation>
     </message>
@@ -2524,12 +2524,12 @@
         <translation>Pressionar para gravar o rastreio de chamadas como ficheiro 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>Para</translation>
     </message>
@@ -2637,7 +2637,7 @@
         <translation>Pressionar para limpar a lista de anfitriões</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
@@ -2989,7 +2989,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 de Confiança de ClickToFlash</translation>
     </message>
@@ -4954,7 +4954,7 @@
         <translation type="unfinished">Domínio:</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>
@@ -7772,7 +7772,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>
@@ -8231,92 +8231,92 @@
         <translation>Botões Padrão</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>Cancelar</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>Fechar</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>Ajuda</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>Não</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>Não a tudo</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></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>Reinicializar</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>Repor predefinições</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>Tentar de Novo</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>Gravar</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>Gravar tudo</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>Sim</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>Sim a tudo</translation>
     </message>
@@ -10364,7 +10364,7 @@
         <translation>Pressionar para selecionar um ficheiro API da lista de ficheiros API instalados</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>Adicionar desde APIs instalados</translation>
     </message>
@@ -10374,7 +10374,7 @@
         <translation>Pressionar para selecionar um ficheiro API da lista de ficheiros API instalados pelos complementos</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>Adicionar desde APIs de Complementos</translation>
     </message>
@@ -10384,7 +10384,7 @@
         <translation>Pressionar para compilar a definição de APIs selecionada</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>
@@ -11531,7 +11531,7 @@
         <translation>Selecionar tipo de letra.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Tipo de Letra</translation>
     </message>
@@ -11541,7 +11541,7 @@
         <translation>Selecionar preenchimento até ao fim de linha.</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>Preencher até fim de linha</translation>
     </message>
@@ -11798,12 +11798,12 @@
         <translation>Propriedades do 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>Selecionar se a dobragem de comentários deve ser possível</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Dobrar comentários</translation>
     </message>
@@ -11813,22 +11813,22 @@
         <translation>Propriedades do Léxico de C++ , IDL, Java e JavaScript</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>Selecionar se a dobragem em instruções else devem ser possíveis</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>Dobrar em 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>Selecionar se a dobragem de directivas do preprocessador deve ser possível</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>Dobrar diretivas de preprocessamento</translation>
     </message>
@@ -11938,187 +11938,187 @@
         <translation>Scripts de Estilo</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>Propriedades do Léxico de Pascal</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/>
-        <source>Select to enable smart highlighting of keywords</source>
-        <translation>Selecionar para habilitar realce inteligente de palavras chave</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation>Realce Inteligente</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
-        <source>Perl Lexer Properties</source>
-        <translation>Propriedades do Léxico de Perl</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Selecionar para habilitar dobragem de pacotes Perl</translation>
+        <source>Select to enable smart highlighting of keywords</source>
+        <translation>Selecionar para habilitar realce inteligente de palavras chave</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
-        <source>Fold packages</source>
-        <translation>Dobrar pacotes</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/>
-        <source>Select to enable folding of Perl POD blocks</source>
-        <translation>Selecionar para habilitar dobragem de blocos POD de Perl</translation>
+        <source>Smart Highlighting</source>
+        <translation>Realce Inteligente</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <source>Perl Lexer Properties</source>
+        <translation>Propriedades do Léxico de Perl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Selecionar para habilitar dobragem de pacotes Perl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
+        <source>Fold packages</source>
+        <translation>Dobrar pacotes</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/>
+        <source>Select to enable folding of Perl POD blocks</source>
+        <translation>Selecionar para habilitar dobragem de blocos POD de Perl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/>
         <source>Fold POD blocks</source>
         <translation>Dobrar blocos POD</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>Propriedades do Léxico de PostScript</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>Nível de PostScript:</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>Selecionar o nível de PostScript</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>Propriedades do Léxico de Povray</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>Dobrar diretivas</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>Propriedades do Léxico de Python</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>Selecionar se a indentação errada deve ser realçada</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>Selecionar se a dobragem de strings deve ser possível</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Dobrar strings</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>Selecionar se o texto deve auto indentar-se depois de &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>Indentação automática após &apos;:&apos;</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>Selecionar para permitir literais de string unicódigo (ex: 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>Permitir literais de string unicódigo v2</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>Selecionar para permitir literais binários e octais de Python v3 (ex: 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>Permitir literais de binários e octais v3</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>Selecionar para permitir literais de strings de bytes Python v3 (ex: 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>Permitir literais de strings de bytes</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>Propriedades do Léxico de SQL</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>Propriedades do Léxico de VHDL</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>Dobrar nos parentesis</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>Dobrar em begin</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>Propriedades do Léxico de YAML</translation>
     </message>
@@ -12153,112 +12153,112 @@
         <translation>Permitir modelos de Mako</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>Propriedades do Léxico de Propriedades</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>Selecionar para permitir espaços no inicio de uma linha</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>Permitir espaços iniciais</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>Dobrar strings entre aspas triples</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>Propriedades do Léxico de Ruby</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>Apenas blocos BEGIN podem ser dobrados</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>Selecionar se as palavras podem conter pontos</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>Palavras podem conter pontos</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>Selecionar para permitir &apos;#&apos; como caracter de comentario</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>Permitir &apos;#&apos; como caracter de comentario</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>Selecionar para habilitar identificadores entre aspas</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation>Permitir identificadores entre aspas</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation>Propriedades do Léxico de TCL</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation>Propriedades do Léxico de TeX</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>Tratas comentários como fonte TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
-        <translation>Selecionar para tratar \if&lt;unknown&gt; como comando</translation>
+        <source>Enable quoted identifiers</source>
+        <translation>Permitir identificadores entre aspas</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
+        <translation>Propriedades do Léxico de TCL</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation>Propriedades do Léxico de TeX</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>Tratas comentários como fonte TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation>Selecionar para tratar \if&lt;unknown&gt; como comando</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation>Tratar \if&lt;unknown&gt; como comando</translation>
     </message>
@@ -12268,7 +12268,7 @@
         <translation>Realçar aspas triples</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>Realçar sub-identificadores</translation>
     </message>
@@ -12278,7 +12278,7 @@
         <translation>Selecionar para realçar as strings entre aspas triples</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>
@@ -12333,32 +12333,32 @@
         <translation>Propriedades do Léxico de Gettext</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>Realçar indentação má:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation>Sem Aviso</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation>Inconsistente</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>Tabulações após Espaços</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation>Espaços</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation>Tabulações</translation>
     </message>
@@ -12378,7 +12378,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>
@@ -12392,6 +12392,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>
@@ -13092,7 +13107,7 @@
         <translation>Modo:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Inabilitado</translation>
     </message>
@@ -13811,7 +13826,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>Enviar relatório de falho</translation>
     </message>
@@ -15263,12 +15278,12 @@
         <translation type="unfinished">Notificações</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">Anfitrião</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>
@@ -15283,7 +15298,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>
@@ -16427,7 +16442,7 @@
         <translation type="unfinished">Nome:</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>
@@ -16437,7 +16452,7 @@
         <translation type="unfinished">Tamanho:</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>
@@ -16472,7 +16487,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>
@@ -16900,7 +16915,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>Instalação de Script GreaseMonkey</translation>
     </message>
@@ -22625,7 +22640,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>
@@ -23822,7 +23837,7 @@
         <translation>Pressionar para maracar as entradas selecionadas como &apos;resolvido&apos;</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>Resolvido</translation>
     </message>
@@ -23832,7 +23847,7 @@
         <translation>Pressionar para marcar as entradas selecionadas como &apos;sem resolver&apos;</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>Sem resolver</translation>
     </message>
@@ -24474,7 +24489,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>Revisão</translation>
     </message>
@@ -24846,7 +24861,7 @@
         <translation type="unfinished">&lt;p&gt;O ficheiro &lt;b&gt;{0}&lt;/b&gt; não se pôde ler. &lt;/p&gt;&lt;p&gt;Motivo: {1}&lt;/p&gt;</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>
@@ -24987,7 +25002,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>Registo de Mercurial</translation>
     </message>
@@ -25027,17 +25042,17 @@
         <translation>Selecionar o campo a filtrar</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>Revisão</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>Mensagem</translation>
     </message>
@@ -28971,7 +28986,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>Estado de Mercurial</translation>
     </message>
@@ -29113,7 +29128,7 @@
         <translation>Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
         <source>Commit</source>
         <translation>Cometido</translation>
     </message>
@@ -29233,7 +29248,7 @@
         <translation>tudo</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>Diferenças</translation>
     </message>
@@ -30646,7 +30661,7 @@
         <translation>Pressionar para retirar as entradas selecionadas</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>&amp;Retirar</translation>
     </message>
@@ -35658,490 +35673,500 @@
         <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="117"/>
-        <source>Perl</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
-        <source>PostScript</source>
-        <translation>PostScript</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
-        <source>Povray</source>
+        <source>Perl</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
+        <source>PostScript</source>
+        <translation>PostScript</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
+        <source>Povray</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
-        <source>Ruby</source>
-        <translation></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="135"/>
-        <source>TCL</source>
+        <source>Ruby</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
-        <source>TeX</source>
+        <source>SQL</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
+        <source>TCL</source>
         <translation></translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
-        <source>XML</source>
+        <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="145"/>
+        <source>XML</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="171"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="172"/>
         <source>Pygments</source>
         <translation></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>Ficheiros Python (*.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>Ficheiros GUI de Python (*.pyw *.pyw2 *.pyw3)</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>Ficheiros Pyrex (*.pyx)</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>Ficheiros Modelos de Quixote (*.ptl)</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>Ficheiros Ruby (*.rb)</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>Ficheiros IDL (*.idl)</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>Ficheiros C (*.h *.c)</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>Ficheiros C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</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>Ficheiros C# (*.cs)</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>Ficheiros HTML (*.html *.htm *.asp *.shtml)</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>Ficheiros CSS (*.css)</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>Ficheiros QSS (*.qss)</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>Ficheiros PHP (*.php *.php3 *.php4 *.php5 *.phtml)</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>Ficheiros XML (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>Ficheiro de Recursos Qt (*.qrc)</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>Ficheiros D (*.d *.di)</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>Ficheiros Java (*.java)</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>Ficheiros JavaScript (*.js)</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>Ficheiros SQL (*.sql)</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>Ficheiros Docbook (*.docbook)</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>Ficheiros Perl (*.pl *.pm *.ph)</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>Ficheiros Lua (*.lua)</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>Ficheiros Tex (*.tex *.sty *.aux *.toc *.idx)</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>Ficheiros Shell (*.sh)</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>Ficheiros Batch (*.bat *.cmd)</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>Ficheiros Diff (*.diff *.patch)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
         <source>Makefiles (*.mak)</source>
         <translation>Ficheiros Makefile (*.mak)</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>Ficheiros Propriedades (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</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>Ficheiros Povray (*.pov)</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>Ficheiros CMake (CMakeLists.txt *.cmake *.ctest)</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>Ficheiros VHDL (*.vhd *.vhdl)</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>Ficheiros TCL/Tk (*.tcl *.tk)</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>Ficheiros Fortran (*.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>Ficheiros Fortran77 (*.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>Ficheiros Pascal (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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>Ficheiros PostScript (*.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>Ficheiros YAML (*.yaml *.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
         <source>All Files (*)</source>
         <translation>Ficheiros Todos (*)</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>Ficheiros Python3 (*.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>Ficheiros GUI de Python3 (*.pyw)</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>Ficheiros C (*.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>Ficheiros C++ (*.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>Ficheiros de Cabeçalho C++/C (*.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>Ficheiros HTML (*.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>Ficheiros PHP (*.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>Ficheiros ASP (*.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>Ficheiros XML (*.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>Ficheiros XSL (*.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>Ficheiros DTD (*.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>Ficheiros D (*.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>Ficheiros Interface D (*.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>Ficheiros Perl (*.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>Ficheiros Módulos Perl (*.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>Ficheiros Batch (*.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>Ficheiros TeX (*.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>Ficheiros Modelos TeX (*.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>Ficheiros Diff (*.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>Ficheiros Make (*.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>Ficheiros de Propriedades (*.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>Ficheiros de Configuração (*.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>Ficheiros CMake (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>Ficheiros Macro CMake (*.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>Ficheiros VHDL (*.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>Ficheiros TCL (*.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>Ficheiros Tk (*.tk)</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>Ficheiros Fortran (*.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>Ficheiros Fortran77 (*.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>Ficheiros Pascal (*.pas)</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>Ficheiros YAML (*.yml)</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>Ficheiros Python2 (*.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>Ficheiros GUI de Python2 (*.pyw2)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="148"/>
-        <source>Matlab</source>
-        <translation></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>Ficheiros Matlab (*.m *.m.matlab)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation>Ficheiros Matlab (*.m)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation>Ficheiros Octave (*.m.octave)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation>Ficheiros Octave (*.m *.m.octave)</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="115"/>
+        <source>Matlab</source>
+        <translation></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>Ficheiros Matlab (*.m *.m.matlab)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation>Ficheiros Matlab (*.m)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation>Ficheiros Octave (*.m.octave)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation>Ficheiros Octave (*.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="162"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="158"/>
         <source>CoffeeScript</source>
         <translation>CoffeeScript</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>Ficheiros Gettext (*.po)</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>Ficheiros CoffeeScript (*.coffee)</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>
@@ -36799,92 +36824,92 @@
         <translation>Botões Padrão</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>Aplicar</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>Terminar</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>Cancelar</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>Ignorar</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>Gravar tudo</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>Gravar</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>Descartar</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>Sim a tudo</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>Abrir</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>Restablecer</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>Não</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>Ajuda</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>Não a tudo</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>Tentar de Novo</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>Repor predefinições</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>Sim</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>Fechar</translation>
     </message>
@@ -38594,7 +38619,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>
@@ -38702,7 +38727,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>Seleção Visual</translation>
     </message>
@@ -39372,7 +39397,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>Senhas Gravadas</translation>
     </message>
@@ -40539,27 +40564,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>Exportar Preferências</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Importar Preferências</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>Ficheiro de Propriedades (*.ini);;Ficheiros Todos (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Selecionar intérprete de Python{0}</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>Selecionar o intérprete de Python{0} a usar:</translation>
     </message>
@@ -44182,7 +44207,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>
@@ -44261,7 +44286,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>
@@ -44269,7 +44294,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>
@@ -48869,7 +48894,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>
@@ -48879,7 +48904,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>
@@ -50355,7 +50380,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>Lista de Confiança para Envío de Referer</translation>
     </message>
@@ -51555,7 +51580,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>
@@ -54170,7 +54195,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>
@@ -54472,17 +54497,17 @@
         <translation type="unfinished">Selecionar o campo a filtrar</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>Revisão</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>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
@@ -54936,7 +54961,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>&amp;URL:</translation>
     </message>
@@ -55040,7 +55065,7 @@
         <translation type="unfinished">Selecionar o protocolo para aceder ao repositorio</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">&amp;URL:</translation>
     </message>
@@ -56257,7 +56282,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>
@@ -56533,7 +56558,7 @@
         <translation>Não pôde iniciar {0}.&lt;br&gt;Certifique-se de que está na rota de pesquisa.</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
         <source>Commit</source>
         <translation type="unfinished">Cometido</translation>
     </message>
@@ -61852,7 +61877,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Teste Unitário</translation>
     </message>
--- a/i18n/eric6_ru.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_ru.ts	Sat Jan 14 14:12:42 2017 +0100
@@ -11410,12 +11410,12 @@
         <translation>Свойства лексического анализатора 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>Разрешить сворачивать комментарии</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>Сворачивать комментарии</translation>
     </message>
@@ -11425,22 +11425,22 @@
         <translation>Свойства лексических анализаторов C++ , C# , IDL, Java и JavaScript</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>Разрешить сворачивать оператор 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>Сворачивать 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>Разрешить сворачивать директивы препроцессора</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>Сворачивать директивы препроцессора</translation>
     </message>
@@ -11550,187 +11550,187 @@
         <translation>Стиль скриптов</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</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="503"/>
-        <source>Select to enable smart highlighting of keywords</source>
-        <translation>Разрешить интеллектуальную подсветку ключевых слов</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="506"/>
-        <source>Smart Highlighting</source>
-        <translation>Интеллектуальная подсветка</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
-        <source>Perl Lexer Properties</source>
-        <translation>Свойства лексического анализатора Perl</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Разрешить сворачивать Perl пакеты</translation>
+        <source>Select to enable smart highlighting of keywords</source>
+        <translation>Разрешить интеллектуальную подсветку ключевых слов</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
-        <source>Fold packages</source>
-        <translation>Сворачивать пакеты</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="542"/>
-        <source>Select to enable folding of Perl POD blocks</source>
-        <translation>Разрешить сворачивать Perl POD блоки</translation>
+        <source>Smart Highlighting</source>
+        <translation>Интеллектуальная подсветка</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <source>Perl Lexer Properties</source>
+        <translation>Свойства лексического анализатора Perl</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="561"/>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Разрешить сворачивать Perl пакеты</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="564"/>
+        <source>Fold packages</source>
+        <translation>Сворачивать пакеты</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="571"/>
+        <source>Select to enable folding of Perl POD blocks</source>
+        <translation>Разрешить сворачивать Perl POD блоки</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="574"/>
         <source>Fold POD blocks</source>
         <translation>Сворачивать POD блоки</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</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>Разрешить выделять токены</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation>Выделять токены</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:</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>Выбрать уровень PostScript</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</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>Разрешить сворачивать директивы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>Сворачивать директивы</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</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>Разрешить подсветку неверных отступов</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>Разрешить сворачивать строки</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>Сворачивать строки</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>Разрешить автоматическое выравнивание текста (с отступом) после &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>Автоотступ после &apos;:&apos;</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>Разрешить Python v2 юникодные литералы (например 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>Разрешить Python v2 юникодные литералы</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>Разрешить Python v3 двоичные и восьмеричные литералы (например 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>Разрешить Python v3 двоичные и восьмеричные литералы</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>Разрешить Python v3 байтовые литералы (например 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>Разрешить Python v3 байтовые литералы</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</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>Разрешить экранирование обратным слэшем</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation>Экранирование обратным слэшем</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</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>Разрешить сворачивать блоки в круглых скобках</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>Сворачивать круглые скобки</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>Разрешить сворачивать блоки begin</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>Сворачивать begin</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</translation>
     </message>
@@ -11765,112 +11765,112 @@
         <translation>Разрешить шаблоны Mako</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>Свойства лексического анализатора</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>Разрешить начальные пробелы в строке</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>Разрешить начальные пробелы</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>Разрешить сворачивать строки в тройных кавычках</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>Сворачивать строки в тройных кавычках</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>Разрешить дополнение строки символом новой строки</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>Дополнение строки символом новой строки</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</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>Разрешить сворачивание только BEGIN блоков</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>Только BEGIN блоки могут быть свернуты</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>Разрешить использовать точки при написании слов</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>Слова могут содержать точки</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>Разрешить символ &apos;#&apos; как символ коментариев</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>Разрешать символ &apos;#&apos; как символ коментариев</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>Разрешить заключать в кавычки идентификаторы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="896"/>
-        <source>Enable quoted identifiers</source>
-        <translation>Разрешать заключать в кавычки идентификаторы</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="906"/>
-        <source>TCL Lexer Properties</source>
-        <translation>Свойства лексического анализатора TCL</translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="925"/>
-        <source>TeX Lexer Properties</source>
-        <translation>Свойства лексического анализатора TeX</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="941"/>
-        <source>Select to treat comments as TeX source</source>
-        <translation>Разрешить считать коментарии как TeX код</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="944"/>
-        <source>Treat comments as TeX source</source>
-        <translation>Считать коментарии как TeX код</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="951"/>
-        <source>Select to treat \if&lt;unknown&gt; as a command</source>
-        <translation>Разрешить считать \if&lt;unknown&gt; командой</translation>
+        <source>Enable quoted identifiers</source>
+        <translation>Разрешать заключать в кавычки идентификаторы</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="935"/>
+        <source>TCL Lexer Properties</source>
+        <translation>Свойства лексического анализатора TCL</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="954"/>
+        <source>TeX Lexer Properties</source>
+        <translation>Свойства лексического анализатора TeX</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="970"/>
+        <source>Select to treat comments as TeX source</source>
+        <translation>Разрешить считать коментарии как TeX код</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="973"/>
+        <source>Treat comments as TeX source</source>
+        <translation>Считать коментарии как TeX код</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="980"/>
+        <source>Select to treat \if&lt;unknown&gt; as a command</source>
+        <translation>Разрешить считать \if&lt;unknown&gt; командой</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="983"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation>Считать \if&lt;unknown&gt; командой</translation>
     </message>
@@ -11880,7 +11880,7 @@
         <translation>Выделять строки в тройных кавычках</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>Подсвечивать субидентификаторы</translation>
     </message>
@@ -11890,7 +11890,7 @@
         <translation>Разрешить выделение строк в тройных кавычках</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>Разрешить подсвечивать субидентификаторы, определенные в ключе set 2</translation>
     </message>
@@ -11945,32 +11945,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>Подсвечивать неправильный отступ:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>No Warning</source>
         <translation>Без предупреждения</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Inconsistent</source>
         <translation>Несогласованные</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>Символ табуляции после пробела</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Spaces</source>
         <translation>Пробелы</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="207"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.py" line="178"/>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
@@ -11990,7 +11990,7 @@
         <translation>Разрешить подсветку escape-последовательностей</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-последовательности</translation>
     </message>
@@ -12004,6 +12004,21 @@
         <source>Allow verbatim string escape sequences</source>
         <translation>Точное соответствие строки escape-последовательности</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>
@@ -34836,490 +34851,500 @@
         <translation>Makefile</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="117"/>
-        <source>Perl</source>
-        <translation>Perl</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
-        <source>PostScript</source>
-        <translation>PostScript</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
-        <source>Povray</source>
-        <translation>Povray</translation>
+        <source>Perl</source>
+        <translation>Perl</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
+        <source>PostScript</source>
+        <translation>PostScript</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
+        <source>Povray</source>
+        <translation>Povray</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
         <source>Properties</source>
         <translation>Properties</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
-        <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="135"/>
-        <source>TCL</source>
-        <translation>TCL</translation>
+        <source>Ruby</source>
+        <translation>Ruby</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
-        <source>TeX</source>
-        <translation>TeX</translation>
+        <source>SQL</source>
+        <translation>SQL</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
-        <translation>VHDL</translation>
+        <source>TCL</source>
+        <translation>TCL</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
-        <source>XML</source>
-        <translation>XML</translation>
+        <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="145"/>
+        <source>XML</source>
+        <translation>XML</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation>YAML</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 (*.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>Файлы GUI Python (*.pyw *.pyw2 *.pyw3)</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>Файлы Pyrex (*.pyx)</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>Файлы шаблонов Quixote (*.ptl)</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>Файлы Ruby (*.rb)</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>Файлы IDL (*.idl)</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>Файлы C (*.h *.c)</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>Файлы C++ (*.h *.hpp *.hh *.cxx *.cpp *.cc)</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>Файлы C# (*.cs)</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>Файлы HTML (*.html *.htm *.asp *.shtml)</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>Файлы CSS (*.css)</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>Файлы QSS (*.qss)</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>Файлы PHP (*.php *.php3 *.php4 *.php5 *.phtml)</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 (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>Файлы ресурсов Qt (*.qrc)</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>Файлы D (*.d *.di)</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>Файлы Java (*.java)</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>Файлы JavaScript (*.js)</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>Файлы SQL (*.sql)</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>Файлы Docbook (*.docbook)</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>Файлы Perl (*.pl *.pm *.ph)</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>Файлы Lua (*.lua)</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>Файлы TeX (*.tex *.sty *.aux *.toc *.idx)</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>Сценарии Shell (*.sh)</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>Пакетные файлы (*.bat *.cmd)</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>Файлы Diff (*.diff *.patch)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
         <source>Makefiles (*.mak)</source>
         <translation>Правила сборки  (*.mak)</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>Файлы свойств (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</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>Файлы Povray (*.pov)</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>Файлы CMake (CMakeLists.txt *.cmake *.ctest)</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>Файлы VHDL (*.vhd *.vhdl)</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 (*.tcl *.tk)</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 (*.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 (*.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 (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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 (*.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 (*.yaml *.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
         <source>All Files (*)</source>
         <translation>Все файлы(*)</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 (*.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>Файлы GUI Python3 (*.pyw)</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 (*.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++ (*.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++ (*.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 файлы (*.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 (*.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 (*.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 (*.sql)</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 (*.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 (*.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 (*.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 (*.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 (*.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 (*.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>Пакетные файлы (*.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 (*.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 (*.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 (*.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>Правила сборки (*.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>Файлы свойств (*.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>Файлы конфигурации (*.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 (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 (*.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 (*.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 (*.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 (*.tk)</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 (*.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 (*.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 (*.pas)</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 (*.yml)</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>Файлы Python2 (*.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>Файлы GUI Python2 (*.pyw2)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation>Python2</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation>Python3</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 (*.m *.m.matlab)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Matlab Files (*.m)</source>
-        <translation>Файлы Matlab (*.m)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="685"/>
-        <source>Octave Files (*.m.octave)</source>
-        <translation>Файлы Octave (*.m.octave)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="480"/>
-        <source>Octave Files (*.m *.m.octave)</source>
-        <translation>Файлы Octave (*.m *.m.octave)</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="129"/>
+        <source>Python2</source>
+        <translation>Python2</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation>Python3</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 (*.m *.m.matlab)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="689"/>
+        <source>Matlab Files (*.m)</source>
+        <translation>Файлы Matlab (*.m)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="692"/>
+        <source>Octave Files (*.m.octave)</source>
+        <translation>Файлы Octave (*.m.octave)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="484"/>
+        <source>Octave Files (*.m *.m.octave)</source>
+        <translation>Файлы Octave (*.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 (*.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 (*.coffee)</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>
@@ -39726,27 +39751,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>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</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>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation>Задайте интерпретатор Python{0}</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>Задайте интерпретатор Python{0}:</translation>
     </message>
--- a/i18n/eric6_tr.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_tr.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>Yerimi Ekle</translation>
     </message>
@@ -1770,7 +1770,7 @@
         <translation>Seçilen girişi silmek için basınız</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;Sil</translation>
     </message>
@@ -2488,12 +2488,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">Den</translation>
     </message>
     <message>
-        <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+        <location filename="../Debugger/CallTraceViewer.py" line="54"/>
         <source>To</source>
         <translation type="unfinished">E</translation>
     </message>
@@ -2601,7 +2601,7 @@
         <translation>Sunucu listesini temizlemek için basınız</translation>
     </message>
     <message>
-        <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+        <location filename="../Cooperation/ChatWidget.py" line="513"/>
         <source>Clear</source>
         <translation>Temizle</translation>
     </message>
@@ -2958,7 +2958,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>
@@ -4897,7 +4897,7 @@
         <translation type="unfinished">Etki Alanı:</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>
@@ -7652,7 +7652,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>
@@ -8127,92 +8127,92 @@
         <translation>Standart Düğmeler</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>Vazgeç</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>Kullan</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>Vazgeç</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>Kapat</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>Iskartaya ayırmak</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>Yardım</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>Yoksay</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>Hayır</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>Hepsini değil</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>Tamam</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>Aç</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>Başadön</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>Öntanımlı değerlere geridön</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>Tekrar Dene</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>Kaydet</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>Hepsini kaydet</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>Evet</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>Evet hepsini</translation>
     </message>
@@ -10257,7 +10257,7 @@
         <translation>Kurulan API dosyalarının listesinden bir API dosyası seçmek için basınız</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>Kurulan API&apos;lerden ekle</translation>
     </message>
@@ -10267,7 +10267,7 @@
         <translation>Kurulen eklentilerin API dosya listesinden bir API dosyası seçmek için basınız</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>Eklenti API&apos;lerinden ekle</translation>
     </message>
@@ -10277,7 +10277,7 @@
         <translation>Seçilen API&apos;lerin tanımlarının derlenmesi için basınız</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation>API&apos;leri Derle</translation>
     </message>
@@ -11424,7 +11424,7 @@
         <translation>Yazı tipini seç.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
         <source>Font</source>
         <translation>Yazı Tipi</translation>
     </message>
@@ -11434,7 +11434,7 @@
         <translation>Satır sonuna kadar dolrurmak için seç.</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>Satırın sonuna kadar doldur</translation>
     </message>
@@ -11691,12 +11691,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>Katlanmış yorumlama</translation>
     </message>
@@ -11706,22 +11706,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>
@@ -11831,187 +11831,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>Paskal Dil Özellikleri</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>Akıllı vurgulama</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="516"/>
-        <source>Perl Lexer Properties</source>
-        <translation>Perl Dil Özellikleri</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>
-        <translation type="unfinished"></translation>
+        <source>Smart Highlighting</source>
+        <translation>Akıllı vurgulama</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="545"/>
+        <source>Perl Lexer Properties</source>
+        <translation>Perl Dil Özellikleri</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>PostScript Dil Özellikleri</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>Belirteçleri seçiniz</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation>Belirteçler</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>Povray Dil Özellikleri</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>Python Dil Özillikleri</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>Katlanmış metin</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>&apos;:&apos; den sonra Otomatik Girintileme</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>SQL Dili Özellikleri</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>Parentezleri katla</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>Başlangıçta katlı</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 Özellikleri</translation>
     </message>
@@ -12046,112 +12046,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>
@@ -12161,7 +12161,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>
@@ -12171,7 +12171,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>
@@ -12226,32 +12226,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">Sekmeler</translation>
     </message>
@@ -12271,7 +12271,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>
@@ -12285,6 +12285,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>
@@ -12930,7 +12945,7 @@
         <translation>Mod:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>Onaylanmamış</translation>
     </message>
@@ -13674,7 +13689,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>Hata raporu gönder</translation>
     </message>
@@ -15123,12 +15138,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>
@@ -15143,7 +15158,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>
@@ -16285,7 +16300,7 @@
         <translation type="unfinished">Adı:</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>
@@ -16295,7 +16310,7 @@
         <translation type="unfinished">Boyut:</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>
@@ -16330,7 +16345,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>
@@ -16756,7 +16771,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>
@@ -22439,7 +22454,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>
@@ -23615,7 +23630,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>
@@ -23625,7 +23640,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>
@@ -24260,7 +24275,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">Gözden Geçirme</translation>
     </message>
@@ -24632,7 +24647,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>
@@ -24773,7 +24788,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>Mercurial Günlüğü</translation>
     </message>
@@ -24803,17 +24818,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>Gözden Geçirme</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>Yazar</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>Mesaj</translation>
     </message>
@@ -28740,7 +28755,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 Durumu</translation>
     </message>
@@ -28882,7 +28897,7 @@
         <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</translation>
     </message>
@@ -29002,7 +29017,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>
@@ -30278,7 +30293,7 @@
         <translation>Seçilen girişi kaldırmak için basınız</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>Kaldı&amp;r</translation>
     </message>
@@ -35317,490 +35332,500 @@
         <translation>Makefile</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="117"/>
-        <source>Perl</source>
-        <translation>Perl</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="119"/>
-        <source>PostScript</source>
-        <translation>PostScript</translation>
-    </message>
-    <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="121"/>
-        <source>Povray</source>
-        <translation>Povray</translation>
+        <source>Perl</source>
+        <translation>Perl</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="123"/>
+        <source>PostScript</source>
+        <translation>PostScript</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
+        <source>Povray</source>
+        <translation>Povray</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
         <source>Properties</source>
         <translation>Özellikler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
-        <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="135"/>
-        <source>TCL</source>
-        <translation>TCL</translation>
+        <source>Ruby</source>
+        <translation>Ruby</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="137"/>
-        <source>TeX</source>
-        <translation>TeX</translation>
+        <source>SQL</source>
+        <translation>SQL</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="139"/>
-        <source>VHDL</source>
-        <translation>VHDL</translation>
+        <source>TCL</source>
+        <translation>TCL</translation>
     </message>
     <message>
         <location filename="../QScintilla/Lexers/__init__.py" line="141"/>
-        <source>XML</source>
-        <translation>XML</translation>
+        <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="145"/>
+        <source>XML</source>
+        <translation>XML</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="147"/>
         <source>YAML</source>
         <translation>YAML</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 Dosyaları (*.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 Dosyaları (*.pyw *.pyw2 *.pyw3)</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>Pyrex Dosyaları (*.pyx)</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>Quixote Template Dosyaları (*.ptl)</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>Ruby Dosyaları (*.rb)</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>IDL Dosyaları (*.idl)</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>C Dosyalır (*.h *.c)</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>C++ Dosyaları (*.h *.hpp *.hh *.cxx *.cpp *.cc)</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>C# Dosyaları (*.cs)</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>HTML Dosyaları (*.html *.htm *.asp *.shtml)</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>CSS Dosyaları (*.css)</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>QSS Dosyaları (*.qss)</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>PHP Dosyaları (*.php *.php3 *.php4 *.php5 *.phtml)</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 Dosyaları (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>Qt Kaynak Dosyaları (*.qrc)</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>D Dosyaları (*.d *.di)</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>Java Dosyaları (*.java)</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>JavaScript Dosyaları (*.js)</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>SQL Dosyaları (*.sql)</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>Docbook Dosyaları (*.docbook)</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>Perl Dosyaları (*.pl *.pm *.ph)</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>Lua Dosyaları (*.lua)</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>Tex Dosyaları (*.tex *.sty *.aux *.toc *.idx)</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>Kabuk Dosyaları (*.sh)</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>Batch Dosyaları (*.bat *.cmd)</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>Diff Dosyaları (*.diff *.patch)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="447"/>
         <source>Makefiles (*.mak)</source>
         <translation>Make Dosyaları (*.mak)</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>Ayarlar Dosyaları (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</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>Povray Dosyaları (*.pov)</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>CMake Dosyaları (CMakeLists.txt *.cmake *.ctest)</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>VHDL Dosyaları (*.vhd *.vhdl)</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 Dosyaları (*.tcl *.tk)</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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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 Dosyaları (*.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 Dosyaları (*.yaml *.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
         <source>All Files (*)</source>
         <translation>Tüm Dosyalar (*)</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 Dosyaları (*.py3)</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 GUI Dosyaları (*.pyw3)</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 Dosyaları (*.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++ Dosyaları (*.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 Yardımcı Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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Şablon Dosyası (*.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  Dosyaları (*.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 Dosyaları (*.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>Özellikler Dosyaları (*.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>Ayar Dosyaları (*.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 Dosyaları (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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.tk)</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 Dosyaları (*.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 Dosyaları (*.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 Dosyaları (*.pas)</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 Dosyaları (*.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="125"/>
-        <source>Python2</source>
-        <translation>Python2</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation>Python3</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="535"/>
-        <source>Python2 Files (*.py2)</source>
-        <translation>Python2 Dosyaları (*.py2)</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="541"/>
-        <source>Python2 GUI Files (*.pyw2)</source>
-        <translation>Python2 GUI Dosyaları (*.pyw2)</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>Python2</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation>Python3</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="542"/>
+        <source>Python2 Files (*.py2)</source>
+        <translation>Python2 Dosyaları (*.py2)</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="548"/>
+        <source>Python2 GUI Files (*.pyw2)</source>
+        <translation>Python2 GUI Dosyaları (*.pyw2)</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>
@@ -36412,92 +36437,92 @@
         <translation>Standart Düğmeler</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>Kullan</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>Vazgeç</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>Vazgeç</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>Yoksay</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>Hepsini kaydet</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>Kaydet</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>Iskartaya ayırmak</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>Evet hepsini</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>Aç</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>Başadön</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>Tamam</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>Hayır</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>Yardım</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>Hepsini değil</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>Tekrar Dene</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>Öntanımlı değerlere geridön</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>Evet</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>Kapat</translation>
     </message>
@@ -38262,7 +38287,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>
@@ -38370,7 +38395,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>
@@ -39041,7 +39066,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>Kaydedilmiş Parolalar</translation>
     </message>
@@ -40209,27 +40234,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>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</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>
@@ -43852,7 +43877,7 @@
         <translation>Gerçekleşen</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>Kapsam</translation>
     </message>
@@ -43932,7 +43957,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>
@@ -43940,7 +43965,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>Kesit Sonucu</translation>
     </message>
@@ -48533,7 +48558,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>
@@ -48543,7 +48568,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>
@@ -50024,7 +50049,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>
@@ -51228,7 +51253,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>
@@ -53922,7 +53947,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>Altsürüm farklılıkları</translation>
     </message>
@@ -54225,17 +54250,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>Gözden Geçirme</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>Yazar</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>Mesaj</translation>
     </message>
@@ -54689,7 +54714,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>&amp;URL:</translation>
     </message>
@@ -54791,7 +54816,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>&amp;URL:</translation>
     </message>
@@ -56021,7 +56046,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>Altsürüm Durumu</translation>
     </message>
@@ -56298,7 +56323,7 @@
         <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</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>Teslimat</translation>
     </message>
@@ -61550,7 +61575,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
         <source>Unittest</source>
         <translation>Birimtest</translation>
     </message>
--- a/i18n/eric6_zh_CN.ts	Thu Jan 12 19:26:13 2017 +0100
+++ b/i18n/eric6_zh_CN.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>添加书签</translation>
     </message>
@@ -1807,7 +1807,7 @@
         <translation>编辑地址(&amp;A)</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;D)</translation>
     </message>
@@ -2501,12 +2501,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>
@@ -2669,7 +2669,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>清除</translation>
     </message>
@@ -2966,7 +2966,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>
@@ -4898,7 +4898,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>
@@ -7672,7 +7672,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>下载</translation>
     </message>
@@ -8122,92 +8122,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>终止</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>应用</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>取消</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>关闭</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>放弃</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>帮助</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>忽略</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>
@@ -10252,7 +10252,7 @@
         <translation>点击以从已安装的 AIP 文件列表中选择一个 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>从已安装的 API 中添加</translation>
     </message>
@@ -10262,7 +10262,7 @@
         <translation>点击以从通过插件安装的 API 文件列表中选择一个 API 文件</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>从插件 API 中添加</translation>
     </message>
@@ -10272,7 +10272,7 @@
         <translation>点击编译已选 API 定义</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="299"/>
         <source>Compile APIs</source>
         <translation>编译 API</translation>
     </message>
@@ -11419,7 +11419,7 @@
         <translation>选择字体。</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>
@@ -11429,7 +11429,7 @@
         <translation>选择行尾填充。</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>填充到行尾</translation>
     </message>
@@ -11686,12 +11686,12 @@
         <translation>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>选择是否折叠注释</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1022"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="1051"/>
         <source>Fold comments</source>
         <translation>折叠注释</translation>
     </message>
@@ -11721,22 +11721,22 @@
         <translation>缩进开放花括号</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>选择是否折叠其它语句</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>折叠其它</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>选择是否折叠预处理器指令</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>折叠预处理器指令</translation>
     </message>
@@ -11781,127 +11781,127 @@
         <translation>标签区分大小写</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 词法分析器属性</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 词法分析器属性</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 词法分析器属性</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>选择作标记</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="584"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
         <source>Mark Tokens</source>
         <translation>作标记</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 级别:</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>选择 PostScript 级别</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 词法分析器属性</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>选择是否折叠指令</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="675"/>
         <source>Fold directives</source>
         <translation>折叠指令</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 词法分析器属性</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>选择是否高亮不良缩进</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>选择是否自动缩进“:”之后的文本</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>“:”之后自动缩进</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>选择是否折叠字符串</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="733"/>
         <source>Fold strings</source>
         <translation>折叠字符串</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 词法分析器属性</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>选择开启反斜杠转义</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="866"/>
+        <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="895"/>
         <source>Backslash Escapes</source>
         <translation>反斜杠转义</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 词法分析器属性</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>选择是否折叠圆括号部分</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>折叠圆括号</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>选择是否折叠开始部分</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>折叠开始部分</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 词法分析器属性</translation>
     </message>
@@ -11951,62 +11951,62 @@
         <translation type="unfinished"></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 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="532"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="535"/>
+        <source>Smart Highlighting</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="542"/>
+        <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="545"/>
+        <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="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>
@@ -12041,112 +12041,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>
@@ -12156,7 +12156,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>
@@ -12166,7 +12166,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>
@@ -12221,32 +12221,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>
@@ -12266,7 +12266,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>
@@ -12280,6 +12280,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>
@@ -12950,7 +12965,7 @@
         <translation>模式:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+        <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
         <source>Disabled</source>
         <translation>已禁用</translation>
     </message>
@@ -13699,7 +13714,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>发送错误报告</translation>
     </message>
@@ -15145,12 +15160,12 @@
         <translation>通知</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>
@@ -15165,7 +15180,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>地理位置</translation>
     </message>
@@ -16305,7 +16320,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>
@@ -16315,7 +16330,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>
@@ -16350,7 +16365,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>
@@ -16776,7 +16791,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>
@@ -22437,7 +22452,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>
@@ -23613,7 +23628,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>
@@ -23623,7 +23638,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>
@@ -24248,7 +24263,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>
@@ -24620,7 +24635,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>
@@ -24761,7 +24776,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>
@@ -24791,17 +24806,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>
@@ -28743,7 +28758,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>
@@ -28884,7 +28899,7 @@
         <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</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>
@@ -29004,7 +29019,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>
@@ -30278,7 +30293,7 @@
         <translation>点击移除选中的条目</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
         <source>&amp;Remove</source>
         <translation>移除(&amp;R)</translation>
     </message>
@@ -35288,42 +35303,42 @@
         <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>属性</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="139"/>
-        <source>VHDL</source>
-        <translation>VHDL</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="135"/>
         <source>TCL</source>
         <translation>TCL</translation>
     </message>
@@ -35338,450 +35353,460 @@
         <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="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="171"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="172"/>
         <source>Pygments</source>
         <translation>Pygments</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>Pyrex 文件 (*.pyx)</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>Quixote 模板文件 (*.ptl)</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>Ruby 文件 (*.rb)</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>IDL 文件 (*.idl)</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>C 文件 (*.h *.c)</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>C++ 文件 (*.h *.hpp *.hh *.cxx *.cpp *.cc)</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>C# 文件 (*.cs)</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>HTML 文件 (*.html *.htm *.asp *.shtml)</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>CSS 文件 (*.css)</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>QSS 文件 (*.qss)</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>PHP 文件 (*.php *.php3 *.php4 *.php5 *.phtml)</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 文件 (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)</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>Qt 资源文件 (*.qrc)</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>D 文件 (*.d *.di)</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>Java 文件 (*.java)</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>JavaScript 文件 (*.js)</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>SQL 文件 (*.sql)</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>Docbook 文件 (*.docbook)</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>Perl 文件 (*.pl *.pm *.ph)</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>Lua 文件 (*.lua)</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>Tex 文件 (*.tex *.sty *.aux *.toc *.idx)</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>命令行文件 (*.sh)</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>批处理文件 (*.bat *.cmd)</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>差异文件 (*.diff *.patch)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="443"/>
+        <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="446"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="450"/>
         <source>Properties Files (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</source>
         <translation>属性文件 (*.properties *.ini *.inf *.reg *.cfg *.cnf *.rc)</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>Povray 文件 (*.pov)</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>CMake 文件 (CMakeLists.txt *.cmake *.ctest)</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>VHDL 文件 (*.vhd *.vhdl)</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 文件 (*.vhd *.vhdl)</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 文件 (*.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 文件 (*.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 文件 (*.dpr *.dpk *.pas *.dfm *.inc *.pp)</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 文件 (*.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 文件 (*.yaml *.yml)</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="718"/>
+        <location filename="../QScintilla/Lexers/__init__.py" line="728"/>
         <source>All Files (*)</source>
         <translation>所有文件 (*)</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 文件 (*.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++ 文件 (*.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 头文件 (*.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 文件 (*.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 文件 (*.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 文件 (*.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 文件 (*.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 文件 (*.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 文件 (*.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 文件 (*.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 界面文件 (*.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 文件 (*.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 模块文件 (*.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>批处理文件 (*.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 文件 (*.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 模板文件 (*.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)</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 文件 (*.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>属性文件 (*.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>配置文件 (*.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 文件 (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 宏文件 (*.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 文件 (*.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 文件 (*.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 文件 (*.tk)</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 文件 (*.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 文件 (*.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 文件 (*.pas)</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 文件 (*.yml)</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="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="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">Python2</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Lexers/__init__.py" line="127"/>
-        <source>Python3</source>
-        <translation type="unfinished">Python3</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">Python2</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Lexers/__init__.py" line="131"/>
+        <source>Python3</source>
+        <translation type="unfinished">Python3</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>
@@ -36398,92 +36423,92 @@
         <translation>标准按钮</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>应用</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>终止</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>取消</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>忽略</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>全部保存</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>保存</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>放弃</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>全部是</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>打开</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>重置</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>确定</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>否</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>帮助</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>全部否</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>重试</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>恢复默认</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>是</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>关闭</translation>
     </message>
@@ -38243,7 +38268,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>
@@ -38351,7 +38376,7 @@
         <translation>按下以可视化地选择坐标,松开以得到坐标</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+        <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
         <source>Visual Selection</source>
         <translation>可视化选择</translation>
     </message>
@@ -39023,7 +39048,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>
@@ -40197,27 +40222,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>导出首选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1554"/>
+        <location filename="../Preferences/__init__.py" line="1558"/>
         <source>Import Preferences</source>
         <translation>导入首选项</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>属性文件 (*.ini);;所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../Preferences/__init__.py" line="1656"/>
+        <location filename="../Preferences/__init__.py" line="1660"/>
         <source>Select Python{0} Interpreter</source>
         <translation>选择 Python{0} 解释器</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>选择要使用的 Python{0} 解释器:</translation>
     </message>
@@ -43844,7 +43869,7 @@
         <translation>已执行</translation>
     </message>
     <message>
-        <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+        <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
         <source>Coverage</source>
         <translation>覆盖率</translation>
     </message>
@@ -43923,7 +43948,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">%v/%m 文件</translation>
     </message>
@@ -43931,7 +43956,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>剖析结果</translation>
     </message>
@@ -48669,7 +48694,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>
@@ -48679,7 +48704,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>
@@ -50160,7 +50185,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>
@@ -51367,7 +51392,7 @@
         <translation>复制预览(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+        <location filename="../Snapshot/SnapWidget.py" line="531"/>
         <source>eric6 Snapshot</source>
         <translation>eric6 快照</translation>
     </message>
@@ -54067,7 +54092,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>Subversion 差异</translation>
     </message>
@@ -54370,17 +54395,17 @@
         <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>修订</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>作者</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>消息</translation>
     </message>
@@ -54841,7 +54866,7 @@
         <translation>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;输入模块的 URL 。由于仓库具有标准布局,则该 URL 必须包含主干、标签或分支部分。&lt;/p&gt;</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>
@@ -54956,7 +54981,7 @@
         <translation type="obsolete">通过文件夹选择对话框或储存库浏览器选择储存库 URL</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>
@@ -56196,7 +56221,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>Subversion 状态</translation>
     </message>
@@ -56468,7 +56493,7 @@
         <translation>进程生成错误</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>提交</translation>
     </message>
@@ -61756,7 +61781,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 icons/default/languages/lexerJSON.png has changed

eric ide

mercurial