--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jul 02 18:19:03 2011 +0200
+++ b/i18n/eric5_zh_CN.GB2312.ts Sun Jul 03 18:01:53 2011 +0200
@@ -4019,19 +4019,19 @@
<context>
<name>DebugServer</name>
<message>
- <location filename="Debugger/DebugServer.py" line="134"/>
+ <location filename="Debugger/DebugServer.py" line="143"/>
<source>created</source>
<comment>must be same as in EditWatchpointDialog</comment>
<translation>创建</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="136"/>
+ <location filename="Debugger/DebugServer.py" line="145"/>
<source>changed</source>
<comment>must be same as in EditWatchpointDialog</comment>
<translation>改变</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="573"/>
+ <location filename="Debugger/DebugServer.py" line="582"/>
<source>Connection from illegal host</source>
<translation>连接非法主机</translation>
</message>
@@ -4041,7 +4041,7 @@
<translation type="obsolete"><p>非法主机 <b>%1</b> 试图进行连接。同意连接？</p></translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="1125"/>
+ <location filename="Debugger/DebugServer.py" line="1138"/>
<source>
Not connected
</source>
@@ -4050,17 +4050,17 @@
</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="1257"/>
+ <location filename="Debugger/DebugServer.py" line="1296"/>
<source>Passive debug connection received</source>
<translation>接受被动调试连接</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="1271"/>
+ <location filename="Debugger/DebugServer.py" line="1310"/>
<source>Passive debug connection closed</source>
<translation>关闭被动调试连接</translation>
</message>
<message>
- <location filename="Debugger/DebugServer.py" line="573"/>
+ <location filename="Debugger/DebugServer.py" line="582"/>
<source><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></source>
<translation type="unfinished"></translation>
</message>
@@ -46242,27 +46242,27 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="316"/>
+ <location filename="PyUnit/UnittestDialog.py" line="330"/>
<source>Unittest</source>
<translation>单元测试</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="25"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="26"/>
<source>Enter the test name. Leave empty to use the default name "suite".</source>
<translation>输入测试名称。为空时使用默认名称“suite”。</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="28"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="29"/>
<source><b>Testname</b><p>Enter the name of the test to be performed. This name must follow the rules given by Python's unittest module. If this field is empty, the default name of "suite" will be used.</p></source>
<translation><b>测试名</b><p>输入要执行测试的名称。该名称必须遵循由 Python 的单元测试模块所给出的规则。如果该区域没有输入，则使用默认名称“suite”。</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="44"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="45"/>
<source>Enter name of file defining the testsuite</source>
<translation>输入在测试组件中定义的文件名称</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="47"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="48"/>
<source><b>Testsuite</b>
<p>Enter the name of the file defining the testsuite.
It should have a method with a name given below. If no name is given, the suite() method will be tried. If no such method can be
@@ -46274,122 +46274,122 @@
如果没有找到相应的方法，则将在模块中检查合适的测试案例。</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="70"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="71"/>
<source>Enter &test name:</source>
<translation>输入测试名(&t)：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="80"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="81"/>
<source>Open a file selection dialog</source>
<translation>打开文件选择对话框</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="83"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="84"/>
<source>...</source>
<translation>……</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="90"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="91"/>
<source>Enter test &filename:</source>
<translation>输入测试文件名(&f)：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="109"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="110"/>
<source>Select whether you want to run the test locally</source>
<translation>选择是否在局部运行测试</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="112"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="113"/>
<source>Run &local</source>
<translation>局部运行(&l)</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="119"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="120"/>
<source>Select whether coverage data should be collected</source>
<translation>选择是否收集覆盖率数据</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="122"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="123"/>
<source>C&ollect coverage data</source>
<translation>收集覆盖率数据(&o)</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="132"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="133"/>
<source>Select whether old coverage data should be erased</source>
<translation>选择是否擦除原有的覆盖率数据</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="135"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="136"/>
<source>&Erase coverage data</source>
<translation>擦除覆盖率数据(&E)</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="153"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="154"/>
<source>Progress:</source>
<translation>进程：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="190"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="191"/>
<source>Run:</source>
<translation>运行：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="197"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="198"/>
<source>Number of tests run</source>
<translation>测试运行的数目</translation>
</message>
<message>
<location filename="PyUnit/UnittestDialog.ui" line="251"/>
<source>0</source>
- <translation>0</translation>
- </message>
- <message>
- <location filename="PyUnit/UnittestDialog.ui" line="207"/>
+ <translation type="obsolete">0</translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="242"/>
<source>Failures:</source>
<translation>失败：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="214"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="249"/>
<source>Number of test failures</source>
<translation>测试失败的数目</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="224"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="259"/>
<source>Errors:</source>
<translation>错误：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="231"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="266"/>
<source>Number of test errors</source>
<translation>测试错误的数目</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="241"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="208"/>
<source>Remaining:</source>
<translation>剩余：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="248"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="215"/>
<source>Number of tests to be run</source>
<translation>将要运行的测试的数目</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="279"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="348"/>
<source>Tests performed:</source>
<translation>测试已完成：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="289"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="358"/>
<source>Failures and errors:</source>
<translation>失败和错误：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="296"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="365"/>
<source>Failures and Errors list</source>
<translation>失败和错误列表</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="299"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="368"/>
<source><b>Failures and Errors list</b>
<p>This list shows all failed and errored tests.
Double clicking on an entry will show the respective traceback.</p></source>
@@ -46398,7 +46398,7 @@
双击条目将显示相应的追踪。</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.ui" line="326"/>
+ <location filename="PyUnit/UnittestDialog.ui" line="395"/>
<source>Idle</source>
<translation>空闲</translation>
</message>
@@ -46433,12 +46433,12 @@
<translation><b>中止测试</b><p>该按钮中止一个正在运行的单元测试。</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="98"/>
+ <location filename="PyUnit/UnittestDialog.py" line="99"/>
<source>^Failure: </source>
<translation>^失败：</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="99"/>
+ <location filename="PyUnit/UnittestDialog.py" line="100"/>
<source>^Error: </source>
<translation>^错误：</translation>
</message>
@@ -46448,12 +46448,12 @@
<translation type="obsolete">Python 文件 (*.py)</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="216"/>
+ <location filename="PyUnit/UnittestDialog.py" line="221"/>
<source>You must enter a test suite file.</source>
<translation>必须输入测试套件文件。</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="223"/>
+ <location filename="PyUnit/UnittestDialog.py" line="228"/>
<source>Preparing Testsuite</source>
<translation>准备测试套件</translation>
</message>
@@ -46463,7 +46463,7 @@
<translation type="obsolete"><p>无法运行测试 <b>%1</b> 。<br>%2<br>%3</p></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="375"/>
+ <location filename="PyUnit/UnittestDialog.py" line="395"/>
<source>Running</source>
<translation>正在运行</translation>
</message>
@@ -46488,45 +46488,90 @@
<translation type="obsolete">错误： %1</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="479"/>
+ <location filename="PyUnit/UnittestDialog.py" line="541"/>
<source>Show Source</source>
<translation>显示源代码</translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="164"/>
+ <location filename="PyUnit/UnittestDialog.py" line="169"/>
<source>Python Files (*.py);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="160"/>
+ <location filename="PyUnit/UnittestDialog.py" line="165"/>
<source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="316"/>
+ <location filename="PyUnit/UnittestDialog.py" line="330"/>
<source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="393"/>
+ <location filename="PyUnit/UnittestDialog.py" line="413"/>
<source>Ran {0} test in {1:.3f}s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="396"/>
+ <location filename="PyUnit/UnittestDialog.py" line="416"/>
<source>Ran {0} tests in {1:.3f}s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="409"/>
+ <location filename="PyUnit/UnittestDialog.py" line="429"/>
<source>Failure: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="PyUnit/UnittestDialog.py" line="421"/>
+ <location filename="PyUnit/UnittestDialog.py" line="442"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="276"/>
+ <source>Skipped:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="283"/>
+ <source>Number of tests skipped</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="293"/>
+ <source>Expected Failures:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="300"/>
+ <source>Number of tests with expected failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="310"/>
+ <source>Unexpected Successes:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.ui" line="317"/>
+ <source>Number of tests with unexpected success</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="455"/>
+ <source> Skipped: {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="468"/>
+ <source> Expected Failure</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="PyUnit/UnittestDialog.py" line="481"/>
+ <source> Unexpected Success</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>UrlBar</name>
@@ -48917,17 +48962,17 @@
<context>
<name>Utilities</name>
<message>
- <location filename="Utilities/__init__.py" line="1022"/>
+ <location filename="Utilities/__init__.py" line="1037"/>
<source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source>
<translation><p>可以在字符串中使用“%-代码”作为占位符。支持的代码有：<table><tr><td>%C</td><td>当前编辑器的光标所在列</td></tr><tr><td>%D</td><td>当前编辑器的文件夹</td></tr><tr><td>%F</td><td>当前编辑器的文件名</td></tr><tr><td>%H</td><td>当前用户的根目录</td></tr><tr><td>%L</td><td>当前编辑器的光标所在行</td></tr><tr><td>%P</td><td>当前项目的路径</td></tr><tr><td>%S</td><td>当前编辑器中选择的文本</td></tr><tr><td>%U</td><td>当前用户的用户名</td></tr><tr><td>%%</td><td>百分比符号</td></tr></table></p></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1208"/>
+ <location filename="Utilities/__init__.py" line="1223"/>
<source>Python2 interpreter not configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Utilities/__init__.py" line="1254"/>
+ <location filename="Utilities/__init__.py" line="1269"/>
<source>Python2 interpreter did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
