Added a specialized dialog to show template help text.

Sun, 04 Oct 2015 13:35:09 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 04 Oct 2015 13:35:09 +0200
changeset 4481
456c58fc64b0
parent 4480
2dec66f0b518
child 4482
7a9af15c43a2
child 4489
d0d6e4ad31bd

Added a specialized dialog to show template help text.

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.Shell.html file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Templates.TemplateHelpDialog.html file | annotate | diff | comparison | revisions
Documentation/Source/index-eric6.Templates.html file | annotate | diff | comparison | revisions
Templates/TemplateHelpDialog.py file | annotate | diff | comparison | revisions
Templates/TemplateHelpDialog.ui file | annotate | diff | comparison | revisions
Templates/TemplatePropertiesDialog.py 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_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.GB2312.ts file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Sat Oct 03 14:37:29 2015 +0200
+++ b/APIs/Python3/eric6.api	Sun Oct 04 13:35:09 2015 +0200
@@ -8129,6 +8129,7 @@
 eric6.Tasks.TaskViewer.TaskViewer.saveProjectTasks?4()
 eric6.Tasks.TaskViewer.TaskViewer.setProjectOpen?4(o=False)
 eric6.Tasks.TaskViewer.TaskViewer?1(parent, project)
+eric6.Templates.TemplateHelpDialog.TemplateHelpDialog?1(parent=None)
 eric6.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog.getVariables?4()
 eric6.Templates.TemplateMultipleVariablesDialog.TemplateMultipleVariablesDialog?1(variables, parent=None)
 eric6.Templates.TemplatePropertiesDialog.TemplatePropertiesDialog.getData?4()
--- a/APIs/Python3/eric6.bas	Sat Oct 03 14:37:29 2015 +0200
+++ b/APIs/Python3/eric6.bas	Sun Oct 04 13:35:09 2015 +0200
@@ -731,6 +731,7 @@
 TasksWriter XMLStreamWriterBase
 TemplateEntry QTreeWidgetItem
 TemplateGroup QTreeWidgetItem
+TemplateHelpDialog QDialog Ui_TemplateHelpDialog
 TemplateMultipleVariablesDialog QDialog
 TemplatePropertiesDialog QDialog Ui_TemplatePropertiesDialog
 TemplateSingleVariableDialog QDialog Ui_TemplateSingleVariableDialog
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Sat Oct 03 14:37:29 2015 +0200
+++ b/Documentation/Help/source.qhp	Sun Oct 04 13:35:09 2015 +0200
@@ -965,6 +965,7 @@
             <section title="eric6.Tasks.TaskViewer" ref="eric6.Tasks.TaskViewer.html" />
           </section>
           <section title="eric6.Templates" ref="index-eric6.Templates.html">
+            <section title="eric6.Templates.TemplateHelpDialog" ref="eric6.Templates.TemplateHelpDialog.html" />
             <section title="eric6.Templates.TemplateMultipleVariablesDialog" ref="eric6.Templates.TemplateMultipleVariablesDialog.html" />
             <section title="eric6.Templates.TemplatePropertiesDialog" ref="eric6.Templates.TemplatePropertiesDialog.html" />
             <section title="eric6.Templates.TemplateSingleVariableDialog" ref="eric6.Templates.TemplateSingleVariableDialog.html" />
@@ -10325,6 +10326,7 @@
       <keyword name="Shell.__setTextDisplay" id="Shell.__setTextDisplay" ref="eric6.QScintilla.Shell.html#Shell.__setTextDisplay" />
       <keyword name="Shell.__showCompletions" id="Shell.__showCompletions" ref="eric6.QScintilla.Shell.html#Shell.__showCompletions" />
       <keyword name="Shell.__showHistory" id="Shell.__showHistory" ref="eric6.QScintilla.Shell.html#Shell.__showHistory" />
+      <keyword name="Shell.__showLanguageMenu" id="Shell.__showLanguageMenu" ref="eric6.QScintilla.Shell.html#Shell.__showLanguageMenu" />
       <keyword name="Shell.__startDebugClient" id="Shell.__startDebugClient" ref="eric6.QScintilla.Shell.html#Shell.__startDebugClient" />
       <keyword name="Shell.__useHistory" id="Shell.__useHistory" ref="eric6.QScintilla.Shell.html#Shell.__useHistory" />
       <keyword name="Shell.__write" id="Shell.__write" ref="eric6.QScintilla.Shell.html#Shell.__write" />
@@ -12013,6 +12015,9 @@
       <keyword name="TemplateGroup.removeEntry" id="TemplateGroup.removeEntry" ref="eric6.Templates.TemplateViewer.html#TemplateGroup.removeEntry" />
       <keyword name="TemplateGroup.setLanguage" id="TemplateGroup.setLanguage" ref="eric6.Templates.TemplateViewer.html#TemplateGroup.setLanguage" />
       <keyword name="TemplateGroup.setName" id="TemplateGroup.setName" ref="eric6.Templates.TemplateViewer.html#TemplateGroup.setName" />
+      <keyword name="TemplateHelpDialog" id="TemplateHelpDialog" ref="eric6.Templates.TemplateHelpDialog.html#TemplateHelpDialog" />
+      <keyword name="TemplateHelpDialog (Constructor)" id="TemplateHelpDialog (Constructor)" ref="eric6.Templates.TemplateHelpDialog.html#TemplateHelpDialog.__init__" />
+      <keyword name="TemplateHelpDialog (Module)" id="TemplateHelpDialog (Module)" ref="eric6.Templates.TemplateHelpDialog.html" />
       <keyword name="TemplateMultipleVariablesDialog" id="TemplateMultipleVariablesDialog" ref="eric6.Templates.TemplateMultipleVariablesDialog.html#TemplateMultipleVariablesDialog" />
       <keyword name="TemplateMultipleVariablesDialog (Constructor)" id="TemplateMultipleVariablesDialog (Constructor)" ref="eric6.Templates.TemplateMultipleVariablesDialog.html#TemplateMultipleVariablesDialog.__init__" />
       <keyword name="TemplateMultipleVariablesDialog (Module)" id="TemplateMultipleVariablesDialog (Module)" ref="eric6.Templates.TemplateMultipleVariablesDialog.html" />
@@ -14821,6 +14826,7 @@
       <file>eric6.Tasks.TaskFilterConfigDialog.html</file>
       <file>eric6.Tasks.TaskPropertiesDialog.html</file>
       <file>eric6.Tasks.TaskViewer.html</file>
+      <file>eric6.Templates.TemplateHelpDialog.html</file>
       <file>eric6.Templates.TemplateMultipleVariablesDialog.html</file>
       <file>eric6.Templates.TemplatePropertiesDialog.html</file>
       <file>eric6.Templates.TemplateSingleVariableDialog.html</file>
--- a/Documentation/Source/eric6.QScintilla.Shell.html	Sat Oct 03 14:37:29 2015 +0200
+++ b/Documentation/Source/eric6.QScintilla.Shell.html	Sun Oct 04 13:35:09 2015 +0200
@@ -256,6 +256,9 @@
 <td><a href="#Shell.__showHistory">__showHistory</a></td>
 <td>Private slot to show the shell history dialog.</td>
 </tr><tr>
+<td><a href="#Shell.__showLanguageMenu">__showLanguageMenu</a></td>
+<td>Private slot to prepare the language submenu.</td>
+</tr><tr>
 <td><a href="#Shell.__startDebugClient">__startDebugClient</a></td>
 <td>Private slot to start a debug client according to the action triggered.</td>
 </tr><tr>
@@ -908,6 +911,11 @@
 <b>__showHistory</b>(<i></i>)
 <p>
         Private slot to show the shell history dialog.
+</p><a NAME="Shell.__showLanguageMenu" ID="Shell.__showLanguageMenu"></a>
+<h4>Shell.__showLanguageMenu</h4>
+<b>__showLanguageMenu</b>(<i></i>)
+<p>
+        Private slot to prepare the language submenu.
 </p><a NAME="Shell.__startDebugClient" ID="Shell.__startDebugClient"></a>
 <h4>Shell.__startDebugClient</h4>
 <b>__startDebugClient</b>(<i>action</i>)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Templates.TemplateHelpDialog.html	Sun Oct 04 13:35:09 2015 +0200
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Templates.TemplateHelpDialog</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.Templates.TemplateHelpDialog</h1>
+<p>
+Module implementing a dialog to show some template help.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#TemplateHelpDialog">TemplateHelpDialog</a></td>
+<td>Class implementing a dialog to show some template help.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="TemplateHelpDialog" ID="TemplateHelpDialog"></a>
+<h2>TemplateHelpDialog</h2>
+<p>
+    Class implementing a dialog to show some template help.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_TemplateHelpDialog
+<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="#TemplateHelpDialog.__init__">TemplateHelpDialog</a></td>
+<td>Constructor</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="TemplateHelpDialog.__init__" ID="TemplateHelpDialog.__init__"></a>
+<h4>TemplateHelpDialog (Constructor)</h4>
+<b>TemplateHelpDialog</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</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.Templates.html	Sat Oct 03 14:37:29 2015 +0200
+++ b/Documentation/Source/index-eric6.Templates.html	Sun Oct 04 13:35:09 2015 +0200
@@ -28,6 +28,9 @@
 <h3>Modules</h3>
 <table>
 <tr>
+<td><a href="eric6.Templates.TemplateHelpDialog.html">TemplateHelpDialog</a></td>
+<td>Module implementing a dialog to show some template help.</td>
+</tr><tr>
 <td><a href="eric6.Templates.TemplateMultipleVariablesDialog.html">TemplateMultipleVariablesDialog</a></td>
 <td>Module implementing a dialog for entering multiple template variables.</td>
 </tr><tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Templates/TemplateHelpDialog.py	Sun Oct 04 13:35:09 2015 +0200
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2015 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to show some template help.
+"""
+
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QDialog
+
+from .Ui_TemplateHelpDialog import Ui_TemplateHelpDialog
+
+
+class TemplateHelpDialog(QDialog, Ui_TemplateHelpDialog):
+    """
+    Class implementing a dialog to show some template help.
+    """
+    def __init__(self, parent=None):
+        """
+        Constructor
+        
+        @param parent reference to the parent widget
+        @type QWidget
+        """
+        super(TemplateHelpDialog, self).__init__(parent)
+        self.setupUi(self)
+        self.setWindowFlags(Qt.Window)
+        
+        self.helpEdit.setHtml(self.tr(
+            """<p>To use variables in a template, you just have to"""
+            """ enclose the variablename with $-characters. When you"""
+            """ use the template, you will then be asked for a value"""
+            """ for this variable.</p>"""
+            """<p>Example template: This is a $VAR$</p>"""
+            """<p>When you use this template you will be prompted for"""
+            """ a value for the variable $VAR$. Any occurrences of $VAR$"""
+            """ will then be replaced with whatever you've entered.</p>"""
+            """<p>If you need a single $-character in a template, which"""
+            """ is not used to enclose a variable, type $$(two dollar"""
+            """ characters) instead. They will automatically be replaced"""
+            """ with a single $-character when you use the template.</p>"""
+            """<p>If you want a variables contents to be treated"""
+            """ specially, the variablename must be followed by a ':'"""
+            """ and one formatting specifier (e.g. $VAR:ml$). The"""
+            """ supported specifiers are:"""
+            """<table>"""
+            """<tr><td>ml</td><td>Specifies a multiline formatting."""
+            """ The first line of the variable contents is prefixed with"""
+            """ the string occurring before the variable on the same"""
+            """ line of the template. All other lines are prefixed by"""
+            """ the same amount of whitespace as the line containing"""
+            """ the variable."""
+            """</td></tr>"""
+            """<tr><td>rl</td><td>Specifies a repeated line formatting."""
+            """ Each line of the variable contents is prefixed with the"""
+            """ string occuring before the variable on the same line of"""
+            """ the template."""
+            """</td></tr>"""
+            """</table></p>"""
+            """<p>The following predefined variables may be used in a"""
+            """ template:"""
+            """<table>"""
+            """<tr><td>date</td>"""
+            """<td>today's date in ISO format (YYYY-MM-DD)</td></tr>"""
+            """<tr><td>year</td>"""
+            """<td>the current year</td></tr>"""
+            """<tr><td>project_name</td>"""
+            """<td>the name of the project (if any)</td></tr>"""
+            """<tr><td>project_path</td>"""
+            """<td>the path of the project (if any)</td></tr>"""
+            """<tr><td>path_name</td>"""
+            """<td>full path of the current file</td></tr>"""
+            """<tr><td>dir_name</td>"""
+            """<td>full path of the parent directory</td></tr>"""
+            """<tr><td>file_name</td>"""
+            """<td>the current file name (without directory)</td></tr>"""
+            """<tr><td>base_name</td>"""
+            """<td>like <i>file_name</i>, but without extension"""
+            """</td></tr>"""
+            """<tr><td>ext</td>"""
+            """<td>the extension of the current file</td></tr>"""
+            """<tr><td>cur_select</td>"""
+            """<td>the currently selected text</td></tr>"""
+            """<tr><td>insertion</td>"""
+            """<td>Sets insertion point for cursor after template is"""
+            """ inserted.</td>"""
+            """</tr>"""
+            """<tr><td>select_start</td>"""
+            """<td>Sets span of selected text in template after template"""
+            """ is inserted (used together with 'select_end').</td></tr>"""
+            """<tr><td>select_end</td>"""
+            """<td>Sets span of selected text in template after template"""
+            """ is inserted (used together with 'select_start')."""
+            """</td></tr>"""
+            """<tr><td>clipboard</td>"""
+            """<td>the text of the clipboard</td></tr>"""
+            """</table></p>"""
+            """<p>If you want to change the default delimiter to"""
+            """ anything different, please use the configuration"""
+            """ dialog to do so.</p>"""
+        ))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Templates/TemplateHelpDialog.ui	Sun Oct 04 13:35:09 2015 +0200
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TemplateHelpDialog</class>
+ <widget class="QDialog" name="TemplateHelpDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Template Help</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;b&gt;Template Help&lt;/b&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTextEdit" name="helpEdit">
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>TemplateHelpDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>TemplateHelpDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
--- a/Templates/TemplatePropertiesDialog.py	Sat Oct 03 14:37:29 2015 +0200
+++ b/Templates/TemplatePropertiesDialog.py	Sun Oct 04 13:35:09 2015 +0200
@@ -91,6 +91,8 @@
                 self.descriptionEdit.setText(itm.getDescription())
             
             self.nameEdit.selectAll()
+        
+        self.__helpDialog = None
 
     def keyPressEvent(self, ev):
         """
@@ -111,81 +113,10 @@
         """
         Private slot to show some help.
         """
-        E5MessageBox.information(
-            self,
-            self.tr("Template Help"),
-            self.tr(
-                """<p>To use variables in a template, you just have to"""
-                """ enclose the variablename with $-characters. When you"""
-                """ use the template, you will then be asked for a value"""
-                """ for this variable.</p>"""
-                """<p>Example template: This is a $VAR$</p>"""
-                """<p>When you use this template you will be prompted for"""
-                """ a value for the variable $VAR$. Any occurrences of $VAR$"""
-                """ will then be replaced with whatever you've entered.</p>"""
-                """<p>If you need a single $-character in a template, which"""
-                """ is not used to enclose a variable, type $$(two dollar"""
-                """ characters) instead. They will automatically be replaced"""
-                """ with a single $-character when you use the template.</p>"""
-                """<p>If you want a variables contents to be treated"""
-                """ specially, the variablename must be followed by a ':'"""
-                """ and one formatting specifier (e.g. $VAR:ml$). The"""
-                """ supported specifiers are:"""
-                """<table>"""
-                """<tr><td>ml</td><td>Specifies a multiline formatting."""
-                """ The first line of the variable contents is prefixed with"""
-                """ the string occurring before the variable on the same"""
-                """ line of the template. All other lines are prefixed by"""
-                """ the same amount of whitespace as the line containing"""
-                """ the variable."""
-                """</td></tr>"""
-                """<tr><td>rl</td><td>Specifies a repeated line formatting."""
-                """ Each line of the variable contents is prefixed with the"""
-                """ string occuring before the variable on the same line of"""
-                """ the template."""
-                """</td></tr>"""
-                """</table></p>"""
-                """<p>The following predefined variables may be used in a"""
-                """ template:"""
-                """<table>"""
-                """<tr><td>date</td>"""
-                """<td>today's date in ISO format (YYYY-MM-DD)</td></tr>"""
-                """<tr><td>year</td>"""
-                """<td>the current year</td></tr>"""
-                """<tr><td>project_name</td>"""
-                """<td>the name of the project (if any)</td></tr>"""
-                """<tr><td>project_path</td>"""
-                """<td>the path of the project (if any)</td></tr>"""
-                """<tr><td>path_name</td>"""
-                """<td>full path of the current file</td></tr>"""
-                """<tr><td>dir_name</td>"""
-                """<td>full path of the parent directory</td></tr>"""
-                """<tr><td>file_name</td>"""
-                """<td>the current file name (without directory)</td></tr>"""
-                """<tr><td>base_name</td>"""
-                """<td>like <i>file_name</i>, but without extension"""
-                """</td></tr>"""
-                """<tr><td>ext</td>"""
-                """<td>the extension of the current file</td></tr>"""
-                """<tr><td>cur_select</td>"""
-                """<td>the currently selected text</td></tr>"""
-                """<tr><td>insertion</td>"""
-                """<td>Sets insertion point for cursor after template is"""
-                """ inserted.</td>"""
-                """</tr>"""
-                """<tr><td>select_start</td>"""
-                """<td>Sets span of selected text in template after template"""
-                """ is inserted (used together with 'select_end').</td></tr>"""
-                """<tr><td>select_end</td>"""
-                """<td>Sets span of selected text in template after template"""
-                """ is inserted (used together with 'select_start')."""
-                """</td></tr>"""
-                """<tr><td>clipboard</td>"""
-                """<td>the text of the clipboard</td></tr>"""
-                """</table></p>"""
-                """<p>If you want to change the default delimiter to"""
-                """ anything different, please use the configuration"""
-                """ dialog to do so.</p>"""))
+        if self.__helpDialog is None:
+            from .TemplateHelpDialog import TemplateHelpDialog
+            self.__helpDialog = TemplateHelpDialog(self)
+        self.__helpDialog.show()
         
     def setSelectedGroup(self, name):
         """
--- a/eric6.e4p	Sat Oct 03 14:37:29 2015 +0200
+++ b/eric6.e4p	Sun Oct 04 13:35:09 2015 +0200
@@ -927,6 +927,7 @@
     <Source>Tasks/TaskPropertiesDialog.py</Source>
     <Source>Tasks/TaskViewer.py</Source>
     <Source>Tasks/__init__.py</Source>
+    <Source>Templates/TemplateHelpDialog.py</Source>
     <Source>Templates/TemplateMultipleVariablesDialog.py</Source>
     <Source>Templates/TemplatePropertiesDialog.py</Source>
     <Source>Templates/TemplateSingleVariableDialog.py</Source>
@@ -1591,6 +1592,7 @@
     <Form>SqlBrowser/SqlConnectionDialog.ui</Form>
     <Form>Tasks/TaskFilterConfigDialog.ui</Form>
     <Form>Tasks/TaskPropertiesDialog.ui</Form>
+    <Form>Templates/TemplateHelpDialog.ui</Form>
     <Form>Templates/TemplatePropertiesDialog.ui</Form>
     <Form>Templates/TemplateSingleVariableDialog.ui</Form>
     <Form>UI/AuthenticationDialog.ui</Form>
--- a/i18n/eric6_cs.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_cs.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2903,6 +2903,11 @@
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4896,12 +4901,12 @@
         <translation>změněno</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Spojení z ilegálního hosta</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
@@ -4910,18 +4915,18 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Pokus o spojení z ilegálního hosta &lt;b&gt;{0}&lt;/b&gt;. Přijmout toto spojení?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -22530,12 +22535,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; nebyl nalezen.</translation>
     </message>
@@ -46045,37 +46050,37 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Kopírovat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Vložit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Reset a vyčistit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>Č.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Zahodit chybu</translation>
     </message>
@@ -46085,84 +46090,84 @@
         <translation>&lt;b&gt;Okno Shellu&lt;/b&gt;&lt;p&gt;Toto je jednoduchý interpretr běžící v okně. Interpretr běží nezávisle na programu, který je debugován. To znamená, že můžete spustit jakýkoliv příkaz i během debugování.&lt;/p&gt;&lt;p&gt;Během vkládání příkazu můžete použít kurzorové klávesy. Je zde také historie příkazů, která se aktivuje klávesami up a down. Stisknutím up nebo down klávesy po textu, který byl zadán se spustí inkrementální vyhledávání.&lt;/p&gt;&lt;p&gt;Shell má několik speciálních příkazů. &apos;reset&apos; zabije shell a spustí nový. &apos;clear&apos; vyčistí obsah shell okna.&apos;start&apos; se používá pro přepnutí shell jazyka a musí za ním následovat jméno podporovaného jazyka. Podporované jazyky jsou zobrazeny v seznamu, který vrací příkaz &apos;languages&apos;. Tyto příkazy (kromě &apos;languages&apos;) jsou také dostupné přes kontextové menu.&lt;/p&gt;&lt;p&gt;Stisknutím tab klávesy po nějakém vloženém textu se zobrazí seznam s nabídkou možných zakončení výrazu. Odpovídající zadání pak může být vybráno z tohoto listu. Pokud je existuje jen jedna možnost, je vložena automaticky.&lt;/p&gt;&lt;p&gt;Dokud se program neukončí, je shell v pasivním módu dostupný jen pokud se debugovaný program připojil k IDE. To je oznámeno odlišným promptem a dále v názvu titulku okna.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Pasivní debug mód</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Vybrat vstupy</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Vybrat historii</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>Nepřipojen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Vyjmout</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} na {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Shell jazyk &quot;{0}&quot; není podporován.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; není soubor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation type="unfinished">Hledat</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46170,26 +46175,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55389,6 +55394,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished">Nápověda šablony</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.&lt;/p&gt;&lt;p&gt;Příklad šablony: Toto je $VAR$&lt;/p&gt;&lt;p&gt;Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.&lt;/p&gt;&lt;p&gt;Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.&lt;/p&gt;&lt;p&gt;Pokud chcete proměnnou nějak formátovat, zadejte &apos;:&apos; a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:&lt;table&gt;&lt;tr&gt;    &lt;td&gt;ml&lt;/td&gt;    &lt;td&gt;Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;    &lt;td&gt;rl&lt;/td&gt;    &lt;td&gt;Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;V šablonách lze použít následující předdefinované proměnné:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;aktuální datum v ISO formátu (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;aktuální rok&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;jméno projektu (je-li nějaké)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;cesta k projektu (je-li nějaká)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;celá cesta k aktuálnímu souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;celá cesta k nadřazené složce&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;jméno aktuálního souboru (bez cesty)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;stejně jako &lt;i&gt;file_name&lt;/i&gt;, ale bez extenze&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;extenze aktuálního souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;kurzorem vybraný text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Nastaví pozici kurzoru po té, co je šablona vložena.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;obsah schránky&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55459,19 +55482,19 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Zavřít dialog</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Opravdu chcete zavřít dialog?</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Nápověda šablony</translation>
+        <translation type="obsolete">Nápověda šablony</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="86"/>
@@ -55505,7 +55528,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.&lt;/p&gt;&lt;p&gt;Příklad šablony: Toto je $VAR$&lt;/p&gt;&lt;p&gt;Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.&lt;/p&gt;&lt;p&gt;Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.&lt;/p&gt;&lt;p&gt;Pokud chcete proměnnou nějak formátovat, zadejte &apos;:&apos; a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:&lt;table&gt;&lt;tr&gt;    &lt;td&gt;ml&lt;/td&gt;    &lt;td&gt;Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;    &lt;td&gt;rl&lt;/td&gt;    &lt;td&gt;Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;V šablonách lze použít následující předdefinované proměnné:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;aktuální datum v ISO formátu (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;aktuální rok&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;jméno projektu (je-li nějaké)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;cesta k projektu (je-li nějaká)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;celá cesta k aktuálnímu souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;celá cesta k nadřazené složce&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;jméno aktuálního souboru (bez cesty)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;stejně jako &lt;i&gt;file_name&lt;/i&gt;, ale bez extenze&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;extenze aktuálního souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;kurzorem vybraný text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Nastaví pozici kurzoru po té, co je šablona vložena.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;obsah schránky&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Proměnné se v šablonách používají tak, že se jejich jména vloží mezi $ znaky. Když je v šabloně použiteje, budete vyzváni k zadání hodnoty proměnné.&lt;/p&gt;&lt;p&gt;Příklad šablony: Toto je $VAR$&lt;/p&gt;&lt;p&gt;Když použiteje tuto šablonu, budete vyzváni k zadání hodnoty proměnné $VAR$. Všechny výskyty $VAR$ pak budou nahrazeny touto hodnotou.&lt;/p&gt;&lt;p&gt;Pokud chcete do šablony umístit pouze znak $, zadejte jej zdvojeně: $$. Takovýto výskyt bude automaticky nahrazen na jeden znak $.&lt;/p&gt;&lt;p&gt;Pokud chcete proměnnou nějak formátovat, zadejte &apos;:&apos; a pak název filtru. (např. $VAR:ml$) Podporované filtry jsou:&lt;table&gt;&lt;tr&gt;    &lt;td&gt;ml&lt;/td&gt;    &lt;td&gt;Víceřádkové formátování. První řádek s hodnotou proměnné začíná s textem, který na tom samém řádku předcházel proměnnou. Všechny ostatní řádky dané hodnoty jsou zleva doplněny mezerami tak, aby byly zarovnány pod začátek hodnoty na prvním řádku.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;    &lt;td&gt;rl&lt;/td&gt;    &lt;td&gt;Formátování s opakováním. Každá řádka hodnoty začíná s textem, který na tom samém řádku předcházel proměnnou.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;V šablonách lze použít následující předdefinované proměnné:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;aktuální datum v ISO formátu (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;aktuální rok&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;jméno projektu (je-li nějaké)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;cesta k projektu (je-li nějaká)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;celá cesta k aktuálnímu souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;celá cesta k nadřazené složce&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;jméno aktuálního souboru (bez cesty)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;stejně jako &lt;i&gt;file_name&lt;/i&gt;, ale bez extenze&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;extenze aktuálního souboru&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;kurzorem vybraný text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Nastaví pozici kurzoru po té, co je šablona vložena.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Nastaví span vybraného textu v šabloně po té, co je šablona vložena (používá se společně s &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;obsah schránky&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Chcete-li změnit výchozí oddělovač na něco jiného, prosím, použijte dialog nastavení konfigurace.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -55569,92 +55592,92 @@
         <translation>Export...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Nápověda o šablonách...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Odebrat šablonu</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Importovat šablony</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Exportovat šablony</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Soubory šablon (*.e4c);; Všechny soubory (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Nápověda šablony</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Editovat skupinu šablon</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Uložit šablony</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Načíst šablony</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Konfigurovat...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete odebrat &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Skupina šablon se jménem &lt;b&gt;{0}&lt;/b&gt; již existuje.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Do souboru se šablonami &lt;b&gt;{0}&lt;/b&gt; nelze zapisovat.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soubor se šablonami &lt;b&gt;{0}&lt;/b&gt; nelze přečíst.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation type="unfinished">Obnovit</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>
Binary file i18n/eric6_de.qm has changed
--- a/i18n/eric6_de.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_de.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -4911,12 +4911,12 @@
         <translation>geändert</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Verbindung von ungültigem Rechner</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
@@ -4925,19 +4925,19 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Es wurde versucht, eine Verbindung von dem nicht zugelassenen Rechner &lt;b&gt;{0}&lt;/b&gt; aufzubauen. Soll die Verbindung angenommen werden?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation>Verbindung für passives Debuggen empfangen
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation>Verbindung für passives Debuggen geschlossen
@@ -22542,12 +22542,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Lesezeichen&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation>Revision finden</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>„{0}“ wurde nicht gefunden.</translation>
     </message>
@@ -46123,12 +46123,12 @@
         <translation>Shell</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
@@ -46143,32 +46143,32 @@
         <translation>Passiv &gt;&gt;&gt; </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Zurücksetzen und Löschen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Drop Fehler</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; ist keine Datei.&lt;/p&gt;</translation>
     </message>
@@ -46178,7 +46178,7 @@
         <translation>Starten</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} auf {1}, {2}</translation>
     </message>
@@ -46188,76 +46188,76 @@
         <translation>&lt;b&gt;Das Shell-Fenster&lt;/b&gt;&lt;p&gt;Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.&lt;/p&gt;&lt;p&gt;Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter bedient wird. Eine inkrementelle Suche wird gestartet, indem die Cursortasten Hoch und Runter nach Eingabe von Text gedrückt werden.&lt;/p&gt;&lt;p&gt;Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. Diese Befehle (Ausnahme „languages“) sind auch über das Kontextmenu verfügbar.&lt;/p&gt;&lt;p&gt;Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.&lt;/p&gt;&lt;p&gt;Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Die Shell-Sprache „{0}“ wird nicht unterstützt.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Passiver Debugmodus</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Historie</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Zeige</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Eintrag auswählen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Wähle den auszuführenden Eintrag aus (aktuellster ist zuletzt dargestellt).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>
 nicht verbunden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46268,14 +46268,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Unspezifischer Syntaxfehler.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -46284,14 +46284,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Syntaxfehler &quot;{1}&quot; in Datei {0}, Zeile {2}, Zeichen {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Signal &quot;{0}&quot; in der Datei {1} in Zeile {2} erzeugt.
@@ -55530,6 +55530,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation>Hilfe zu Vorlagen</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Hilfe zu Vorlagen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Um Variablen in einer Vorlage zu verwenden, muss der Variablenname mit einem $-Zeichen umschlossen werden. Wenn die Vorlage angewandt wird, wird nach einem Wert für diese Variable gefragt.&lt;/p&gt;&lt;p&gt;Beispiel: Dies ist eine $Variable$&lt;/p&gt;&lt;p&gt;Wenn diese Vorlage angewandt wird, wird nach einem Wert für die Variable $Variable$ gefragt. Jedes Vorkommen von $Variable$ wird dann durch den eingegebenen Text ersetzt.&lt;/p&gt;&lt;p&gt;Wird in der Vorlage ein einzelnes $-Zeichen, das keine Variable umschließt, benötigt, so muss dies als $$ (zwei Dollar Zeichen) geschrieben werden. Bei der Anwendung der Vorlage wird dies automatisch zu einem $-Zeichen.&lt;/p&gt;&lt;p&gt;Soll der Wert einer Variablen speziell behandelt werden, so muss dem Variablennamen ein „:“ und eine Formatangabe folgen (z.B. $Variable:ml$). Die unterstützten Formatangaben sind:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Gibt ein mehrzeiliges Format an. Der ersten Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt. Allen anderen wird soviel Leerraum vorangestellt, wie die Zeile der Variablen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Gibt ein wiederholendes Format an. Jede Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Die folgenden vordefinierten Variablen können in einer Vorlage verwendet werden:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;das aktuelle Datum im ISO-Format (JJJJ-MM-TT)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;das aktuelle Jahr&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;der Name des Projektes (falls vorhanden)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;der Pfad des Projektes (falls vorhanden)/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;voller Pfadname der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;voller Pfadname des Verzeichnisses&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;Dateiname der aktuellen Datei (ohne Verzeichnis)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;wie &lt;i&gt;file_name&lt;/i&gt;, aber ohne Erweiterung&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;die Erweiterung der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;der aktuell ausgewählte Text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Setzt den Cursor an diese Stelle nachdem das Template eingefügt wurde.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_end“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_start“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;der Text der Zwischenablage&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Soll das einen Variablennamen umschließende Zeichen geändert werden, so kann dies im Konfigurationsdialog geschehen.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55565,11 +55583,6 @@
         <translation>GRUPPE</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>Template Help</source>
-        <translation>Hilfe zu Vorlagen</translation>
-    </message>
-    <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="14"/>
         <source>Template Properties</source>
         <translation>Vorlageneigenschaften</translation>
@@ -55605,12 +55618,12 @@
         <translation>Gruppe:</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Dialog schließen</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Soll der Dialog wirklich geschlossen werden?</translation>
     </message>
@@ -55645,11 +55658,6 @@
         <source>&lt;b&gt;Template name&lt;b&gt;&lt;p&gt;Enter the name of the template. Templates may be autocompleted upon this name. In order to support autocompletion. the template name must only consist of letters (a-z and A-Z), digits (0-9) and underscores (_).&lt;/p&gt;</source>
         <translation>&lt;b&gt;Vorlagenname&lt;/b&gt;&lt;p&gt;Gib den Namen der Vorlage ein. Vorlagen werden basierend auf ihrem Namen vervollständigt. Um dies zu unterstützen, darf der Name nur Buchstaben (a-z und A-Z), Ziffern (0-9) und Unterstriche (_) enthalten.&lt;/p&gt;</translation>
     </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Um Variablen in einer Vorlage zu verwenden, muss der Variablenname mit einem $-Zeichen umschlossen werden. Wenn die Vorlage angewandt wird, wird nach einem Wert für diese Variable gefragt.&lt;/p&gt;&lt;p&gt;Beispiel: Dies ist eine $Variable$&lt;/p&gt;&lt;p&gt;Wenn diese Vorlage angewandt wird, wird nach einem Wert für die Variable $Variable$ gefragt. Jedes Vorkommen von $Variable$ wird dann durch den eingegebenen Text ersetzt.&lt;/p&gt;&lt;p&gt;Wird in der Vorlage ein einzelnes $-Zeichen, das keine Variable umschließt, benötigt, so muss dies als $$ (zwei Dollar Zeichen) geschrieben werden. Bei der Anwendung der Vorlage wird dies automatisch zu einem $-Zeichen.&lt;/p&gt;&lt;p&gt;Soll der Wert einer Variablen speziell behandelt werden, so muss dem Variablennamen ein „:“ und eine Formatangabe folgen (z.B. $Variable:ml$). Die unterstützten Formatangaben sind:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Gibt ein mehrzeiliges Format an. Der ersten Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt. Allen anderen wird soviel Leerraum vorangestellt, wie die Zeile der Variablen.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Gibt ein wiederholendes Format an. Jede Zeile des Variablenwertes wird die Zeichenkette vor der Variablen der gleichen Zeile in der Vorlage vorangestellt.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Die folgenden vordefinierten Variablen können in einer Vorlage verwendet werden:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;das aktuelle Datum im ISO-Format (JJJJ-MM-TT)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;das aktuelle Jahr&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;der Name des Projektes (falls vorhanden)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;der Pfad des Projektes (falls vorhanden)/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;voller Pfadname der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;voller Pfadname des Verzeichnisses&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;Dateiname der aktuellen Datei (ohne Verzeichnis)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;wie &lt;i&gt;file_name&lt;/i&gt;, aber ohne Erweiterung&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;die Erweiterung der aktuellen Datei&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;der aktuell ausgewählte Text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Setzt den Cursor an diese Stelle nachdem das Template eingefügt wurde.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_end“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Setzt die Auswahl nachdem das Template eingefügt wurde (verwendet zusammen mit „select_start“).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;der Text der Zwischenablage&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Soll das einen Variablennamen umschließende Zeichen geändert werden, so kann dies im Konfigurationsdialog geschehen.&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -55672,32 +55680,32 @@
 <context>
     <name>TemplateViewer</name>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Vorlagengruppe editieren</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Vorlage löschen</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Vorlagen importieren</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Vorlagen exportieren</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Eine Vorlagengruppe mit dem Namen &lt;b&gt;{0}&lt;/b&gt; existiert bereits.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Soll &lt;b&gt;{0}&lt;/b&gt; wirklich gelöscht werden?&lt;/p&gt;</translation>
     </message>
@@ -55742,62 +55750,62 @@
         <translation>Export...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Hilfe zu Vorlagen...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Hilfe zu Vorlagen</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Vorlagendateien (*.e4c);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Vorlagen speichern</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Vorlagendatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht geschrieben werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Vorlagen lesen</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Die Vorlagendatei &lt;b&gt;{0}&lt;/b&gt; konnte nicht gelesen werden.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Vorlagengruppen&lt;/b&gt; sind ein Mittel, um einzelne Vorlagen zusammenzufassen. Gruppen haben ein Attribut, das angibt, für welche Programmiersprache sie gültig sind. Um Vorlagen hinzuzufügen, muss mindestens eine Vorlagengruppe angelegt werden.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Vorlageneinträge&lt;/b&gt; sind die eigentlichen Vorlagen. Sie werden durch Vorlagengruppen zusammengefaßt. Zusätzliche Hilfe zu Vorlagen sind im Editierdialog verfügbar.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation>Erneut laden</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation>Vorlagen neu laden</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation>Die Vorlagen enthalten ungesicherte Änderungen. Sollen diese verworfen werden?</translation>
     </message>
--- a/i18n/eric6_en.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_en.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2875,6 +2875,11 @@
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4860,30 +4865,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -22405,12 +22410,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45740,119 +45745,119 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../QScintilla/Shell.py" line="220"/>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="221"/>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="227"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="228"/>
+        <source>Reset and Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="233"/>
+        <source>Configure...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="589"/>
+        <source>Select History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="589"/>
+        <source>Select the history entry to execute (most recent shown last).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="640"/>
+        <source>Passive Debug Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="641"/>
+        <source>
+Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="643"/>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="645"/>
+        <source>{0} on {1}, {2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="783"/>
+        <source>StdOut: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="791"/>
+        <source>StdErr: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
+        <source>Shell language &quot;{0}&quot; not supported.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
+        <source>Drop Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
+        <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Shell.py" line="224"/>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
-        <source>Reset and Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
-        <source>Configure...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
-        <source>Select History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
-        <source>Select the history entry to execute (most recent shown last).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
-        <source>Passive Debug Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
-        <source>
-Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
-        <source>No.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
-        <source>{0} on {1}, {2}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
-        <source>StdOut: {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
-        <source>StdErr: {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
-        <source>Shell language &quot;{0}&quot; not supported.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
-        <source>Drop Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
-        <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -45860,26 +45865,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55018,6 +55023,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55117,25 +55140,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>Template Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -55198,92 +55211,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_es.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_es.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -4909,31 +4909,31 @@
         <translation>cambiado</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Conexión desde un host ilegal</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
         <translation>No conectado</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Se ha intentado una conexión desde el host ilegal &lt;b&gt;{0}&lt;/b&gt;. ¿Aceptar esta conexión?.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation>Recibida conexión pasiva de depuración
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation>Cerrada conexión pasiva de depuración
@@ -22543,12 +22543,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marcadores&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation>Buscar Commit</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; no se ha encontrado.</translation>
     </message>
@@ -46111,120 +46111,120 @@
         <translation>Comienzo</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Restaurar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Restaurar y borrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Modo de depuración pasiva</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Error al soltar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Seleccionar entrada</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Seleccionar historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleccionar la entrada del historial a ejecutar (las más recientes mostradas en último lugar).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>No conectado</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} en {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Lenguaje de Shell  &quot;{0}&quot; no soportado.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; no es un archivo.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46235,13 +46235,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Error de sintaxis sin especificar.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -46250,14 +46250,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Error de sintaxis &quot;{1}&quot; en archivo {0} en la línea {2}, carácter {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation>Señal &quot;{0}&quot; generada en el archivo {1} y línea {2}.
@@ -55481,6 +55481,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Para utilizar variables en una plantilla, solamente tiene que delimitar el nombre de variable con carácteres $. Al utilizar la plantilla, se le solicitará un valor para esta variable.&lt;/p&gt;&lt;p&gt;Ejemplo de plantilla: esto es una $VAR$&lt;/p&gt;&lt;p&gt;Al utilizar esta plantilla se le solicitará un valor para la variable $VAR$. Todas las ocurrencias de $VAR$ serán entonces reemplazadas con el valor introducido.&lt;/p&gt;&lt;p&gt;Si necesita utilizar el caracter $ en una plantilla que no vaya a ser utilizado para delimitar una variable, teclee $$ (dos carácteres dólar). Se reemplazarán automáticamente con un carácter $ único al utilizar la plantilla.&lt;/p&gt;&lt;p&gt;Si desea tratar específicamente los contenidos de alguna variable, el nombre de variable debe ser seguido por un &apos;:&apos; y un especificador de formato.(por ejemplo $VAR:ml$). Los especificadores soportados son:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;A la primera línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla. Al resto de las líneas se les antepone la misma cantidad de espacios en blanco que la línea que contiene la variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Especifica un formato de repetición de líneas. A cada línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Las siguientes variables predefinidas se pueden utilizar en una plantilla:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;fecha actual formato ISO (AAAA-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;el año actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;el nombre del proyecto (si existe)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;ruta completa del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;ruta completa del directorio padre&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nombre del archivo actual (sin directorio)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;como &lt;i&gt;file_name&lt;/i&gt;, pero sin extensión&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;la extensión del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;el texto seleccionado actualmente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Establece punto de inserción para el cursor despues de insertar la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;el texto del portapapeles&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Si desea cambiar el delimitador a otro distinto, por favor utilice el diálogo de configuración para hacerlo.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55551,19 +55569,19 @@
         <translation>GROUP</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Cerrar diálogo</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>¿Realmente desea cerrar el diálogo?</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Ayuda de la Plantilla</translation>
+        <translation type="obsolete">Ayuda de la Plantilla</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="86"/>
@@ -55600,7 +55618,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Para utilizar variables en una plantilla, solamente tiene que delimitar el nombre de variable con carácteres $. Al utilizar la plantilla, se le solicitará un valor para esta variable.&lt;/p&gt;&lt;p&gt;Ejemplo de plantilla: esto es una $VAR$&lt;/p&gt;&lt;p&gt;Al utilizar esta plantilla se le solicitará un valor para la variable $VAR$. Todas las ocurrencias de $VAR$ serán entonces reemplazadas con el valor introducido.&lt;/p&gt;&lt;p&gt;Si necesita utilizar el caracter $ en una plantilla que no vaya a ser utilizado para delimitar una variable, teclee $$ (dos carácteres dólar). Se reemplazarán automáticamente con un carácter $ único al utilizar la plantilla.&lt;/p&gt;&lt;p&gt;Si desea tratar específicamente los contenidos de alguna variable, el nombre de variable debe ser seguido por un &apos;:&apos; y un especificador de formato.(por ejemplo $VAR:ml$). Los especificadores soportados son:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;A la primera línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla. Al resto de las líneas se les antepone la misma cantidad de espacios en blanco que la línea que contiene la variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Especifica un formato de repetición de líneas. A cada línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Las siguientes variables predefinidas se pueden utilizar en una plantilla:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;fecha actual formato ISO (AAAA-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;el año actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;el nombre del proyecto (si existe)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;ruta completa del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;ruta completa del directorio padre&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nombre del archivo actual (sin directorio)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;como &lt;i&gt;file_name&lt;/i&gt;, pero sin extensión&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;la extensión del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;el texto seleccionado actualmente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Establece punto de inserción para el cursor despues de insertar la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;el texto del portapapeles&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Si desea cambiar el delimitador a otro distinto, por favor utilice el diálogo de configuración para hacerlo.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Para utilizar variables en una plantilla, solamente tiene que delimitar el nombre de variable con carácteres $. Al utilizar la plantilla, se le solicitará un valor para esta variable.&lt;/p&gt;&lt;p&gt;Ejemplo de plantilla: esto es una $VAR$&lt;/p&gt;&lt;p&gt;Al utilizar esta plantilla se le solicitará un valor para la variable $VAR$. Todas las ocurrencias de $VAR$ serán entonces reemplazadas con el valor introducido.&lt;/p&gt;&lt;p&gt;Si necesita utilizar el caracter $ en una plantilla que no vaya a ser utilizado para delimitar una variable, teclee $$ (dos carácteres dólar). Se reemplazarán automáticamente con un carácter $ único al utilizar la plantilla.&lt;/p&gt;&lt;p&gt;Si desea tratar específicamente los contenidos de alguna variable, el nombre de variable debe ser seguido por un &apos;:&apos; y un especificador de formato.(por ejemplo $VAR:ml$). Los especificadores soportados son:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;A la primera línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla. Al resto de las líneas se les antepone la misma cantidad de espacios en blanco que la línea que contiene la variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Especifica un formato de repetición de líneas. A cada línea de los contenidos de la variable se le antepone la cadena que hay antes de la variable en la misma línea de la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Las siguientes variables predefinidas se pueden utilizar en una plantilla:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;fecha actual formato ISO (AAAA-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;el año actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;el nombre del proyecto (si existe)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;ruta completa del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;ruta completa del directorio padre&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nombre del archivo actual (sin directorio)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;como &lt;i&gt;file_name&lt;/i&gt;, pero sin extensión&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;la extensión del archivo actual&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;el texto seleccionado actualmente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Establece punto de inserción para el cursor despues de insertar la plantilla.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Establece intervalo de texto seleccionado en la plantilla tras ser ésta insertada (usado junto a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;el texto del portapapeles&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Si desea cambiar el delimitador a otro distinto, por favor utilice el diálogo de configuración para hacerlo.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -55664,92 +55682,92 @@
         <translation>Exportar...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Ayuda de las Plantillas...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Eliminar Plantilla</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Importar Plantillas</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Exportar Plantillas</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Archivos de Plantillas (*.e4c *);; Todos los Archivos (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Ayuda para la plantilla</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Editar Grupo de Plantillas</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Guardar plantillas</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Leer plantillas</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Desea realmente eliminar &lt;b&gt;{0}&lt;/b&gt; ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Un grupo de plantillas con el nombre &lt;b&gt;{0}&lt;/b&gt; ya existe.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de plantillas &lt;b&gt;{0}&lt;/b&gt; no pudo ser guardado.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;El archivo de plantillas &lt;b&gt;{0}&lt;/b&gt; no pudo ser leído.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Los grupos de plantillas&lt;/b&gt; son una manera de agrupar plantillas individuales. Los grupos tienen un atributo que especifica a qué lenguaje de programación se aplican. Para añadir entradas de plantillas. al menos un grupo tiene que haber sido definido.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Las entradas de plantilla&lt;/b&gt; son las plantillas reales. Se agrupan en grupos de plantillas. Se puede encontrar ayuda sobre como definirlas en el diálogo de edición de plantilla.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation>Recargar</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation>Recargar Plantillas</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation>Las plantillas contienen cambios sin guardar. ¿Deben descartarse dichos cambios?</translation>
     </message>
--- a/i18n/eric6_fr.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_fr.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2905,6 +2905,11 @@
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4891,30 +4896,30 @@
         <translation>modifiée</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Connexion en provenance d&apos;un hote illégal</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
         <translation>Non connecté</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -22552,12 +22557,12 @@
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Signets&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46072,37 +46077,37 @@
         <translation>Passif &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Effacer et réinitialiser</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Erreur de suppression</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>Non.</translation>
     </message>
@@ -46117,84 +46122,84 @@
         <translation>&lt;b&gt;La fenêtre Shell&lt;/b&gt;&lt;p&gt;Il s&apos;agit simplement d&apos;un interpreteur Python affiché dans une fenêtre. L&apos;interpréteur affiché est celui utilisé pour le débogage du programme en cours .Cela signifie qu&apos;on peut exécuter n&apos;importe quelle commande durant le débogage, en utilisant l&apos;environnement de débug en cours.&lt;/p&gt;&lt;p&gt;On peut utiliser les flèches pour rappeler les commandes enregistrées dans l&apos;historique. En appuyant sur les flèches du haut et du bas, on peut aussi rappeler les commandes qui commencent par le début du mot tapé..&lt;/p&gt;&lt;p&gt;Le shell possède des commandes spéciales. &apos;Réinitialiser&apos; tue le shell en cours et en redémarre un nouveau. &apos;Effacer&apos; efface l&apos;affichage, et &apos;Lancer...&apos; est utilisé pour basculer d&apos;un langage shell à l&apos;autre (&apos;Python&apos; ou &apos;Ruby&apos;). Ces commandes sont aussi disponibles via le menu contextuel du shell.&lt;/p&gt;&lt;p&gt;En appuyant sur la touche Tab après avoir saisi du texte, on affiche la liste des complétions possibles. L&apos;entrée voulue peut être sélectionnée dans la liste. Si une seule entrée est disponible, elle sera sélectionnée automatiquement.&lt;/p&gt;&lt;p&gt;En mode débogage passif, le shell est  disponible uniquement après que le programme débogué connecté à l&apos;IDE a été terminé. Ceci est indiqué par une invite de commande différente et par une indication dans le titre de la fenêtre.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Mode débogueur passif</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Sélection d&apos;une entrée</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Afficher</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Historique</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Sélectionner une entrée à executer (la plus récente est à la fin).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>Non connexté</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Configuration...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation type="unfinished">Couper</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46202,26 +46207,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55447,6 +55452,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished">Aide sur les gabarits</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55484,7 +55507,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Aide sur les gabarits</translation>
+        <translation type="obsolete">Aide sur les gabarits</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="14"/>
@@ -55522,12 +55545,12 @@
         <translation>Groupe:</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Fermer la fenêtre</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Voulez-vous réellement fermer cette fenêtre?</translation>
     </message>
@@ -55560,11 +55583,6 @@
         <source>&lt;b&gt;Template name&lt;b&gt;&lt;p&gt;Enter the name of the template. Templates may be autocompleted upon this name. In order to support autocompletion. the template name must only consist of letters (a-z and A-Z), digits (0-9) and underscores (_).&lt;/p&gt;</source>
         <translation>&lt;b&gt;Nom de gabarit&lt;/b&gt;&lt;p&gt;Entrer le nom du gabarit. Les gabarits peuvent être auto-complétés à partir de ce nom. Pour supporter l&apos;autocomplétion, le nom de gabarit ne doit contenir que des lettres (a-z et A-Z), des chiffres (0-9) et des underscores (_).&lt;/p&gt;</translation>
     </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>TemplateSingleVariableDialog</name>
@@ -55587,22 +55605,22 @@
 <context>
     <name>TemplateViewer</name>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Edition du Groupe de gabarits</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Suppression du gabarit</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Importation des gabarits</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Exportation des gabarits</translation>
     </message>
@@ -55647,72 +55665,72 @@
         <translation>Exporter...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Aide...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Aide sur les gabarits</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Fichiers gabarits (*.e3c);; Tous les fichiers (*) {4c?}</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Enregistrement des gabarits</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Lecture des gabarits</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Configuration...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation type="unfinished">Recharger</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_it.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_it.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2913,6 +2913,11 @@
         <source>%v/%m Files</source>
         <translation>Flussi %v/%m</translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4909,30 +4914,30 @@
         <translation>modificato</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Connessione da un non vietato</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
         <translation>Non connesso</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Una connessione è stata tentata da un host vietato &lt;b&gt;{0}&lt;/b&gt;.  Accettare questa connessione ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -22625,12 +22630,12 @@
         <translation type="unfinished">&lt;tr&gt;&lt;td&gt;&lt;b&gt;Segnalibri&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; non è stato trovato.</translation>
     </message>
@@ -46152,37 +46157,37 @@
         <translation>Passivo &apos;&gt;&gt;&gt;&apos;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Resetta</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Resetta e pulisci</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Drop Error</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
@@ -46197,86 +46202,86 @@
         <translation>&lt;b&gt;La finestra Shell&lt;/b&gt;&lt;p&gt;Questo è un semplice interprete che viene eseguito in una finestra. L&apos;interprete è quello usato per eseguire il programma sotto debug. Significa che puoi eseguire qualsiasi comando mentre il programma in debug viene eseguito.&lt;/p&gt;&lt;p&gt;Puoi usare i tasti cursore mentre inserisci i comandi. C&apos;è inoltre una cronologia dei comandi che può essere richiamata usando i tanti su e giù. Premendo i tasti su e giù dopo che del testo è stato inserito verrà avviata una ricerca incrementale.&lt;/p&gt;&lt;p&gt;La shell ha alcuni comandi speciali. &apos;reset&apos; uccide la shell e ne avvia una nuova. &apos;clear&apos; pulisce la finestra della shell. &apos;start&apos; è usato per cambiare il linguaggio della shell e deve essere seguito da uno dei linguaggi supportati. I linguaggi supportati sono elencati dal comando &apos;languages&apos;. Questi comandi (eccetto &apos;languages&apos;) sono disponibili tramite un menù contestuale.&lt;/p&gt;&lt;p&gt;Premendo il tasto Tab dopo aver inserito del testo verrà mostrata una lista di possibili comandi. L&apos;elemento rilevante può essere selezionato dalla lista. Se solo un elemento è disponibile, sarà inserito automaticamente.&lt;/p&gt;&lt;p&gt;In modalità di debug passiva la shell è disponibile solo dopo che il programma debuggato si è connesso all&apos;IDE fino a quando è terminato. Questo viene indicato da un prompt differente e dal titolo della finestra.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Passive Debug Mode</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Seleziona elemento</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Selezione cronologia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Seleziona l&apos;elemento dalla cronologia da esegurie (i più recenti sono gli ultimi).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>
 Non connesso</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Configura...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Taglia</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0*</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Il linguaggio &quot;{0}&quot; della shell non è supportato.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; non è un file.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46284,26 +46289,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55549,6 +55554,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Per usare una variabile in un template, devi solo racchiuderla con il carattare $. Quando usi il template, ti verrà chiesto il valora di questa variable.&lt;/p&gt;&lt;p&gt;Esempio di template: This is a $VAR$&lt;/p&gt;&lt;p&gt;Quando usi questo template, ti verrà chiesto il valore della variabile $VAR$. Ogni ricorrenza di $VAR$ verrà quindi sostituita con quello che hai inserito.&lt;/p&gt;&lt;p&gt;Se hai bisogno di un singolo $-character in un template, che non è usato per racchiudere una variabile, scrivi $$(due caratteri dollaro). Verranno automaticamente sostituiti con un singoleo $-character quando usi il template.&lt;/p&gt;&lt;p&gt;Se vuoi trattare in maniera specifica il contenuto di una variabile, il nome della variabile deve essere seguito da &apos;:&apos;  ed un indentificato di formato (e.g. $VAR:ml$). Gli indicatori supportati sono:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifica una formattazione multilinea. La prima linea del contenuto della variabile è preceduto da una stringa che ricorre prima della variabile sulla stessa riga del template. Tutte le altre linee sono precedute dallo stesso numero di spazi della linea che contiene la variabile.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifica una formattazione ripetuta. Ogni linea del contenuto della variabile è preceduto da una stringa trovata prima della variabile sulla linea del template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Le seguenti variabili predefinite possono essere utilizzate:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Data odierna in formato ISO (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;anno corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;Nome del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;percorso del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;percorso completo del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;percorso completo della directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nome del file corrente (senza directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;come &lt;i&gt;file_name&lt;/i&gt;, ma senza estensione&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;l&apos;estensione del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;il testo correntemente selezionato &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Selezione il punto d&apos;inserimento del cursore dopo che il template è inserito.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;il testo nella clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Se vuoi modificare il delimitatore di default, usa il dialogo di configurazione.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55586,7 +55609,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Aiuto template</translation>
+        <translation type="obsolete">Aiuto template</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="14"/>
@@ -55624,12 +55647,12 @@
         <translation>Gruppo:</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Chiudi dialogo</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Vuoi veramente chiudere questo dialogo ?</translation>
     </message>
@@ -55669,7 +55692,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Per usare una variabile in un template, devi solo racchiuderla con il carattare $. Quando usi il template, ti verrà chiesto il valora di questa variable.&lt;/p&gt;&lt;p&gt;Esempio di template: This is a $VAR$&lt;/p&gt;&lt;p&gt;Quando usi questo template, ti verrà chiesto il valore della variabile $VAR$. Ogni ricorrenza di $VAR$ verrà quindi sostituita con quello che hai inserito.&lt;/p&gt;&lt;p&gt;Se hai bisogno di un singolo $-character in un template, che non è usato per racchiudere una variabile, scrivi $$(due caratteri dollaro). Verranno automaticamente sostituiti con un singoleo $-character quando usi il template.&lt;/p&gt;&lt;p&gt;Se vuoi trattare in maniera specifica il contenuto di una variabile, il nome della variabile deve essere seguito da &apos;:&apos;  ed un indentificato di formato (e.g. $VAR:ml$). Gli indicatori supportati sono:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifica una formattazione multilinea. La prima linea del contenuto della variabile è preceduto da una stringa che ricorre prima della variabile sulla stessa riga del template. Tutte le altre linee sono precedute dallo stesso numero di spazi della linea che contiene la variabile.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifica una formattazione ripetuta. Ogni linea del contenuto della variabile è preceduto da una stringa trovata prima della variabile sulla linea del template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Le seguenti variabili predefinite possono essere utilizzate:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Data odierna in formato ISO (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;anno corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;Nome del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;percorso del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;percorso completo del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;percorso completo della directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nome del file corrente (senza directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;come &lt;i&gt;file_name&lt;/i&gt;, ma senza estensione&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;l&apos;estensione del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;il testo correntemente selezionato &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Selezione il punto d&apos;inserimento del cursore dopo che il template è inserito.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;il testo nella clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Se vuoi modificare il delimitatore di default, usa il dialogo di configurazione.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Per usare una variabile in un template, devi solo racchiuderla con il carattare $. Quando usi il template, ti verrà chiesto il valora di questa variable.&lt;/p&gt;&lt;p&gt;Esempio di template: This is a $VAR$&lt;/p&gt;&lt;p&gt;Quando usi questo template, ti verrà chiesto il valore della variabile $VAR$. Ogni ricorrenza di $VAR$ verrà quindi sostituita con quello che hai inserito.&lt;/p&gt;&lt;p&gt;Se hai bisogno di un singolo $-character in un template, che non è usato per racchiudere una variabile, scrivi $$(due caratteri dollaro). Verranno automaticamente sostituiti con un singoleo $-character quando usi il template.&lt;/p&gt;&lt;p&gt;Se vuoi trattare in maniera specifica il contenuto di una variabile, il nome della variabile deve essere seguito da &apos;:&apos;  ed un indentificato di formato (e.g. $VAR:ml$). Gli indicatori supportati sono:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifica una formattazione multilinea. La prima linea del contenuto della variabile è preceduto da una stringa che ricorre prima della variabile sulla stessa riga del template. Tutte le altre linee sono precedute dallo stesso numero di spazi della linea che contiene la variabile.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifica una formattazione ripetuta. Ogni linea del contenuto della variabile è preceduto da una stringa trovata prima della variabile sulla linea del template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Le seguenti variabili predefinite possono essere utilizzate:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Data odierna in formato ISO (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;anno corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;Nome del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;percorso del progetto (se presente)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;percorso completo del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;percorso completo della directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;nome del file corrente (senza directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;come &lt;i&gt;file_name&lt;/i&gt;, ma senza estensione&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;l&apos;estensione del file corrente&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;il testo correntemente selezionato &lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Selezione il punto d&apos;inserimento del cursore dopo che il template è inserito.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Seleziona l&apos;estensione del testo selezionato nel template dopo che il template è stato inserito (usato insieme a &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;il testo nella clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Se vuoi modificare il delimitatore di default, usa il dialogo di configurazione.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -55693,22 +55716,22 @@
 <context>
     <name>TemplateViewer</name>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Modifica gruppo template</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Rimuovi template</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Importa template</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Esporta template</translation>
     </message>
@@ -55753,72 +55776,72 @@
         <translation>Esporta...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Help sui template...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Help template</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Templates Files (*.e4c);; All Files (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Salva template</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Leggi template</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Configura...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vuoi veramente rimuovere &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Un gruppo di template con il nome &lt;b&gt;{0}&lt;/b&gt; esite già.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file template &lt;b&gt;{0}&lt;/b&gt; non può essere scritto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Il file template &lt;b&gt;{0}&lt;/b&gt; non può essere letto.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation type="unfinished">Ricarica</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_pt.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_pt.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2909,6 +2909,11 @@
         <source>%v/%m Files</source>
         <translation>%v/%m Ficheiros</translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4906,17 +4911,17 @@
         <translation>alterado</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Conexão desde anfitrião ilegal</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;O anfitrião ilegal &lt;b&gt;{0}&lt;/b&gt; tentou conectar. Aceitar esta conexão?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
@@ -4925,14 +4930,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation>Conexão de depuração passiva recebida
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation>Conexão de depuração passiva fechada
@@ -22598,12 +22603,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Marcadores&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; não foi encontrado.</translation>
     </message>
@@ -45973,119 +45978,119 @@
         <translation>Iniciar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Historial</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
+        <location filename="../QScintilla/Shell.py" line="220"/>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="221"/>
+        <source>Paste</source>
+        <translation>Colar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="227"/>
+        <source>Reset</source>
+        <translation type="unfinished">Reinicializar</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="228"/>
+        <source>Reset and Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="233"/>
+        <source>Configure...</source>
+        <translation>Configurar...</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="589"/>
+        <source>Select History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="589"/>
+        <source>Select the history entry to execute (most recent shown last).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="640"/>
+        <source>Passive Debug Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="641"/>
+        <source>
+Not connected</source>
+        <translation>Desconetado</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="643"/>
+        <source>No.</source>
+        <translation>Nº</translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="645"/>
+        <source>{0} on {1}, {2}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="783"/>
+        <source>StdOut: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="791"/>
+        <source>StdErr: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
+        <source>Shell language &quot;{0}&quot; not supported.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
+        <source>Drop Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
+        <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
+    </message>
+    <message>
         <location filename="../QScintilla/Shell.py" line="224"/>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
-        <source>Paste</source>
-        <translation>Colar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
-        <source>Reset</source>
-        <translation type="unfinished">Reinicializar</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
-        <source>Reset and Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
-        <source>Configure...</source>
-        <translation>Configurar...</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
-        <source>Select History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
-        <source>Select the history entry to execute (most recent shown last).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
-        <source>Passive Debug Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
-        <source>
-Not connected</source>
-        <translation>Desconetado</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
-        <source>No.</source>
-        <translation>Nº</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
-        <source>{0} on {1}, {2}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
-        <source>StdOut: {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
-        <source>StdErr: {0}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
-        <source>Shell language &quot;{0}&quot; not supported.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
-        <source>Drop Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
-        <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; não é um ficheiro.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Find</source>
         <translation>Encontrar</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46093,26 +46098,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55263,6 +55268,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished">Ajuda de Modelo</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55362,24 +55385,19 @@
         <translation>GRUPO</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Fechar caixa de diálogo</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Tem a certeza de que quer fechar a caixa de diálogo?</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Ajuda de Modelo</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ajuda de Modelo</translation>
     </message>
 </context>
 <context>
@@ -55443,92 +55461,92 @@
         <translation>Exportar...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Ajuda acerca de Modelos...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Configurar...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation type="unfinished">Ajuda de Modelo</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation>Recarregar</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_ru.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_ru.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2913,6 +2913,11 @@
         <source>%v/%m Files</source>
         <translation>%v/%m Файлы</translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4910,31 +4915,31 @@
         <translation>изменено</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>соединение с запрещённого хоста</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
         <translation>Нет соединения</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Попытка соединения с недопустимого компьютора &lt;b&gt;{0}&lt;/b&gt;. Разрешить соединение?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation>Получен запрос на соединение для пассивной отладки
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation>Соединение для пассивной отладки закрыто
@@ -22611,12 +22616,12 @@
         <translation>&lt;tr&gt;&lt;td&gt;&lt;b&gt;Закладки&lt;/b&gt;&lt;/td&gt;&lt;td&gt;{0}&lt;/td&gt;&lt;/tr&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation>Найти фиксацию</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation>&apos;{0}&apos; не найдено.</translation>
     </message>
@@ -46227,42 +46232,42 @@
         <translation>Пассивная &gt;&gt;&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Перезапустить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Переинициализировать и очистить</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Ошибка Drag&amp;&amp;Drop</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>Нет.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; не является файлом&lt;/p&gt;</translation>
     </message>
@@ -46272,7 +46277,7 @@
         <translation>Начало</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} в {1}, {2}</translation>
     </message>
@@ -46286,75 +46291,75 @@
 &lt;p&gt;В режиме пассивной отладки оболочка доступна только после того, как отлаживаемая программа подключится к IDE и до её завершения. Это отображается иным приглашением и другим заголовком окна.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Язык оболочки &quot;{0}&quot; не поддерживается.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Режим пассивной отладки</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>История</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Выбрать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Выберите историю</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>Выберите одну из предыдущих команд для выполнения.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>Нет соединения</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Настроить...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46365,13 +46370,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation>Неустановленная ситаксическая ошибка.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
@@ -46380,14 +46385,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation>Синтаксическая ошибка &quot;{1}&quot; в файле {0} в строке {2}, позиция {3}.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55646,6 +55651,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished">Помощь по шаблону</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Чтобы использовать переменные в шаблоне, вы просто должны заключить имя переменной в $-символы. При использовании шаблона вам будет предложено задать значение этой переменной.&lt;/p&gt;&lt;p&gt;Пример шаблона: Это $VAR$&lt;/p&gt;&lt;p&gt;При использовании этого шаблона вам будет предложено задать значение переменной $VAR$. Любые появления $VAR$ затем будут заменены на то что вы ввели.&lt;/p&gt;&lt;p&gt;Если вам в шаблоне нужен одиночный $-символ, который не используется для выделения переменной, используйте $$ (два $-символа). Они будут автоматически заменены одним $-символов при использовании шаблона.&lt;/p&gt;&lt;p&gt;Если вы хотите чтобы содержание переменной рассматривалось специальным образом, то укажите спецификатор форматирования отделив его двоеточиемот имени переменной (например, $VAR:ml$). Поддерживаемые спецификаторы:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Указывает многострочное форматирование. Содержимое переменных этого типа форматируется как параграф с отступом вправо. Величина отступа определяется текстом который предшествует данной переменной.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;То же самое как ml, но вместо пробелов отступ заполняется текстом который предшествует данной переменной.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt; В шаблонах можно использовать следующие предопределённые переменные:&lt;table&gt;&lt;tr&gt;&lt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Текущая дата в ИСО формате (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td &gt;&lt;td&gt;Текущий год&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;название проекта (если таковой имеются)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;путь проекта&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;полный путь текущего файла&lt;/td &gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;полный путь к родительскому каталогу&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;имя текущего файла (без каталогов)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;как&lt;i&gt;file_name&lt;/i&gt; но без расширения&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;расширение текущего файла&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;выбранный текст&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Устанавливает курсор в данной позиции после того как шаблон будет реализован.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Устанавливает начало выделенного текста в шаблоне после того как шаблон будет вставлен (используется вместе с &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Устанавливает конец выделенного текста в шаблон после того как шаблон будет вставлен (используется вместе с &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;текст в буфере обмена&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Символ разделителя можно изменить в диалоге настроек.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55683,7 +55706,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Помощь по шаблону</translation>
+        <translation type="obsolete">Помощь по шаблону</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.ui" line="14"/>
@@ -55721,12 +55744,12 @@
         <translation>Группа:</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Закрыть диалог</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Вы действительно хотите закрыть диалог?</translation>
     </message>
@@ -55764,7 +55787,7 @@
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Чтобы использовать переменные в шаблоне, вы просто должны заключить имя переменной в $-символы. При использовании шаблона вам будет предложено задать значение этой переменной.&lt;/p&gt;&lt;p&gt;Пример шаблона: Это $VAR$&lt;/p&gt;&lt;p&gt;При использовании этого шаблона вам будет предложено задать значение переменной $VAR$. Любые появления $VAR$ затем будут заменены на то что вы ввели.&lt;/p&gt;&lt;p&gt;Если вам в шаблоне нужен одиночный $-символ, который не используется для выделения переменной, используйте $$ (два $-символа). Они будут автоматически заменены одним $-символов при использовании шаблона.&lt;/p&gt;&lt;p&gt;Если вы хотите чтобы содержание переменной рассматривалось специальным образом, то укажите спецификатор форматирования отделив его двоеточиемот имени переменной (например, $VAR:ml$). Поддерживаемые спецификаторы:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Указывает многострочное форматирование. Содержимое переменных этого типа форматируется как параграф с отступом вправо. Величина отступа определяется текстом который предшествует данной переменной.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;То же самое как ml, но вместо пробелов отступ заполняется текстом который предшествует данной переменной.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt; В шаблонах можно использовать следующие предопределённые переменные:&lt;table&gt;&lt;tr&gt;&lt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Текущая дата в ИСО формате (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td &gt;&lt;td&gt;Текущий год&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;название проекта (если таковой имеются)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;путь проекта&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;полный путь текущего файла&lt;/td &gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;полный путь к родительскому каталогу&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;имя текущего файла (без каталогов)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;как&lt;i&gt;file_name&lt;/i&gt; но без расширения&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;расширение текущего файла&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;выбранный текст&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Устанавливает курсор в данной позиции после того как шаблон будет реализован.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Устанавливает начало выделенного текста в шаблоне после того как шаблон будет вставлен (используется вместе с &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Устанавливает конец выделенного текста в шаблон после того как шаблон будет вставлен (используется вместе с &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;текст в буфере обмена&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Символ разделителя можно изменить в диалоге настроек.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Чтобы использовать переменные в шаблоне, вы просто должны заключить имя переменной в $-символы. При использовании шаблона вам будет предложено задать значение этой переменной.&lt;/p&gt;&lt;p&gt;Пример шаблона: Это $VAR$&lt;/p&gt;&lt;p&gt;При использовании этого шаблона вам будет предложено задать значение переменной $VAR$. Любые появления $VAR$ затем будут заменены на то что вы ввели.&lt;/p&gt;&lt;p&gt;Если вам в шаблоне нужен одиночный $-символ, который не используется для выделения переменной, используйте $$ (два $-символа). Они будут автоматически заменены одним $-символов при использовании шаблона.&lt;/p&gt;&lt;p&gt;Если вы хотите чтобы содержание переменной рассматривалось специальным образом, то укажите спецификатор форматирования отделив его двоеточиемот имени переменной (например, $VAR:ml$). Поддерживаемые спецификаторы:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Указывает многострочное форматирование. Содержимое переменных этого типа форматируется как параграф с отступом вправо. Величина отступа определяется текстом который предшествует данной переменной.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;То же самое как ml, но вместо пробелов отступ заполняется текстом который предшествует данной переменной.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt; В шаблонах можно использовать следующие предопределённые переменные:&lt;table&gt;&lt;tr&gt;&lt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;Текущая дата в ИСО формате (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td &gt;&lt;td&gt;Текущий год&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;название проекта (если таковой имеются)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;путь проекта&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;полный путь текущего файла&lt;/td &gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;полный путь к родительскому каталогу&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;имя текущего файла (без каталогов)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;как&lt;i&gt;file_name&lt;/i&gt; но без расширения&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;расширение текущего файла&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;выбранный текст&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Устанавливает курсор в данной позиции после того как шаблон будет реализован.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Устанавливает начало выделенного текста в шаблоне после того как шаблон будет вставлен (используется вместе с &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Устанавливает конец выделенного текста в шаблон после того как шаблон будет вставлен (используется вместе с &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;текст в буфере обмена&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;Символ разделителя можно изменить в диалоге настроек.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -55788,32 +55811,32 @@
 <context>
     <name>TemplateViewer</name>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Редактировать группу шаблонов</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Удалить шаблон</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Импорт шаблонов</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Экспорт шаблонов</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Группа шаблонов с именем &lt;b&gt;{0}&lt;/b&gt; уже существует.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить&lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</translation>
     </message>
@@ -55858,62 +55881,62 @@
         <translation>Экспорт...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Помощь по шаблонам...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Помощь по шаблону</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Файлы шаблонов (*.e4c);; Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Сохранить шаблоны</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно сохранить файл шаблонов: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Прочитать шаблоны</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл шаблонов: &lt;b&gt;{0}&lt;/b&gt;&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Настроить...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Группы шаблонов&lt;/b&gt; - группировка отдельных шаблонов. У групп имеются атрибуты, которые определяют, к какому языку программирования относятся шаблоны в данной группе. Для того, чтобы добавлять шаблоны, должна быть определена хотя бы одна группа.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Шаблоны&lt;/b&gt; - собственно шаблоны. Помошь по определению шаблонов находится в диалоге редактирования шаблона.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation>Переоткрыть</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation>Прочитать шаблоны</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation>Шаблоны содержат несохраненные изменения. Отбросить их?</translation>
     </message>
--- a/i18n/eric6_tr.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_tr.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2902,6 +2902,11 @@
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4888,17 +4893,17 @@
         <translation>değişti</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>Yasal olmayan bir host tan balğlantı</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt;kaçak bir barındırıcıdan (host) bağlantı denemesi. Bu bağlantıyı kabul ediyor musunuz?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
@@ -4907,13 +4912,13 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -22539,12 +22544,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished">&apos;{0}&apos; bulunamadı.</translation>
     </message>
@@ -45923,121 +45928,121 @@
         <translation>Başla</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>Geçmiş</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>Girişi Seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>Temizle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation>Kes</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>Kopyala</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>Yapıştır</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>Başadön</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>Başadön ve temizle</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>Ayarlanıyor...</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>Geçmişi Seç</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>geçmişte yapılanları göster (ençok gösterilenleri seç).</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>Pasif Hata Ayıklama Modu</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>
 Bağlantı yok</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>NO.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation>{0} üzerin {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation>Stdçıktı:{0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation>stdhata: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation>Kabuk dili &quot;{0}&quot; desteklenmiyor.
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>Düşme hatası</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; bir dosya değil.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation type="unfinished">Bul</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46045,26 +46050,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55239,6 +55244,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished">Şablon Yardımı</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55338,24 +55361,19 @@
         <translation>GRUP</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>Diyaloğu kapat</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>Diyaloğu kapatmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>Şablon Yardımı</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Şablon Yardımı</translation>
     </message>
 </context>
 <context>
@@ -55419,92 +55437,92 @@
         <translation>Dışa Aktar...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>Şablonlar hakkında yardım...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>Ayarlanıyor...</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>Şablonu Kaldır</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Gerçekten &lt;b&gt;{0}&lt;/b&gt; ni kaldırmak mı istiyorsunuz?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>Şablonları İçe Aktar</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>Şablon  Dosyaları (*.e4c);;Tüm dosyalar (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>Şablonları Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>Şablon Yardımı</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>Şablon Grubunu Düzenle</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>Geçicileri kaydet</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>Şablonları Oku</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation>&lt;p&gt;ŞAblon dosyası &lt;b&gt;{0}&lt;/b&gt; okunamıyor.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation type="unfinished">Yeniden Yükle</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>
--- a/i18n/eric6_zh_CN.GB2312.ts	Sat Oct 03 14:37:29 2015 +0200
+++ b/i18n/eric6_zh_CN.GB2312.ts	Sun Oct 04 13:35:09 2015 +0200
@@ -2899,6 +2899,11 @@
         <source>%v/%m Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../DataViews/CodeMetricsDialog.py" line="201"/>
+        <source>comment lines</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CodeStyleCheckerDialog</name>
@@ -4877,12 +4882,12 @@
         <translation>改变</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>Connection from illegal host</source>
         <translation>连接非法主机</translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1306"/>
+        <location filename="../Debugger/DebugServer.py" line="1323"/>
         <source>
 Not connected
 </source>
@@ -4891,18 +4896,18 @@
 </translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="684"/>
+        <location filename="../Debugger/DebugServer.py" line="701"/>
         <source>&lt;p&gt;A connection was attempted by the illegal host &lt;b&gt;{0}&lt;/b&gt;. Accept this connection?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1486"/>
+        <location filename="../Debugger/DebugServer.py" line="1503"/>
         <source>Passive debug connection received
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebugServer.py" line="1500"/>
+        <location filename="../Debugger/DebugServer.py" line="1517"/>
         <source>Passive debug connection closed
 </source>
         <translation type="unfinished"></translation>
@@ -22505,12 +22510,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>Find Commit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1875"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1874"/>
         <source>&apos;{0}&apos; was not found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -46013,120 +46018,120 @@
         <translation>开始</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="216"/>
+        <location filename="../QScintilla/Shell.py" line="212"/>
         <source>History</source>
         <translation>历史</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="217"/>
+        <location filename="../QScintilla/Shell.py" line="213"/>
         <source>Select entry</source>
         <translation>选择条目</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="218"/>
+        <location filename="../QScintilla/Shell.py" line="214"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="230"/>
+        <location filename="../QScintilla/Shell.py" line="226"/>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="224"/>
+        <location filename="../QScintilla/Shell.py" line="220"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="225"/>
+        <location filename="../QScintilla/Shell.py" line="221"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="231"/>
+        <location filename="../QScintilla/Shell.py" line="227"/>
         <source>Reset</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="232"/>
+        <location filename="../QScintilla/Shell.py" line="228"/>
         <source>Reset and Clear</source>
         <translation>重置并清除</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="237"/>
+        <location filename="../QScintilla/Shell.py" line="233"/>
         <source>Configure...</source>
         <translation>配置……</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select History</source>
         <translation>选择历史</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="583"/>
+        <location filename="../QScintilla/Shell.py" line="589"/>
         <source>Select the history entry to execute (most recent shown last).</source>
         <translation>选择历史条目以执行(最常用的显示在最后)。</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="634"/>
+        <location filename="../QScintilla/Shell.py" line="640"/>
         <source>Passive Debug Mode</source>
         <translation>被动调试模式</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="635"/>
+        <location filename="../QScintilla/Shell.py" line="641"/>
         <source>
 Not connected</source>
         <translation>
 没有连接</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="637"/>
+        <location filename="../QScintilla/Shell.py" line="643"/>
         <source>No.</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>Drop Error</source>
         <translation>降落误差</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="223"/>
+        <location filename="../QScintilla/Shell.py" line="219"/>
         <source>Cut</source>
         <translation type="unfinished">剪切</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="639"/>
+        <location filename="../QScintilla/Shell.py" line="645"/>
         <source>{0} on {1}, {2}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="777"/>
+        <location filename="../QScintilla/Shell.py" line="783"/>
         <source>StdOut: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="785"/>
+        <location filename="../QScintilla/Shell.py" line="791"/>
         <source>StdErr: {0}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1391"/>
+        <location filename="../QScintilla/Shell.py" line="1399"/>
         <source>Shell language &quot;{0}&quot; not supported.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1683"/>
+        <location filename="../QScintilla/Shell.py" line="1684"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="228"/>
+        <location filename="../QScintilla/Shell.py" line="224"/>
         <source>Find</source>
         <translation type="unfinished">查找</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="678"/>
+        <location filename="../QScintilla/Shell.py" line="684"/>
         <source>Exception &quot;{0}&quot;
 {1}
 File: {2}, Line: {3}
@@ -46134,26 +46139,26 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="710"/>
+        <location filename="../QScintilla/Shell.py" line="716"/>
         <source>Unspecified syntax error.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="688"/>
+        <location filename="../QScintilla/Shell.py" line="694"/>
         <source>Exception &quot;{0}&quot;
 {1}
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="712"/>
+        <location filename="../QScintilla/Shell.py" line="718"/>
         <source>Syntax error &quot;{1}&quot; in file {0} at line {2}, character {3}.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="735"/>
+        <location filename="../QScintilla/Shell.py" line="741"/>
         <source>Signal &quot;{0}&quot; generated in file {1} at line {2}.
 Function: {3}({4})</source>
         <translation type="unfinished"></translation>
@@ -55375,6 +55380,24 @@
     </message>
 </context>
 <context>
+    <name>TemplateHelpDialog</name>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="14"/>
+        <source>Template Help</source>
+        <translation type="unfinished">模板帮助</translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.ui" line="23"/>
+        <source>&lt;b&gt;Template Help&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TemplateMultipleVariablesDialog</name>
     <message>
         <location filename="../Templates/TemplateMultipleVariablesDialog.py" line="106"/>
@@ -55477,24 +55500,19 @@
         <translation>组</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Close dialog</source>
         <translation>关闭对话框</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="102"/>
+        <location filename="../Templates/TemplatePropertiesDialog.py" line="104"/>
         <source>Do you really want to close the dialog?</source>
         <translation>确定要关闭对话框?</translation>
     </message>
     <message>
         <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
         <source>Template Help</source>
-        <translation>模板帮助</translation>
-    </message>
-    <message>
-        <location filename="../Templates/TemplatePropertiesDialog.py" line="114"/>
-        <source>&lt;p&gt;To use variables in a template, you just have to enclose the variablename with $-characters. When you use the template, you will then be asked for a value for this variable.&lt;/p&gt;&lt;p&gt;Example template: This is a $VAR$&lt;/p&gt;&lt;p&gt;When you use this template you will be prompted for a value for the variable $VAR$. Any occurrences of $VAR$ will then be replaced with whatever you&apos;ve entered.&lt;/p&gt;&lt;p&gt;If you need a single $-character in a template, which is not used to enclose a variable, type $$(two dollar characters) instead. They will automatically be replaced with a single $-character when you use the template.&lt;/p&gt;&lt;p&gt;If you want a variables contents to be treated specially, the variablename must be followed by a &apos;:&apos; and one formatting specifier (e.g. $VAR:ml$). The supported specifiers are:&lt;table&gt;&lt;tr&gt;&lt;td&gt;ml&lt;/td&gt;&lt;td&gt;Specifies a multiline formatting. The first line of the variable contents is prefixed with the string occurring before the variable on the same line of the template. All other lines are prefixed by the same amount of whitespace as the line containing the variable.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;rl&lt;/td&gt;&lt;td&gt;Specifies a repeated line formatting. Each line of the variable contents is prefixed with the string occuring before the variable on the same line of the template.&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;The following predefined variables may be used in a template:&lt;table&gt;&lt;tr&gt;&lt;td&gt;date&lt;/td&gt;&lt;td&gt;today&apos;s date in ISO format (YYYY-MM-DD)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;year&lt;/td&gt;&lt;td&gt;the current year&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_name&lt;/td&gt;&lt;td&gt;the name of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;project_path&lt;/td&gt;&lt;td&gt;the path of the project (if any)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;path_name&lt;/td&gt;&lt;td&gt;full path of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;dir_name&lt;/td&gt;&lt;td&gt;full path of the parent directory&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;file_name&lt;/td&gt;&lt;td&gt;the current file name (without directory)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;base_name&lt;/td&gt;&lt;td&gt;like &lt;i&gt;file_name&lt;/i&gt;, but without extension&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ext&lt;/td&gt;&lt;td&gt;the extension of the current file&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;cur_select&lt;/td&gt;&lt;td&gt;the currently selected text&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;insertion&lt;/td&gt;&lt;td&gt;Sets insertion point for cursor after template is inserted.&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_start&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_end&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;select_end&lt;/td&gt;&lt;td&gt;Sets span of selected text in template after template is inserted (used together with &apos;select_start&apos;).&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;clipboard&lt;/td&gt;&lt;td&gt;the text of the clipboard&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/p&gt;&lt;p&gt;If you want to change the default delimiter to anything different, please use the configuration dialog to do so.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">模板帮助</translation>
     </message>
 </context>
 <context>
@@ -55558,92 +55576,92 @@
         <translation>导出……</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="423"/>
+        <location filename="../Templates/TemplateViewer.py" line="424"/>
         <source>Help about Templates...</source>
         <translation>模板帮助……</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="426"/>
+        <location filename="../Templates/TemplateViewer.py" line="427"/>
         <source>Configure...</source>
         <translation>配置……</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>Remove Template</source>
         <translation>移除模板</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="555"/>
+        <location filename="../Templates/TemplateViewer.py" line="560"/>
         <source>Import Templates</source>
         <translation>导入模板</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Export Templates</source>
         <translation>导出模板</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="569"/>
+        <location filename="../Templates/TemplateViewer.py" line="574"/>
         <source>Templates Files (*.e4c);; All Files (*)</source>
         <translation>模板文件 (*.e4c);; 所有文件 (*)</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>Template Help</source>
         <translation>模板帮助</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>Edit Template Group</source>
         <translation>编辑模板组</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>Save templates</source>
         <translation>保存模板</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>Read templates</source>
         <translation>写入模板</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="528"/>
+        <location filename="../Templates/TemplateViewer.py" line="533"/>
         <source>&lt;p&gt;Do you really want to remove &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="854"/>
+        <location filename="../Templates/TemplateViewer.py" line="859"/>
         <source>&lt;p&gt;A template group with the name &lt;b&gt;{0}&lt;/b&gt; already exists.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="948"/>
+        <location filename="../Templates/TemplateViewer.py" line="953"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be written.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="982"/>
+        <location filename="../Templates/TemplateViewer.py" line="987"/>
         <source>&lt;p&gt;The templates file &lt;b&gt;{0}&lt;/b&gt; could not be read.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="609"/>
+        <location filename="../Templates/TemplateViewer.py" line="614"/>
         <source>&lt;p&gt;&lt;b&gt;Template groups&lt;/b&gt; are a means of grouping individual templates. Groups have an attribute that specifies, which programming language they apply for. In order to add template entries, at least one group has to be defined.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Template entries&lt;/b&gt; are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="421"/>
+        <location filename="../Templates/TemplateViewer.py" line="422"/>
         <source>Reload</source>
         <translation type="unfinished">重新载入</translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>Reload Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Templates/TemplateViewer.py" line="590"/>
+        <location filename="../Templates/TemplateViewer.py" line="595"/>
         <source>The templates contain unsaved changes. Shall these changes be discarded?</source>
         <translation type="unfinished"></translation>
     </message>

eric ide

mercurial