--- 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><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></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>'{0}' 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 "{0}" 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><p><b>{0}</b> is not a file.</p></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 "{0}" 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><p><b>{0}</b> is not a file.</p></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 "{0}"
{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 "{0}"
{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 "{1}" 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 "{0}" 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><b>Template Help</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Templates/TemplateHelpDialog.py" line="31"/>
+ <source><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></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><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></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><p>Do you really want to remove <b>{0}</b>?</p></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><p>A template group with the name <b>{0}</b> already exists.</p></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><p>The templates file <b>{0}</b> could not be written.</p></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><p>The templates file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Templates/TemplateViewer.py" line="609"/>
+ <location filename="../Templates/TemplateViewer.py" line="614"/>
<source><p><b>Template groups</b> 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.</p><p><b>Template entries</b> are the actual templates. They are grouped by the template groups. Help about how to define them is available in the template edit dialog.</p></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>
