--- a/i18n/eric5_ru.ts	Sun Nov 13 19:14:57 2011 +0100
+++ b/i18n/eric5_ru.ts	Sun Nov 13 19:56:47 2011 +0100
@@ -6573,7 +6573,7 @@
 <context>
     <name>E5SideBar</name>
     <message>
-        <location filename="E5Gui/E5SideBar.py" line="48"/>
+        <location filename="E5Gui/E5SideBar.py" line="49"/>
         <source>Deselect to activate automatic collapsing</source>
         <translation>Запретить автоматическое свертывание</translation>
     </message>
@@ -8984,12 +8984,12 @@
         <translation>Свойства лексического анализатора Bash</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="847"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="877"/>
         <source>Select whether folding of comments shall be possible</source>
         <translation>Возможно ли сворачивать комментарии</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="850"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="880"/>
         <source>Fold comments</source>
         <translation>Сворачивать комментарии</translation>
     </message>
@@ -9009,202 +9009,202 @@
         <translation>Ключевые слова, нечувствительные к регистру (только C/C++)</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="218"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="228"/>
         <source>Select, whether the line containing the opening brace should be indented</source>
         <translation>Следует ли выравнивать строку, содержащую открывающую скобку</translation>
     </message>
     <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="231"/>
+        <source>Indent opening brace</source>
+        <translation>Выравнивать открывающую скобку</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="848"/>
+        <source>Select whether folding at else statement should be possible</source>
+        <translation>Возможно ли сворачивать оператор else</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="851"/>
+        <source>Fold at else</source>
+        <translation>Сворачивать else</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="365"/>
+        <source>Select whether folding of preprocessor directives shall be possible</source>
+        <translation>Возможно ли сворачивать директивы препроцессора</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="368"/>
+        <source>Fold preprocessor directives</source>
+        <translation>Сворачивать директивы препроцессора</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="218"/>
+        <source>Select, whether the line containing the closing brace should be indented</source>
+        <translation>Следует ли выравнивать строку, содержащую закрывающую скобку</translation>
+    </message>
+    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="221"/>
-        <source>Indent opening brace</source>
-        <translation>Выравнивать открывающую скобку</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="818"/>
-        <source>Select whether folding at else statement should be possible</source>
-        <translation>Возможно ли сворачивать оператор else</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="821"/>
-        <source>Fold at else</source>
-        <translation>Сворачивать else</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="355"/>
-        <source>Select whether folding of preprocessor directives shall be possible</source>
-        <translation>Возможно ли сворачивать директивы препроцессора</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="358"/>
-        <source>Fold preprocessor directives</source>
-        <translation>Сворачивать директивы препроцессора</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="208"/>
-        <source>Select, whether the line containing the closing brace should be indented</source>
-        <translation>Следует ли выравнивать строку, содержащую закрывающую скобку</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="211"/>
         <source>Indent closing brace</source>
         <translation>Выравнивать закрывающую скобку</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="164"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="174"/>
         <source>CMake Lexer Properties</source>
         <translation>Свойства лексического анализатора CMake</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="183"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="193"/>
         <source>CSS Lexer Properties</source>
         <translation>Свойства лексического анализатора CSS</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="202"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="212"/>
         <source>D Lexer Properties</source>
         <translation>Свойства лексического анализатора D</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="251"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="261"/>
         <source>HTML Lexer Properties</source>
         <translation>Свойства лексического анализатора HTML</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="287"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="297"/>
         <source>Select whether HTML tags should be case sensitive</source>
         <translation>Учитывать ли регистр тегов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="290"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="300"/>
         <source>Case sensitive tags</source>
         <translation>Учитывать регистр тегов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="378"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="388"/>
         <source>Perl Lexer Properties</source>
         <translation>Свойства лексического анализатора Perl</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="489"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="509"/>
         <source>Povray Lexer Properties</source>
         <translation>Свойства лексического анализатора Povray</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="495"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="515"/>
         <source>Select whether folding of directives shall be possible</source>
         <translation>Возможно ли сворачивать директивы</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="498"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="518"/>
         <source>Fold directives</source>
         <translation>Сворачивать директивы</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="537"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="557"/>
         <source>Python Lexer Properties</source>
         <translation>Свойства лексического анализатора Python</translation>
     </message>
     <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <source>Select whether bad indentation shall be highlighted</source>
+        <translation>Разрешить/запретить подсветку неверных отступов</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="596"/>
+        <source>Highlight bad indentation</source>
+        <translation>Подсвечивать неверные отступы</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
+        <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="616"/>
+        <source>Auto indentation after &apos;:&apos;</source>
+        <translation>Автоотступ после &apos;:&apos;</translation>
+    </message>
+    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="573"/>
-        <source>Select whether bad indentation shall be highlighted</source>
-        <translation>Разрешить/запретить подсветку неверных отступов</translation>
+        <source>Select whether folding of strings shall be possible</source>
+        <translation>Возможно ли сворачивать строки</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="576"/>
-        <source>Highlight bad indentation</source>
-        <translation>Подсвечивать неверные отступы</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="583"/>
-        <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="586"/>
-        <source>Auto indentation after &apos;:&apos;</source>
-        <translation>Автоотступ после &apos;:&apos;</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="553"/>
-        <source>Select whether folding of strings shall be possible</source>
-        <translation>Возможно ли сворачивать строки</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="556"/>
         <source>Fold strings</source>
         <translation>Сворачивать строки</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="655"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="685"/>
         <source>SQL Lexer Properties</source>
         <translation>Свойства лексического анализатора SQL</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="691"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
         <source>Select to enable Backslash Escapes</source>
         <translation>Включить экранирование обратной косой</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="694"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
         <source>Backslash Escapes</source>
         <translation>Экранирование обратной косой</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="792"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="822"/>
         <source>VHDL Lexer Properties</source>
         <translation>Свойства лексического анализатора VHDL</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="798"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="828"/>
         <source>Select whether folding of blocks at a parenthesis shall be possible</source>
         <translation>Возможно ли сворачивать блоки в круглых скобках</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="801"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="831"/>
         <source>Fold at parenthesis</source>
         <translation>Сворачивать круглые скобки</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="808"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="838"/>
         <source>Select whether folding of begin blocks shall be possible</source>
         <translation>Возможно ли сворачивать блоки begin</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="811"/>
-        <source>Fold at begin</source>
-        <translation>Сворачивать begin</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="339"/>
-        <source>Pascal Lexer Properties</source>
-        <translation>Свойства лексического анализатора Pascal</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="417"/>
-        <source>PostScript Lexer Properties</source>
-        <translation>Свойства лексического анализатора PostScript</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="433"/>
-        <source>Select to mark tokens</source>
-        <translation>Выделять токены</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="436"/>
-        <source>Mark Tokens</source>
-        <translation>Выделять токены</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="445"/>
-        <source>PostScript Level:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="452"/>
-        <source>Select the PostScript level</source>
-        <translation>Выбрать PostScript level</translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="841"/>
+        <source>Fold at begin</source>
+        <translation>Сворачивать begin</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="349"/>
+        <source>Pascal Lexer Properties</source>
+        <translation>Свойства лексического анализатора Pascal</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="437"/>
+        <source>PostScript Lexer Properties</source>
+        <translation>Свойства лексического анализатора PostScript</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="453"/>
+        <source>Select to mark tokens</source>
+        <translation>Выделять токены</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="456"/>
+        <source>Mark Tokens</source>
+        <translation>Выделять токены</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="465"/>
+        <source>PostScript Level:</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="472"/>
+        <source>Select the PostScript level</source>
+        <translation>Выбрать PostScript level</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="871"/>
         <source>YAML Lexer Properties</source>
         <translation>Свойства лексического анализатора YAML</translation>
     </message>
@@ -9219,97 +9219,97 @@
         <translation>Разрешить символ &apos;$&apos; в имени идентификаторов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="267"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="277"/>
         <source>Select to enable folding of script comments</source>
         <translation>Возможно ли сворачивать комментарии</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="270"/>
-        <source>Fold script comments</source>
-        <translation>Сворачивать комментарии</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="277"/>
-        <source>Select to enable folding of script heredocs</source>
-        <translation>Сворачивать встроенные строки (heredocs)</translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="280"/>
+        <source>Fold script comments</source>
+        <translation>Сворачивать комментарии</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="287"/>
+        <source>Select to enable folding of script heredocs</source>
+        <translation>Сворачивать встроенные строки (heredocs)</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="290"/>
         <source>Fold script heredocs</source>
         <translation>Сворачивать встроенные строки (heredocs)</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="317"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="327"/>
         <source>XML Lexer Properties</source>
         <translation>Свойства лексического анализатора XML</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="323"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="333"/>
         <source>Select to enable styling of scripts</source>
         <translation>Включить подсветку синтаксиса скриптов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="326"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="336"/>
         <source>Style scripts</source>
         <translation>Включить подсветку синтаксиса скриптов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="365"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="375"/>
         <source>Select to enable smart highlighting of keywords</source>
         <translation>Включить подсветку ключевых слов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="368"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="378"/>
         <source>Smart Highlighting</source>
         <translation>Подсветка ключевых слов</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="394"/>
-        <source>Select to enable folding of Perl packages</source>
-        <translation>Сворачивать Perl пакеты</translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="397"/>
-        <source>Fold packages</source>
-        <translation>Сворачивать пакеты</translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="404"/>
-        <source>Select to enable folding of Perl POD blocks</source>
-        <translation>Сворачивать Perl POD блоки</translation>
+        <source>Select to enable folding of Perl packages</source>
+        <translation>Сворачивать Perl пакеты</translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="407"/>
+        <source>Fold packages</source>
+        <translation>Сворачивать пакеты</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="414"/>
+        <source>Select to enable folding of Perl POD blocks</source>
+        <translation>Сворачивать Perl POD блоки</translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="417"/>
         <source>Fold POD blocks</source>
         <translation>Сворачивать POD блоки</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="633"/>
         <source>Select to allow Python v2 unicode string literals (e.g. u&quot;utf8&quot;)</source>
         <translation>Разрешить Python2 юникодные литералы (например u&quot;utf8&quot;)</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="636"/>
         <source>Allow v2 unicode string literals</source>
         <translation>Разрешить Python2 юникодные литералы</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="613"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="643"/>
         <source>Select to allow Python v3 binary and octal literals (e.g. 0b1011, 0o712)</source>
         <translation>Разрешить Python3 двоичные и восьмеричные литералы (например 0b1011, 0o712)</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="616"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="646"/>
         <source>Allow v3 binary and octal literals</source>
         <translation>Разрешить Python3 двоичные и восьмеричные литералы</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="623"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="653"/>
         <source>Select to allow Python v3 bytes string literals (e.g. b&quot;bytes&quot;)</source>
         <translation>Разрешить Python3 байтовые литералы (например b&quot;bytes&quot;)</translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="626"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="656"/>
         <source>Allow v3 bytes string literals</source>
         <translation>Разрешить Python3 байтовые литералы</translation>
     </message>
@@ -9324,135 +9324,155 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="297"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="307"/>
         <source>Select to enable support for Django templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="300"/>
-        <source>Enable Django templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="307"/>
-        <source>Select to enable support for Mako templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="310"/>
+        <source>Enable Django templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="317"/>
+        <source>Select to enable support for Mako templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="320"/>
         <source>Enable Mako templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="518"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="538"/>
         <source>Properties Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="524"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="544"/>
         <source>Select to allow initial spaces in a line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="527"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="547"/>
         <source>Allow initial spaces</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="563"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="583"/>
         <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="566"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="586"/>
         <source>Fold triple quoted strings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="593"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="623"/>
         <source>Select to allow strings to span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="596"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="626"/>
         <source>Strings may span newline characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="636"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="666"/>
         <source>Ruby Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="681"/>
-        <source>Select whether only BEGIN blocks can be folded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="684"/>
-        <source>Only BEGIN blocks can be folded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="701"/>
-        <source>Select if words may contain dots</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="704"/>
-        <source>Words may contain dots</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="711"/>
-        <source>Select to allow &apos;#&apos; as a comment character</source>
+        <source>Select whether only BEGIN blocks can be folded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="714"/>
-        <source>Allow &apos;#&apos; as comment character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="721"/>
-        <source>Select to enable quoted identifiers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="724"/>
-        <source>Enable quoted identifiers</source>
+        <source>Only BEGIN blocks can be folded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="731"/>
+        <source>Select if words may contain dots</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="734"/>
+        <source>Words may contain dots</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="741"/>
+        <source>Select to allow &apos;#&apos; as a comment character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="744"/>
+        <source>Allow &apos;#&apos; as comment character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="751"/>
+        <source>Select to enable quoted identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="754"/>
+        <source>Enable quoted identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="764"/>
         <source>TCL Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="753"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="783"/>
         <source>TeX Lexer Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="769"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="799"/>
         <source>Select to treat comments as TeX source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="772"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="802"/>
         <source>Treat comments as TeX source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="779"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="809"/>
         <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="782"/>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="812"/>
         <source>Treat \if&lt;unknown&gt; as command</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="164"/>
+        <source>Highlight triple quoted strings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="603"/>
+        <source>Select to highlight sub-identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="606"/>
+        <source>Highlight sub-identifiers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="161"/>
+        <source>Select to highlight triple quoted strings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditorSearchPage</name>
@@ -11070,12 +11090,12 @@
         <translation>Выберите исключаемый каталог</translation>
     </message>
     <message>
-        <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="325"/>
+        <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="327"/>
         <source>Style sheet (*.css);;All files (*)</source>
         <translation>Стили CSS (*.css);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="325"/>
+        <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="327"/>
         <source>Select CSS style sheet</source>
         <translation>Выберите стиль CSS</translation>
     </message>
@@ -11375,7 +11395,7 @@
         <translation>Введите краткий заголовок для точки входа</translation>
     </message>
     <message>
-        <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="473"/>
+        <location filename="Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="475"/>
         <source>Select output directory for QtHelp files</source>
         <translation>Введите имя каталога назначения для файлов Qt Помощи</translation>
     </message>
@@ -27788,27 +27808,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="968"/>
+        <location filename="Preferences/__init__.py" line="971"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="995"/>
+        <location filename="Preferences/__init__.py" line="998"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="995"/>
+        <location filename="Preferences/__init__.py" line="998"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1088"/>
+        <location filename="Preferences/__init__.py" line="1091"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1088"/>
+        <location filename="Preferences/__init__.py" line="1091"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -34640,37 +34660,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="156"/>
+        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="159"/>
         <source>Preview not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="172"/>
-        <source>Copy Image Location to Clipboard</source>
-        <translation type="unfinished">Скопировать адрес изображения</translation>
-    </message>
-    <message>
         <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="175"/>
+        <source>Copy Image Location to Clipboard</source>
+        <translation type="unfinished">Скопировать адрес изображения</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="178"/>
         <source>Copy Image Name to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="228"/>
+        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="234"/>
         <source>Save Image</source>
         <translation type="unfinished">Сохранить изображение</translation>
     </message>
     <message>
-        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="208"/>
+        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="214"/>
         <source>This image is not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="216"/>
+        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="222"/>
         <source>All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="228"/>
+        <location filename="Helpviewer/SiteInfo/SiteInfoDialog.py" line="234"/>
         <source>&lt;p&gt;Cannot write to file &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41040,82 +41060,82 @@
 <context>
     <name>TabWidget</name>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="237"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="239"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="242"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="244"/>
         <source>Close All</source>
         <translation>Закрыть всё</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="245"/>
-        <source>Save</source>
-        <translation>Сохранить</translation>
-    </message>
-    <message>
         <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="247"/>
-        <source>Save As...</source>
-        <translation>Сохранить как...</translation>
+        <source>Save</source>
+        <translation>Сохранить</translation>
     </message>
     <message>
         <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="249"/>
+        <source>Save As...</source>
+        <translation>Сохранить как...</translation>
+    </message>
+    <message>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="251"/>
         <source>Save All</source>
         <translation>Сохранить всё</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="256"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="258"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="397"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="399"/>
         <source>{0} (ro)</source>
         <translation>{0} (только чтение)</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="225"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="227"/>
         <source>Move Left</source>
         <translation>Сдвинуть влево</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="228"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="230"/>
         <source>Move Right</source>
         <translation>Сдвинуть вправо</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="196"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="198"/>
         <source>Close the current editor</source>
         <translation>Закрыть текущий редактор</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="231"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="233"/>
         <source>Move First</source>
         <translation>Сделать первым</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="234"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="236"/>
         <source>Move Last</source>
         <translation>Сделать последним</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="186"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="188"/>
         <source>Show a navigation menu</source>
         <translation>Показать меню</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="239"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="241"/>
         <source>Close Others</source>
         <translation>Закрыть остальные</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="259"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="261"/>
         <source>Copy Path to Clipboard</source>
         <translation>Сопировать путь в буфер обмена</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="253"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="255"/>
         <source>Open &apos;rejection&apos; file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41233,12 +41253,12 @@
 <context>
     <name>Tabview</name>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="844"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="846"/>
         <source>Untitled {0}</source>
         <translation>Без имени - {0}</translation>
     </message>
     <message>
-        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1161"/>
+        <location filename="Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1163"/>
         <source>{0} (ro)</source>
         <translation>{0} (только чтение)</translation>
     </message>