--- a/eric6/i18n/eric6_zh_CN.ts Thu Jan 07 17:22:16 2021 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Thu Jan 07 18:11:11 2021 +0100 @@ -1564,40 +1564,45 @@ <context> <name>BackgroundService</name> <message> - <location filename="../Utilities/BackgroundService.py" line="128"/> + <location filename="../Utilities/BackgroundService.py" line="134"/> <source>{0} not configured.</source> <translation>{0} 未被配置。</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="182"/> + <location filename="../Utilities/BackgroundService.py" line="189"/> <source>Restart background client?</source> <translation>重启后台客户端?</translation> </message> <message> <location filename="../Utilities/BackgroundService.py" line="208"/> <source>An error in Erics background client stopped the service.</source> - <translation>Eric 后台客户端的一个错误停止了服务。</translation> - </message> - <message> - <location filename="../Utilities/BackgroundService.py" line="419"/> + <translation type="obsolete">Eric 后台客户端的一个错误停止了服务。</translation> + </message> + <message> + <location filename="../Utilities/BackgroundService.py" line="444"/> <source>Eric's background client disconnected because of an unknown reason.</source> <translation>Erics 后台客户端因未知原因断开连接。</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="425"/> + <location filename="../Utilities/BackgroundService.py" line="450"/> <source>Background client disconnected.</source> <translation>后台客户端已断开连接。</translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="182"/> + <location filename="../Utilities/BackgroundService.py" line="189"/> <source><p>The background client for <b>{0}</b> has stopped due to an exception. It's used by various plug-ins like the different checkers.</p><p>Select<ul><li><b>'Yes'</b> to restart the client, but abort the last job</li><li><b>'Retry'</b> to restart the client and the last job</li><li><b>'No'</b> to leave the client off.</li></ul></p><p>Note: The client can be restarted by opening and accepting the preferences dialog or reloading/changing the project.</p></source> <translation><p> <b>{0}</b> 的背景客户端因意外终止。它被多种插件(如区别检查器)使用。</p><p> 选择 <ul><li><b>“是”</b> 放弃最后任务,重启客户端 </li><li><b>“重试”</b> 重启客户端和最后任务</li><li><b>“否”</b> 关闭客户端。</li></ul></p><p>注意:通过打开和接受首选项对话框,或重新加载、改变工程亦可重启客户端。</p></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="425"/> + <location filename="../Utilities/BackgroundService.py" line="450"/> <source>The background client for <b>{0}</b> disconnected because of an unknown reason.<br>Should it be restarted?</source> <translation><b>{0}</b> 的后台客户端因未知原因中断了连接。<br>是否对其重新启动?</translation> </message> + <message> + <location filename="../Utilities/BackgroundService.py" line="215"/> + <source>An error in Eric's background client stopped the service.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>BookmarkActionSelectionDialog</name> @@ -6842,7 +6847,7 @@ <context> <name>DebugUI</name> <message> - <location filename="../Debugger/DebugUI.py" line="1980"/> + <location filename="../Debugger/DebugUI.py" line="1957"/> <source>Run Script</source> <translation>运行脚本</translation> </message> @@ -6862,7 +6867,7 @@ <translation><b>运行脚本</b><p>设置命令行参数,并在调试器之外运行脚本。如果文件未对更改进行保存,则可能会先行保存。</p></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1992"/> + <location filename="../Debugger/DebugUI.py" line="1969"/> <source>Run Project</source> <translation>运行项目</translation> </message> @@ -6962,7 +6967,7 @@ <translation><b>剖析项目</b><p>设置命令行参数,并剖析当前项目。如果当前项目的文件未保存则会先行保存。</p></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="2112"/> + <location filename="../Debugger/DebugUI.py" line="2089"/> <source>Debug Script</source> <translation>调试脚本</translation> </message> @@ -6982,7 +6987,7 @@ <translation><b>调试脚本</b><p>设置命令行参数,并将当前行设为当前编辑窗口首先执行的 Python 声明。如果文件未保存则会先行保存。</p></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="2129"/> + <location filename="../Debugger/DebugUI.py" line="2106"/> <source>Debug Project</source> <translation>调试项目</translation> </message> @@ -7290,62 +7295,62 @@ <translation>调试</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1190"/> + <location filename="../Debugger/DebugUI.py" line="1167"/> <source>The program being debugged contains an unspecified syntax error.</source> <translation>被调试的程序包含一个未指定的语法错误。</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1233"/> + <location filename="../Debugger/DebugUI.py" line="1210"/> <source>An unhandled exception occured. See the shell window for details.</source> <translation>产生了一个未处理的异常。详细信息参见命令行窗口。</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1366"/> + <location filename="../Debugger/DebugUI.py" line="1343"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>被调试的程序意外终止。</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1473"/> + <location filename="../Debugger/DebugUI.py" line="1450"/> <source>Breakpoint Condition Error</source> <translation>断点条件错误</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1512"/> + <location filename="../Debugger/DebugUI.py" line="1489"/> <source>Watch Expression Error</source> <translation>监视表达式出错</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1552"/> + <location filename="../Debugger/DebugUI.py" line="1529"/> <source>Watch expression already exists</source> <translation>监视表达式已存在</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1721"/> + <location filename="../Debugger/DebugUI.py" line="1698"/> <source>Coverage of Project</source> <translation>项目覆盖率</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1708"/> + <location filename="../Debugger/DebugUI.py" line="1685"/> <source>Coverage of Script</source> <translation>脚本覆盖率</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1992"/> + <location filename="../Debugger/DebugUI.py" line="1969"/> <source>There is no main script defined for the current project. Aborting</source> <translation>当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1857"/> + <location filename="../Debugger/DebugUI.py" line="1834"/> <source>Profile of Project</source> <translation>项目轮廓</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1844"/> + <location filename="../Debugger/DebugUI.py" line="1821"/> <source>Profile of Script</source> <translation>脚本轮廓</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="2129"/> + <location filename="../Debugger/DebugUI.py" line="2106"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>当前项目未定义主脚本。不能进行调试。</translation> </message> @@ -7362,42 +7367,42 @@ <translation>Shift+F12</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1209"/> + <location filename="../Debugger/DebugUI.py" line="1186"/> <source><p>The file <b>{0}</b> contains the syntax error <b>{1}</b> at line <b>{2}</b>, character <b>{3}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1283"/> + <location filename="../Debugger/DebugUI.py" line="1260"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1298"/> + <location filename="../Debugger/DebugUI.py" line="1275"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1473"/> + <location filename="../Debugger/DebugUI.py" line="1450"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1512"/> + <location filename="../Debugger/DebugUI.py" line="1489"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1542"/> + <location filename="../Debugger/DebugUI.py" line="1519"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1547"/> + <location filename="../Debugger/DebugUI.py" line="1524"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1162"/> + <location filename="../Debugger/DebugUI.py" line="1139"/> <source>Program terminated</source> <translation type="unfinished"></translation> </message> @@ -7417,43 +7422,16 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1352"/> + <location filename="../Debugger/DebugUI.py" line="1329"/> <source><p>The program generate the signal "{0}".<br/>File: <b>{1}</b>, Line: <b>{2}</b></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1124"/> - <source><p>Message: {0}</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="1129"/> - <source><p>The program has terminated with an exit status of {0}.</p>{1}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="1135"/> - <source><p><b>{0}</b> has terminated with an exit status of {1}.</p>{2}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="1143"/> + <location filename="../Debugger/DebugUI.py" line="1120"/> <source>Message: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1148"/> - <source>The program has terminated with an exit status of {0}. -{1}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Debugger/DebugUI.py" line="1152"/> - <source>"{0}" has terminated with an exit status of {1}. -{2}</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="406"/> <source>Move Instruction Pointer to Cursor</source> <translation type="unfinished"></translation> @@ -7474,7 +7452,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="1430"/> + <location filename="../Debugger/DebugUI.py" line="1407"/> <source>No locals available.</source> <translation type="unfinished"></translation> </message> @@ -7508,6 +7486,16 @@ <source><b>Continue Until</b><p>Continue running the program from the current line to the cursor position greater than the current line or until leaving the current frame.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="1125"/> + <source><p>The program has terminated with an exit status of {0}.</p><p>{1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Debugger/DebugUI.py" line="1129"/> + <source><p><b>{0}</b> has terminated with an exit status of {1}.</p><p>{2}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -7862,27 +7850,27 @@ <translation>自动保存已更改的脚本</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="287"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="282"/> <source>Add allowed host</source> <translation>添加允许的主机</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="309"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="304"/> <source>Enter the IP address of an allowed host</source> <translation>输入允许主机的 IP 地址</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="321"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="316"/> <source>Edit allowed host</source> <translation>编辑允许的主机</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="522"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="512"/> <source>Select to change the breakpoint toggle order from Off->On->Off to Off->On (permanent)->On (temporary)->Off</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="525"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="515"/> <source>Three state breakpoint</source> <translation type="unfinished"></translation> </message> @@ -7897,97 +7885,87 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="484"/> - <source>Select to suppress the client exit dialog for a clean exit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="487"/> - <source>Don't show client exit dialog for a clean exit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="516"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="506"/> <source>Breakpoints</source> <translation type="unfinished">断点</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="575"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="565"/> <source>Exceptions</source> <translation type="unfinished">异常</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="571"/> + <source>Select to always break at exceptions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="574"/> + <source>Always break at exceptions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="316"/> + <source><p>The entered address <b>{0}</b> is not a valid IP v4 or IP v6 address. Aborting...</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="770"/> + <source>Local Variables Viewer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="776"/> + <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="779"/> + <source>Automatically view source code</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="581"/> - <source>Select to always break at exceptions</source> + <source>Select to show exception information in the shell window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="584"/> - <source>Always break at exceptions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="321"/> - <source><p>The entered address <b>{0}</b> is not a valid IP v4 or IP v6 address. Aborting...</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="780"/> - <source>Local Variables Viewer</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="786"/> - <source>Automatically view source code when user changes the callstack frame in the callstack viewer.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="789"/> - <source>Automatically view source code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="591"/> - <source>Select to show exception information in the shell window</source> + <source>Show exceptions in Shell</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="605"/> + <source>Max. Variable Size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="612"/> + <source>Enter the maximum size of a variable to be shown (0 = no limit)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="618"/> + <source>no limit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="624"/> + <source> Bytes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="594"/> - <source>Show exceptions in Shell</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="615"/> - <source>Max. Variable Size:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="622"/> - <source>Enter the maximum size of a variable to be shown (0 = no limit)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="628"/> - <source>no limit</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="634"/> - <source> Bytes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="604"/> <source>Variables Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="534"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="524"/> <source>Number of recent files and conditions:</source> <translation type="unfinished">最近文件的数目:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="541"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="531"/> <source>Enter the number of recent files and breakpoint conditions to remember</source> <translation type="unfinished"></translation> </message> @@ -8029,42 +8007,42 @@ <translation type="unfinished">选择是否远程运行调试器</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="701"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="691"/> <source>Changed elements:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="708"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="698"/> <source>First time opened elements:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="662"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="652"/> <source>Background Colors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="691"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="681"/> <source>Select the background color for changed items.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="727"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="717"/> <source>Select the background color for elements which are loaded for the first time.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="497"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="487"/> <source>Multi Process Debugging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="503"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="493"/> <source>Select to enable multiprocess debugging support globally</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="506"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.ui" line="496"/> <source>Enable Multi Process Debugging Support</source> <translation type="unfinished"></translation> </message> @@ -54322,17 +54300,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1628"/> + <location filename="../Preferences/__init__.py" line="1627"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1656"/> + <location filename="../Preferences/__init__.py" line="1655"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1656"/> + <location filename="../Preferences/__init__.py" line="1655"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>属性文件 (*.ini);;所有文件 (*)</translation> </message> @@ -54353,7 +54331,7 @@ <context> <name>PreviewModel</name> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="437"/> + <location filename="../Preferences/ConfigurationPages/DebuggerGeneralPage.py" line="432"/> <source>Variable Name</source> <translation type="unfinished"></translation> </message>