--- a/i18n/eric6_zh_CN.ts Sun Apr 15 10:50:34 2018 +0200
+++ b/i18n/eric6_zh_CN.ts Sun Apr 15 10:50:50 2018 +0200
@@ -4054,7 +4054,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="864"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="867"/>
<source> no message defined for code '{0}'</source>
<translation type="unfinished"></translation>
</message>
@@ -6371,52 +6371,52 @@
<context>
<name>DebugViewer</name>
<message>
- <location filename="../Debugger/DebugViewer.py" line="175"/>
+ <location filename="../Debugger/DebugViewer.py" line="174"/>
<source>Enter regular expression patterns separated by ';' to define variable filters. </source>
<translation>输入正则表达式模块（模块间用“;”分隔）以定义变量过滤器。</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="179"/>
+ <location filename="../Debugger/DebugViewer.py" line="178"/>
<source>Enter regular expression patterns separated by ';' to define variable filters. All variables and class attributes matched by one of the expressions are not shown in the list above.</source>
<translation>输入正则表达式模块（模块间用“;”分隔）以定义变量过滤器。所有与表达式中的一个模块匹配的变量和类属性不会显示在以上列表中。</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="185"/>
+ <location filename="../Debugger/DebugViewer.py" line="184"/>
<source>Set</source>
<translation>设置</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="160"/>
+ <location filename="../Debugger/DebugViewer.py" line="159"/>
<source>Source</source>
<translation>源文件</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="262"/>
+ <location filename="../Debugger/DebugViewer.py" line="261"/>
<source>Threads:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="264"/>
+ <location filename="../Debugger/DebugViewer.py" line="263"/>
<source>ID</source>
<translation>ID</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="264"/>
+ <location filename="../Debugger/DebugViewer.py" line="263"/>
<source>Name</source>
<translation>名称</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="264"/>
+ <location filename="../Debugger/DebugViewer.py" line="263"/>
<source>State</source>
<translation>状态</translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="521"/>
+ <location filename="../Debugger/DebugViewer.py" line="520"/>
<source>waiting at breakpoint</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/DebugViewer.py" line="523"/>
+ <location filename="../Debugger/DebugViewer.py" line="522"/>
<source>running</source>
<translation type="unfinished"></translation>
</message>
@@ -61835,12 +61835,12 @@
<context>
<name>Shell</name>
<message>
- <location filename="../QScintilla/Shell.py" line="139"/>
+ <location filename="../QScintilla/Shell.py" line="138"/>
<source>Shell - Passive</source>
<translation>命令行 - 被动</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="141"/>
+ <location filename="../QScintilla/Shell.py" line="140"/>
<source>Shell</source>
<translation>命令行</translation>
</message>
@@ -61850,130 +61850,130 @@
<translation type="obsolete"><b>命令行窗口</b><p>就是一个运行在窗口中的解释器。该解释器用于运行被调试的程序。也就是说你可以在调试程序时执行任何命令。</p><p>在输入命令时可以使用方向键。也可以使用向上或向下键重新调用已运行过的命令。在一些文字后按下向上或向下键将开始增量搜索。</p><p>命令行具有一些特殊命令。“reset”重新开始一个新的命令行。“clear”清除命令行窗口的显示。“start”用于开关命令行语言，其后必须加上一个支持的语言。支持的语言可通过“languages”命令列出。这些命令（“languages”除外）也可以通过上下文菜单进行调用。</p><p>在一些输入的文字后按下 Tab 键将显示一个可用命令行列表。可能通过该列表选择相关的条目。仅有一个条目可用时，将自动插入该条目。</p><p>在被动调试模式中，命令行只在要调试的程序连接到 IDE 以后才有效，直到调试完成。这一点将通过不同的提示符和窗口标题来指示。</p></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="251"/>
+ <location filename="../QScintilla/Shell.py" line="250"/>
<source>Passive >>> </source>
<translation>被动 >>></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="267"/>
+ <location filename="../QScintilla/Shell.py" line="266"/>
<source>Start</source>
<translation>开始</translation>
</message>
<message>
+ <location filename="../QScintilla/Shell.py" line="271"/>
+ <source>History</source>
+ <translation>历史</translation>
+ </message>
+ <message>
<location filename="../QScintilla/Shell.py" line="272"/>
- <source>History</source>
- <translation>历史</translation>
+ <source>Select entry</source>
+ <translation>选择条目</translation>
</message>
<message>
<location filename="../QScintilla/Shell.py" line="273"/>
- <source>Select entry</source>
- <translation>选择条目</translation>
- </message>
- <message>
- <location filename="../QScintilla/Shell.py" line="274"/>
<source>Show</source>
<translation>显示</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="287"/>
+ <location filename="../QScintilla/Shell.py" line="286"/>
<source>Clear</source>
<translation>清除</translation>
</message>
<message>
+ <location filename="../QScintilla/Shell.py" line="279"/>
+ <source>Copy</source>
+ <translation>复制</translation>
+ </message>
+ <message>
<location filename="../QScintilla/Shell.py" line="280"/>
- <source>Copy</source>
- <translation>复制</translation>
- </message>
- <message>
- <location filename="../QScintilla/Shell.py" line="281"/>
<source>Paste</source>
<translation>粘贴</translation>
</message>
<message>
+ <location filename="../QScintilla/Shell.py" line="287"/>
+ <source>Reset</source>
+ <translation>重置</translation>
+ </message>
+ <message>
<location filename="../QScintilla/Shell.py" line="288"/>
- <source>Reset</source>
- <translation>重置</translation>
- </message>
- <message>
- <location filename="../QScintilla/Shell.py" line="289"/>
<source>Reset and Clear</source>
<translation>重置并清除</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="294"/>
+ <location filename="../QScintilla/Shell.py" line="293"/>
<source>Configure...</source>
<translation>配置…</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="716"/>
+ <location filename="../QScintilla/Shell.py" line="710"/>
<source>Select History</source>
<translation>选择历史</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="716"/>
+ <location filename="../QScintilla/Shell.py" line="710"/>
<source>Select the history entry to execute (most recent shown last).</source>
<translation>选择历史条目以执行（最常用的显示在最后）。</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="779"/>
+ <location filename="../QScintilla/Shell.py" line="773"/>
<source>Passive Debug Mode</source>
<translation>被动调试模式</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="780"/>
+ <location filename="../QScintilla/Shell.py" line="774"/>
<source>
Not connected</source>
<translation>
没有连接</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="782"/>
+ <location filename="../QScintilla/Shell.py" line="776"/>
<source>No.</source>
<translation>No.</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2035"/>
+ <location filename="../QScintilla/Shell.py" line="2012"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="279"/>
+ <location filename="../QScintilla/Shell.py" line="278"/>
<source>Cut</source>
<translation>剪切</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="784"/>
+ <location filename="../QScintilla/Shell.py" line="778"/>
<source>{0} on {1}, {2}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="944"/>
+ <location filename="../QScintilla/Shell.py" line="921"/>
<source>StdOut: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="952"/>
+ <location filename="../QScintilla/Shell.py" line="929"/>
<source>StdErr: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1720"/>
+ <location filename="../QScintilla/Shell.py" line="1697"/>
<source>Shell language "{0}" not supported.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2035"/>
+ <location filename="../QScintilla/Shell.py" line="2012"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"><p><b>{0}</b> 不是一个文件。</p></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="285"/>
+ <location filename="../QScintilla/Shell.py" line="284"/>
<source>Find</source>
<translation type="unfinished">查找</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="827"/>
+ <location filename="../QScintilla/Shell.py" line="821"/>
<source>Exception "{0}"
{1}
File: {2}, Line: {3}
@@ -61981,37 +61981,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="860"/>
+ <location filename="../QScintilla/Shell.py" line="854"/>
<source>Unspecified syntax error.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="837"/>
+ <location filename="../QScintilla/Shell.py" line="831"/>
<source>Exception "{0}"
{1}
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="862"/>
+ <location filename="../QScintilla/Shell.py" line="856"/>
<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="885"/>
+ <location filename="../QScintilla/Shell.py" line="879"/>
<source>Signal "{0}" generated in file {1} at line {2}.
Function: {3}({4})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="144"/>
+ <location filename="../QScintilla/Shell.py" line="143"/>
<source><b>The Shell Window</b><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. 'quit' is used to exit the application.These commands (except 'languages') are available through the window menus as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="167"/>
+ <location filename="../QScintilla/Shell.py" line="166"/>
<source><b>The Shell Window</b><p>This is simply an interpreter running in a window. The interpreter is the one that is used to run the program being debugged. This means that you can execute any command while the program being debugged is running.</p><p>You can use the cursor keys while entering commands. There is also a history of commands that can be recalled using the up and down cursor keys while holding down the Ctrl-key. This can be switched to just the up and down cursor keys on the Shell page of the configuration dialog. Pressing these keys after some text has been entered will start an incremental search.</p><p>The shell has some special commands. 'reset' kills the shell and starts a new one. 'clear' clears the display of the shell window. 'start' is used to switch the shell language and must be followed by a supported language. Supported languages are listed by the 'languages' command. These commands (except 'languages') are available through the context menu as well.</p><p>Pressing the Tab key after some text has been entered will show a list of possible completions. The relevant entry may be selected from this list. If only one entry is available, this will be inserted automatically.</p><p>In passive debugging mode the shell is only available after the program to be debugged has connected to the IDE until it has finished. This is indicated by a different prompt and by an indication in the window caption.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -77212,12 +77212,12 @@
<context>
<name>VariableItem</name>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="57"/>
+ <location filename="../Debugger/VariablesViewer.py" line="56"/>
<source><double click to show value></source>
<translation><double click to show value></translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="61"/>
+ <location filename="../Debugger/VariablesViewer.py" line="60"/>
<source><variable value is too big></source>
<translation type="unfinished"></translation>
</message>
@@ -77284,62 +77284,62 @@
<context>
<name>VariablesViewer</name>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="364"/>
+ <location filename="../Debugger/VariablesViewer.py" line="363"/>
<source>Global Variables</source>
<translation>全局变量</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="365"/>
+ <location filename="../Debugger/VariablesViewer.py" line="364"/>
<source>Globals</source>
<translation>全局</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="376"/>
+ <location filename="../Debugger/VariablesViewer.py" line="375"/>
<source>Value</source>
<translation>值</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="376"/>
- <source>Type</source>
- <translation>类型</translation>
- </message>
- <message>
- <location filename="../Debugger/VariablesViewer.py" line="369"/>
- <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source>
- <translation><b>全局变量浏览器窗口</b><p>该窗口显示调试程序的全局变量。</p></translation>
- </message>
- <message>
<location filename="../Debugger/VariablesViewer.py" line="375"/>
+ <source>Type</source>
+ <translation>类型</translation>
+ </message>
+ <message>
+ <location filename="../Debugger/VariablesViewer.py" line="368"/>
+ <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source>
+ <translation><b>全局变量浏览器窗口</b><p>该窗口显示调试程序的全局变量。</p></translation>
+ </message>
+ <message>
+ <location filename="../Debugger/VariablesViewer.py" line="374"/>
<source>Local Variables</source>
<translation>局部变量</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="376"/>
+ <location filename="../Debugger/VariablesViewer.py" line="375"/>
<source>Locals</source>
<translation>局部</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="380"/>
+ <location filename="../Debugger/VariablesViewer.py" line="379"/>
<source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source>
<translation><b>局部变量浏览器窗口</b><p>该窗口显示高度程序的局部变量。</p></translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="411"/>
+ <location filename="../Debugger/VariablesViewer.py" line="410"/>
<source>Show Details...</source>
<translation>显示细节…</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="419"/>
+ <location filename="../Debugger/VariablesViewer.py" line="418"/>
<source>Configure...</source>
<translation>配置…</translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="644"/>
+ <location filename="../Debugger/VariablesViewer.py" line="638"/>
<source>{0} items</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Debugger/VariablesViewer.py" line="417"/>
+ <location filename="../Debugger/VariablesViewer.py" line="416"/>
<source>Refresh</source>
<translation type="unfinished">刷新</translation>
</message>
@@ -80927,27 +80927,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../ViewManager/ViewManager.py" line="6533"/>
+ <location filename="../ViewManager/ViewManager.py" line="6531"/>
<source>Edit Spelling Dictionary</source>
<translation type="unfinished">编辑拼写字典</translation>
</message>
<message>
- <location filename="../ViewManager/ViewManager.py" line="6508"/>
+ <location filename="../ViewManager/ViewManager.py" line="6506"/>
<source>Editing {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../ViewManager/ViewManager.py" line="6493"/>
+ <location filename="../ViewManager/ViewManager.py" line="6491"/>
<source><p>The spelling dictionary file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../ViewManager/ViewManager.py" line="6520"/>
+ <location filename="../ViewManager/ViewManager.py" line="6518"/>
<source><p>The spelling dictionary file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../ViewManager/ViewManager.py" line="6533"/>
+ <location filename="../ViewManager/ViewManager.py" line="6531"/>
<source>The spelling dictionary was saved successfully.</source>
<translation type="unfinished"></translation>
</message>
