--- a/eric6/i18n/eric6_zh_CN.ts Fri Aug 30 18:54:30 2019 +0200
+++ b/eric6/i18n/eric6_zh_CN.ts Fri Aug 30 18:56:45 2019 +0200
@@ -11011,7 +11011,7 @@
<context>
<name>Editor</name>
<message>
- <location filename="../QScintilla/Editor.py" line="2944"/>
+ <location filename="../QScintilla/Editor.py" line="2945"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
@@ -11021,632 +11021,632 @@
<translation><b>源代码编辑器窗口</b><p>该窗口用于显示和编辑源文件。可以打开任意多个窗口。文件名显示在窗口标题栏中。</p><p>要设置断点只需在行号与折叠标记之间的空白处点击即可。通过页边空白的上下文菜单可进行编辑。</p><p>要设置书签只需按住 Shift 键再在行号与折叠标记之间的空白处点击即可。</p><p>以上行为都可能通过上下文菜单进行反转。</p><p>按住 Ctrl 再语法错误标记上点击可显示该错误的部分信息。</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="743"/>
+ <location filename="../QScintilla/Editor.py" line="744"/>
<source>Undo</source>
<translation>撤消</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="746"/>
+ <location filename="../QScintilla/Editor.py" line="747"/>
<source>Redo</source>
<translation>重做</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="749"/>
+ <location filename="../QScintilla/Editor.py" line="750"/>
<source>Revert to last saved state</source>
<translation>还原到最后保存的状态</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="753"/>
+ <location filename="../QScintilla/Editor.py" line="754"/>
<source>Cut</source>
<translation>剪切</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="756"/>
+ <location filename="../QScintilla/Editor.py" line="757"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="759"/>
+ <location filename="../QScintilla/Editor.py" line="760"/>
<source>Paste</source>
<translation>粘贴</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="767"/>
+ <location filename="../QScintilla/Editor.py" line="768"/>
<source>Indent</source>
<translation>缩进</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="770"/>
+ <location filename="../QScintilla/Editor.py" line="771"/>
<source>Unindent</source>
<translation>取消缩进</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="773"/>
+ <location filename="../QScintilla/Editor.py" line="774"/>
<source>Comment</source>
<translation>注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="776"/>
+ <location filename="../QScintilla/Editor.py" line="777"/>
<source>Uncomment</source>
<translation>取消注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="779"/>
+ <location filename="../QScintilla/Editor.py" line="780"/>
<source>Stream Comment</source>
<translation>流注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="782"/>
+ <location filename="../QScintilla/Editor.py" line="783"/>
<source>Box Comment</source>
<translation>块注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="786"/>
+ <location filename="../QScintilla/Editor.py" line="787"/>
<source>Select to brace</source>
<translation>选择括号内容</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="788"/>
- <source>Select all</source>
- <translation>全选</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="789"/>
+ <source>Select all</source>
+ <translation>全选</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="790"/>
<source>Deselect all</source>
<translation>全部取消选择</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7544"/>
+ <location filename="../QScintilla/Editor.py" line="7545"/>
<source>Check spelling...</source>
<translation>正在进行拼写检查…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="797"/>
+ <location filename="../QScintilla/Editor.py" line="798"/>
<source>Check spelling of selection...</source>
<translation>正在对所选内容进行拼写检查…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="805"/>
+ <location filename="../QScintilla/Editor.py" line="806"/>
<source>Shorten empty lines</source>
<translation>缩减空行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="812"/>
+ <location filename="../QScintilla/Editor.py" line="813"/>
<source>Use Monospaced Font</source>
<translation>使用单空格字体</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="817"/>
+ <location filename="../QScintilla/Editor.py" line="818"/>
<source>Autosave enabled</source>
<translation>允许自动保存</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="821"/>
+ <location filename="../QScintilla/Editor.py" line="822"/>
<source>Typing aids enabled</source>
<translation>允许输入辅助</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="860"/>
+ <location filename="../QScintilla/Editor.py" line="861"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="866"/>
+ <location filename="../QScintilla/Editor.py" line="867"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="869"/>
+ <location filename="../QScintilla/Editor.py" line="870"/>
<source>Save As...</source>
<translation>另存为…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="882"/>
+ <location filename="../QScintilla/Editor.py" line="883"/>
<source>Print Preview</source>
<translation>打印预览</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="885"/>
+ <location filename="../QScintilla/Editor.py" line="886"/>
<source>Print</source>
<translation>打印</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="914"/>
+ <location filename="../QScintilla/Editor.py" line="915"/>
<source>Complete from Document</source>
<translation type="unfinished">从文档</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="916"/>
+ <location filename="../QScintilla/Editor.py" line="917"/>
<source>Complete from APIs</source>
<translation type="unfinished">从 APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="918"/>
+ <location filename="../QScintilla/Editor.py" line="919"/>
<source>Complete from Document and APIs</source>
<translation type="unfinished">从文档和 APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="836"/>
+ <location filename="../QScintilla/Editor.py" line="837"/>
<source>Calltip</source>
<translation>调用提示</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="932"/>
+ <location filename="../QScintilla/Editor.py" line="933"/>
<source>Check</source>
<translation>检查</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="952"/>
+ <location filename="../QScintilla/Editor.py" line="953"/>
<source>Show</source>
<translation>显示</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="954"/>
- <source>Code metrics...</source>
- <translation>代码度量…</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="955"/>
+ <source>Code metrics...</source>
+ <translation>代码度量…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="956"/>
<source>Code coverage...</source>
<translation>代码覆盖率…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="957"/>
+ <location filename="../QScintilla/Editor.py" line="958"/>
<source>Show code coverage annotations</source>
<translation>显示代码覆盖率注解</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="960"/>
+ <location filename="../QScintilla/Editor.py" line="961"/>
<source>Hide code coverage annotations</source>
<translation>隐藏代码覆盖率注解</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="963"/>
+ <location filename="../QScintilla/Editor.py" line="964"/>
<source>Profile data...</source>
<translation>剖析数据…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="976"/>
+ <location filename="../QScintilla/Editor.py" line="977"/>
<source>Diagrams</source>
<translation>图表</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="978"/>
+ <location filename="../QScintilla/Editor.py" line="979"/>
<source>Class Diagram...</source>
<translation>类图…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="980"/>
+ <location filename="../QScintilla/Editor.py" line="981"/>
<source>Package Diagram...</source>
<translation>程序包图…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="982"/>
+ <location filename="../QScintilla/Editor.py" line="983"/>
<source>Imports Diagram...</source>
<translation>引用图…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="984"/>
+ <location filename="../QScintilla/Editor.py" line="985"/>
<source>Application Diagram...</source>
<translation>应用程序图…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1002"/>
+ <location filename="../QScintilla/Editor.py" line="1003"/>
<source>Languages</source>
<translation>语言</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1005"/>
+ <location filename="../QScintilla/Editor.py" line="1006"/>
<source>No Language</source>
<translation>无语言</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1030"/>
+ <location filename="../QScintilla/Editor.py" line="1031"/>
<source>Guessed</source>
<translation>猜测</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1317"/>
+ <location filename="../QScintilla/Editor.py" line="1318"/>
<source>Alternatives</source>
<translation>备选</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1050"/>
+ <location filename="../QScintilla/Editor.py" line="1051"/>
<source>Encodings</source>
<translation>编码</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1091"/>
+ <location filename="../QScintilla/Editor.py" line="1092"/>
<source>End-of-Line Type</source>
<translation>行尾类型</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1095"/>
+ <location filename="../QScintilla/Editor.py" line="1096"/>
<source>Unix</source>
<translation>Unix</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1102"/>
+ <location filename="../QScintilla/Editor.py" line="1103"/>
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1109"/>
+ <location filename="../QScintilla/Editor.py" line="1110"/>
<source>Macintosh</source>
<translation>Macintosh</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1127"/>
+ <location filename="../QScintilla/Editor.py" line="1128"/>
<source>Export as</source>
<translation>导出为</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1149"/>
+ <location filename="../QScintilla/Editor.py" line="1150"/>
<source>Toggle bookmark</source>
<translation>切换书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1151"/>
+ <location filename="../QScintilla/Editor.py" line="1152"/>
<source>Next bookmark</source>
<translation>下一个书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1153"/>
+ <location filename="../QScintilla/Editor.py" line="1154"/>
<source>Previous bookmark</source>
<translation>上一个书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1155"/>
+ <location filename="../QScintilla/Editor.py" line="1156"/>
<source>Clear all bookmarks</source>
<translation>清除所有书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1164"/>
+ <location filename="../QScintilla/Editor.py" line="1165"/>
<source>Toggle breakpoint</source>
<translation>切换断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1166"/>
+ <location filename="../QScintilla/Editor.py" line="1167"/>
<source>Toggle temporary breakpoint</source>
<translation>切换临时断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1169"/>
+ <location filename="../QScintilla/Editor.py" line="1170"/>
<source>Edit breakpoint...</source>
<translation>编辑断点…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5383"/>
+ <location filename="../QScintilla/Editor.py" line="5384"/>
<source>Enable breakpoint</source>
<translation>允许断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1174"/>
+ <location filename="../QScintilla/Editor.py" line="1175"/>
<source>Next breakpoint</source>
<translation>下一个断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1177"/>
+ <location filename="../QScintilla/Editor.py" line="1178"/>
<source>Previous breakpoint</source>
<translation>上一个断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1180"/>
+ <location filename="../QScintilla/Editor.py" line="1181"/>
<source>Clear all breakpoints</source>
<translation>清除所有断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1223"/>
+ <location filename="../QScintilla/Editor.py" line="1224"/>
<source>Goto syntax error</source>
<translation>转到语法错误处</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1226"/>
+ <location filename="../QScintilla/Editor.py" line="1227"/>
<source>Show syntax error message</source>
<translation>显示语法错误消息</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1230"/>
+ <location filename="../QScintilla/Editor.py" line="1231"/>
<source>Clear syntax error</source>
<translation>清除语法错误</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1247"/>
+ <location filename="../QScintilla/Editor.py" line="1248"/>
<source>Next uncovered line</source>
<translation>下一个未覆盖行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1250"/>
+ <location filename="../QScintilla/Editor.py" line="1251"/>
<source>Previous uncovered line</source>
<translation>上一个未覆盖行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1254"/>
+ <location filename="../QScintilla/Editor.py" line="1255"/>
<source>Next task</source>
<translation>下一个任务</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1257"/>
+ <location filename="../QScintilla/Editor.py" line="1258"/>
<source>Previous task</source>
<translation>上一个任务</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1302"/>
+ <location filename="../QScintilla/Editor.py" line="1303"/>
<source>Export source</source>
<translation>导出源代码</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1302"/>
+ <location filename="../QScintilla/Editor.py" line="1303"/>
<source>No export format given. Aborting...</source>
<translation>没有给定导出格式。终止…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1333"/>
+ <location filename="../QScintilla/Editor.py" line="1334"/>
<source>Pygments Lexer</source>
<translation>Pygments 词法分析器</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1333"/>
+ <location filename="../QScintilla/Editor.py" line="1334"/>
<source>Select the Pygments lexer to apply.</source>
<translation>选择要应用的 Pygments 词法分析器。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1805"/>
+ <location filename="../QScintilla/Editor.py" line="1806"/>
<source>Modification of Read Only file</source>
<translation>只读文件的改变</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1805"/>
+ <location filename="../QScintilla/Editor.py" line="1806"/>
<source>You are attempting to change a read only file. Please save to a different file first.</source>
<translation>试图改变只读文件。请先保存到另一个文件中。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2501"/>
+ <location filename="../QScintilla/Editor.py" line="2502"/>
<source>Printing...</source>
<translation>打印中…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2518"/>
+ <location filename="../QScintilla/Editor.py" line="2519"/>
<source>Printing completed</source>
<translation>打印已完成</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2520"/>
+ <location filename="../QScintilla/Editor.py" line="2521"/>
<source>Error while printing</source>
<translation>打印时出错</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2523"/>
+ <location filename="../QScintilla/Editor.py" line="2524"/>
<source>Printing aborted</source>
<translation>打印失败</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2884"/>
+ <location filename="../QScintilla/Editor.py" line="2885"/>
<source>File Modified</source>
<translation>文件已改变</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3117"/>
+ <location filename="../QScintilla/Editor.py" line="3118"/>
<source>Save File</source>
<translation>保存文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4573"/>
+ <location filename="../QScintilla/Editor.py" line="4574"/>
<source>Autocompletion</source>
<translation>自动完成</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4573"/>
+ <location filename="../QScintilla/Editor.py" line="4574"/>
<source>Autocompletion is not available because there is no autocompletion source set.</source>
<translation>自动完成无效，没有设定自动完成源。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5386"/>
+ <location filename="../QScintilla/Editor.py" line="5387"/>
<source>Disable breakpoint</source>
<translation>去除断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5748"/>
+ <location filename="../QScintilla/Editor.py" line="5749"/>
<source>Code Coverage</source>
<translation>代码覆盖率</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5748"/>
+ <location filename="../QScintilla/Editor.py" line="5749"/>
<source>Please select a coverage file</source>
<translation>请选择一个覆盖率文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5811"/>
+ <location filename="../QScintilla/Editor.py" line="5812"/>
<source>Show Code Coverage Annotations</source>
<translation>显示代码覆盖率注解</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5804"/>
+ <location filename="../QScintilla/Editor.py" line="5805"/>
<source>All lines have been covered.</source>
<translation>所有行均被已覆盖。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5811"/>
+ <location filename="../QScintilla/Editor.py" line="5812"/>
<source>There is no coverage file available.</source>
<translation>没有有效的覆盖率文件。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5926"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Profile Data</source>
<translation>剖析数据</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5926"/>
+ <location filename="../QScintilla/Editor.py" line="5927"/>
<source>Please select a profile file</source>
<translation>请选择一个剖析文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6086"/>
+ <location filename="../QScintilla/Editor.py" line="6087"/>
<source>Syntax Error</source>
<translation>语法错误</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6086"/>
+ <location filename="../QScintilla/Editor.py" line="6087"/>
<source>No syntax error message available.</source>
<translation>语法错误消息无效。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6472"/>
+ <location filename="../QScintilla/Editor.py" line="6473"/>
<source>Macro Name</source>
<translation>宏名称</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6472"/>
+ <location filename="../QScintilla/Editor.py" line="6473"/>
<source>Select a macro name:</source>
<translation>选择一个宏名称：</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6500"/>
+ <location filename="../QScintilla/Editor.py" line="6501"/>
<source>Load macro file</source>
<translation>输入宏文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6544"/>
<source>Macro files (*.macro)</source>
<translation>宏文件 (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6523"/>
+ <location filename="../QScintilla/Editor.py" line="6524"/>
<source>Error loading macro</source>
<translation>载入宏文件出错</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6544"/>
<source>Save macro file</source>
<translation>保存宏文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6560"/>
+ <location filename="../QScintilla/Editor.py" line="6561"/>
<source>Save macro</source>
<translation>保存宏</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6576"/>
+ <location filename="../QScintilla/Editor.py" line="6577"/>
<source>Error saving macro</source>
<translation>保存宏出错</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6589"/>
+ <location filename="../QScintilla/Editor.py" line="6590"/>
<source>Start Macro Recording</source>
<translation>开始宏录制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6589"/>
+ <location filename="../QScintilla/Editor.py" line="6590"/>
<source>Macro recording is already active. Start new?</source>
<translation>宏录制已激活。开始录制新宏？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6615"/>
+ <location filename="../QScintilla/Editor.py" line="6616"/>
<source>Macro Recording</source>
<translation>宏录制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6615"/>
+ <location filename="../QScintilla/Editor.py" line="6616"/>
<source>Enter name of the macro:</source>
<translation>输入宏名称：</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6753"/>
+ <location filename="../QScintilla/Editor.py" line="6754"/>
<source>File changed</source>
<translation>文件已改变</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7057"/>
+ <location filename="../QScintilla/Editor.py" line="7058"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7078"/>
+ <location filename="../QScintilla/Editor.py" line="7079"/>
<source>Resources</source>
<translation>资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7080"/>
+ <location filename="../QScintilla/Editor.py" line="7081"/>
<source>Add file...</source>
<translation>添加文件…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7082"/>
+ <location filename="../QScintilla/Editor.py" line="7083"/>
<source>Add files...</source>
<translation>添加文件…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7084"/>
+ <location filename="../QScintilla/Editor.py" line="7085"/>
<source>Add aliased file...</source>
<translation>添加别名文件…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7087"/>
+ <location filename="../QScintilla/Editor.py" line="7088"/>
<source>Add localized resource...</source>
<translation>添加本地资源…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7091"/>
+ <location filename="../QScintilla/Editor.py" line="7092"/>
<source>Add resource frame</source>
<translation>添加资源结构</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7110"/>
+ <location filename="../QScintilla/Editor.py" line="7111"/>
<source>Add file resource</source>
<translation>添加文件资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7126"/>
+ <location filename="../QScintilla/Editor.py" line="7127"/>
<source>Add file resources</source>
<translation>添加多个文件资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7153"/>
+ <location filename="../QScintilla/Editor.py" line="7154"/>
<source>Add aliased file resource</source>
<translation>添加别名文件资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7217"/>
+ <location filename="../QScintilla/Editor.py" line="7218"/>
<source>Package Diagram</source>
<translation>程序包图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7217"/>
+ <location filename="../QScintilla/Editor.py" line="7218"/>
<source>Include class attributes?</source>
<translation>包含类属性？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7237"/>
+ <location filename="../QScintilla/Editor.py" line="7238"/>
<source>Imports Diagram</source>
<translation>引用图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7237"/>
+ <location filename="../QScintilla/Editor.py" line="7238"/>
<source>Include imports from external modules?</source>
<translation>从外部模块包含引用？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7251"/>
+ <location filename="../QScintilla/Editor.py" line="7252"/>
<source>Application Diagram</source>
<translation>应用程序图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7251"/>
+ <location filename="../QScintilla/Editor.py" line="7252"/>
<source>Include module names?</source>
<translation>包含模块名？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7547"/>
+ <location filename="../QScintilla/Editor.py" line="7548"/>
<source>Add to dictionary</source>
<translation>添加到文件夹</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7549"/>
+ <location filename="../QScintilla/Editor.py" line="7550"/>
<source>Ignore All</source>
<translation>全部忽略</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="801"/>
+ <location filename="../QScintilla/Editor.py" line="802"/>
<source>Remove from dictionary</source>
<translation>从词典里移除</translation>
</message>
@@ -11656,277 +11656,277 @@
<translation><p>文件 <b>{0}</b> 的大小为 <b>{1} KB</b>。确认要读取它？</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1294"/>
+ <location filename="../QScintilla/Editor.py" line="1295"/>
<source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1313"/>
+ <location filename="../QScintilla/Editor.py" line="1314"/>
<source>Alternatives ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2884"/>
+ <location filename="../QScintilla/Editor.py" line="2885"/>
<source><p>The file <b>{0}</b> has unsaved changes.</p></source>
<translation><p>文件 <b>{0}</b> 有未保存的更改。</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2944"/>
+ <location filename="../QScintilla/Editor.py" line="2945"/>
<source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source>
<translation><p>文件 <b>{0}</b> 无法打开。</p><p>原因：{1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3058"/>
+ <location filename="../QScintilla/Editor.py" line="3059"/>
<source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source>
<translation><p>文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6514"/>
+ <location filename="../QScintilla/Editor.py" line="6515"/>
<source><p>The macro file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6523"/>
+ <location filename="../QScintilla/Editor.py" line="6524"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6576"/>
+ <location filename="../QScintilla/Editor.py" line="6577"/>
<source><p>The macro file <b>{0}</b> could not be written.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6917"/>
+ <location filename="../QScintilla/Editor.py" line="6918"/>
<source>{0} (ro)</source>
<translation>{0}（只读）</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7057"/>
+ <location filename="../QScintilla/Editor.py" line="7058"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation><p><b>{0}</b> 不是一个文件。</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7153"/>
+ <location filename="../QScintilla/Editor.py" line="7154"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1234"/>
+ <location filename="../QScintilla/Editor.py" line="1235"/>
<source>Next warning</source>
<translation>下一个警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1237"/>
+ <location filename="../QScintilla/Editor.py" line="1238"/>
<source>Previous warning</source>
<translation>上一个警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1240"/>
+ <location filename="../QScintilla/Editor.py" line="1241"/>
<source>Show warning message</source>
<translation>显示警告信息</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1243"/>
+ <location filename="../QScintilla/Editor.py" line="1244"/>
<source>Clear warnings</source>
<translation>清空警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3117"/>
+ <location filename="../QScintilla/Editor.py" line="3118"/>
<source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6560"/>
+ <location filename="../QScintilla/Editor.py" line="6561"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>宏文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6362"/>
+ <location filename="../QScintilla/Editor.py" line="6363"/>
<source>Warning: {0}</source>
<translation>警告：{0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6369"/>
+ <location filename="../QScintilla/Editor.py" line="6370"/>
<source>Error: {0}</source>
<translation>错误：{0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6749"/>
+ <location filename="../QScintilla/Editor.py" line="6750"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation><br><b>警告：</b>您在重新打开时将丢失所有更改。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="878"/>
+ <location filename="../QScintilla/Editor.py" line="879"/>
<source>Open 'rejection' file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="988"/>
+ <location filename="../QScintilla/Editor.py" line="989"/>
<source>Load Diagram...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1261"/>
+ <location filename="../QScintilla/Editor.py" line="1262"/>
<source>Next change</source>
<translation>下一个更改</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1264"/>
+ <location filename="../QScintilla/Editor.py" line="1265"/>
<source>Previous change</source>
<translation>上一个更改</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7958"/>
+ <location filename="../QScintilla/Editor.py" line="7959"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7958"/>
+ <location filename="../QScintilla/Editor.py" line="7959"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6298"/>
+ <location filename="../QScintilla/Editor.py" line="6299"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6298"/>
+ <location filename="../QScintilla/Editor.py" line="6299"/>
<source>No warning messages available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6359"/>
+ <location filename="../QScintilla/Editor.py" line="6360"/>
<source>Style: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="852"/>
+ <location filename="../QScintilla/Editor.py" line="853"/>
<source>New Document View</source>
<translation>新建文档视图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="855"/>
+ <location filename="../QScintilla/Editor.py" line="856"/>
<source>New Document View (with new split)</source>
<translation>新建文档视图（在新拆分页中）</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="942"/>
+ <location filename="../QScintilla/Editor.py" line="943"/>
<source>Tools</source>
<translation>工具</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1072"/>
+ <location filename="../QScintilla/Editor.py" line="1073"/>
<source>Re-Open With Encoding</source>
<translation>使用指定编码重新打开</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6743"/>
+ <location filename="../QScintilla/Editor.py" line="6744"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="828"/>
+ <location filename="../QScintilla/Editor.py" line="829"/>
<source>Automatic Completion enabled</source>
<translation>允许自动补全</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="908"/>
+ <location filename="../QScintilla/Editor.py" line="909"/>
<source>Complete</source>
<translation>补全</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4697"/>
+ <location filename="../QScintilla/Editor.py" line="4698"/>
<source>Auto-Completion Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4697"/>
+ <location filename="../QScintilla/Editor.py" line="4698"/>
<source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4968"/>
+ <location filename="../QScintilla/Editor.py" line="4969"/>
<source>Call-Tips Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4968"/>
+ <location filename="../QScintilla/Editor.py" line="4969"/>
<source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8045"/>
+ <location filename="../QScintilla/Editor.py" line="8046"/>
<source>Register Mouse Click Handler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8045"/>
+ <location filename="../QScintilla/Editor.py" line="8046"/>
<source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="872"/>
+ <location filename="../QScintilla/Editor.py" line="873"/>
<source>Save Copy...</source>
<translation type="unfinished">保存副本…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="911"/>
+ <location filename="../QScintilla/Editor.py" line="912"/>
<source>Clear Completions Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="838"/>
+ <location filename="../QScintilla/Editor.py" line="839"/>
<source>Code Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1267"/>
+ <location filename="../QScintilla/Editor.py" line="1268"/>
<source>Clear changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="763"/>
+ <location filename="../QScintilla/Editor.py" line="764"/>
<source>Execute Selection In Console</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8166"/>
+ <location filename="../QScintilla/Editor.py" line="8167"/>
<source>EditorConfig Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8166"/>
+ <location filename="../QScintilla/Editor.py" line="8167"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1190"/>
+ <location filename="../QScintilla/Editor.py" line="1191"/>
<source>Toggle all folds</source>
<translation type="unfinished">开关所有折叠</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1194"/>
+ <location filename="../QScintilla/Editor.py" line="1195"/>
<source>Toggle all folds (including children)</source>
<translation type="unfinished">开关所有折叠（包含子项）</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1198"/>
+ <location filename="../QScintilla/Editor.py" line="1199"/>
<source>Toggle current fold</source>
<translation type="unfinished">开关当前折叠</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1203"/>
+ <location filename="../QScintilla/Editor.py" line="1204"/>
<source>Expand (including children)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1207"/>
+ <location filename="../QScintilla/Editor.py" line="1208"/>
<source>Collapse (including children)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1212"/>
+ <location filename="../QScintilla/Editor.py" line="1213"/>
<source>Clear all folds</source>
<translation type="unfinished"></translation>
</message>
@@ -17463,7 +17463,7 @@
<context>
<name>FeaturePermissionBar</name>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionBar.py" line="48"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="73"/>
<source>{0} wants to use desktop notifications.</source>
<translation type="unfinished"></translation>
</message>
@@ -17473,22 +17473,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="99"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="111"/>
<source>Allow</source>
<translation>允许</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="100"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="112"/>
<source>Deny</source>
<translation>拒绝</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="122"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="134"/>
<source>{0} wants to use an unknown feature.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="97"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionBar.py" line="109"/>
<source>Remember</source>
<translation>记住</translation>
</message>
@@ -17531,17 +17531,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="27"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="54"/>
<source>Notifications</source>
<translation>通知</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="144"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="162"/>
<source>Host</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="145"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="163"/>
<source>Permission</source>
<translation type="unfinished"></translation>
</message>
@@ -17556,17 +17556,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="69"/>
<source>Geolocation</source>
<translation>地理位置</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="165"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="187"/>
<source>Allow</source>
<translation>允许</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="166"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="188"/>
<source>Deny</source>
<translation>拒绝</translation>
</message>
@@ -17581,32 +17581,32 @@
<translation type="unfinished">移除全部(&A)</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="66"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="84"/>
<source>Microphone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="81"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="99"/>
<source>Camera</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="96"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="114"/>
<source>Microphone && Camera</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="112"/>
- <source>Mouse Lock</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="130"/>
+ <source>Mouse Lock</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="148"/>
<source>Desktop Video</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="146"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="164"/>
<source>Desktop Audio && Video</source>
<translation type="unfinished"></translation>
</message>
@@ -34160,27 +34160,27 @@
<translation type="unfinished">已修改</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/>
<source>Process Generation Error</source>
<translation type="unfinished">进程生成错误</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1199"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="959"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="960"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished">hg 进程没有在 30 秒内结束。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="962"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="963"/>
<source>Could not start the hg executable.</source>
<translation type="unfinished">无法启动 hg 可执行程序。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="965"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="966"/>
<source>Mercurial Error</source>
<translation type="unfinished"></translation>
</message>
@@ -34251,12 +34251,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2231"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2232"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -34281,7 +34281,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2304"/>
<source>Switch</source>
<translation type="unfinished">转换</translation>
</message>
@@ -34301,7 +34301,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1301"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1302"/>
<source>{0} (large file)</source>
<translation type="unfinished"></translation>
</message>
@@ -34346,12 +34346,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/>
<source>Find Commit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2715"/>
<source>'{0}' was not found.</source>
<translation type="unfinished"></translation>
</message>
@@ -34376,7 +34376,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2434"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2435"/>
<source>Pull Changes</source>
<translation type="unfinished"></translation>
</message>
@@ -34406,12 +34406,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2400"/>
<source>Fetch Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2480"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2481"/>
<source>Strip Changesets</source>
<translation type="unfinished"></translation>
</message>
@@ -34446,27 +34446,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/>
<source>Define Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2326"/>
<source>Enter bookmark name for changeset "{0}":</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/>
<source>Move Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2349"/>
<source>Select the bookmark to be moved to changeset "{0}":</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2289"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2290"/>
<source>Select bookmark to switch to (leave empty to use revision):</source>
<translation type="unfinished"></translation>
</message>
@@ -34527,7 +34527,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2573"/>
<source>Apply Changegroup</source>
<translation type="unfinished"></translation>
</message>
@@ -34567,62 +34567,62 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1556"/>
<source>Side-by-Side Diff to Parent {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1566"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1567"/>
<source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/>
- <source>Pull Selected Changes</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/>
+ <source>Pull Selected Changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1707"/>
<source>Fetch Selected Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2759"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
<source>Differences to Parent {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2784"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2785"/>
<source>Diff to Parent {0}{1}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2809"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2810"/>
<source>There is no difference.</source>
<translation type="unfinished">没有差异。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/>
<source>Save Diff</source>
<translation type="unfinished">保存差异</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2919"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2920"/>
<source>Patch Files (*.diff)</source>
<translation type="unfinished">补丁文件 (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2937"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"><p>补丁文件 <b>{0}</b> 已经存在。是否覆盖？</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2953"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation type="unfinished"><p>补丁文件 <b>{0}</b> 无法保存。<br />原因：{1}</p></translation>
</message>
@@ -34632,7 +34632,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/>
<source>Generating differences ...</source>
<translation type="unfinished"></translation>
</message>
@@ -36559,11 +36559,6 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
- <source>Commit a merge.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
<source><b>Commit a merge</b><p>This commits a merge working directory</p></source>
<translation type="unfinished"></translation>
@@ -36583,6 +36578,11 @@
<source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/>
+ <source>Commit all the merged changes.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -37965,7 +37965,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="334"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="345"/>
<source>Mercurial Status</source>
<translation type="unfinished"></translation>
</message>
@@ -38046,7 +38046,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="207"/>
<source>Adjust column sizes</source>
<translation type="unfinished">调整列宽</translation>
</message>
@@ -38086,47 +38086,47 @@
<translation type="unfinished">遗漏</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/>
<source>Process Generation Error</source>
<translation type="unfinished">进程生成错误</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="386"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="397"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/>
<source>Commit</source>
<translation type="unfinished">提交</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="803"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="839"/>
<source>There are no uncommitted changes available/selected.</source>
<translation type="unfinished">没有未提交的更改可用或被选择。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="701"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/>
<source>Add</source>
<translation type="unfinished">添加</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="701"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="737"/>
<source>There are no unversioned entries available/selected.</source>
<translation type="unfinished">没有未版本化的条目可用或被选择。</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="765"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/>
<source>Revert</source>
<translation type="unfinished">还原</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="760"/>
<source>Remove</source>
<translation type="unfinished">移除</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="765"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/>
<source>There are no missing entries available/selected.</source>
<translation type="unfinished"></translation>
</message>
@@ -38146,17 +38146,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="580"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/>
<source>all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="819"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="673"/>
<source>There are no entries selected to be committed.</source>
<translation type="unfinished"></translation>
</message>
@@ -38166,17 +38166,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="331"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="342"/>
<source>Mercurial Queue Repository Status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/>
<source>Side-by-Side Diff</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="810"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="846"/>
<source>Only one file with uncommitted changes must be selected.</source>
<translation type="unfinished"></translation>
</message>
@@ -38251,8 +38251,28 @@
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="209"/>
+ <source>Adjusts the width of all columns to their contents</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/>
+ <source>Commit Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="198"/>
- <source>Adjusts the width of all columns to their contents</source>
+ <source>Commit all the merged changes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/>
+ <source>Abort Merge</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/>
+ <source>Abort an uncommitted merge and lose all changes</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -48778,12 +48798,12 @@
<translation><b>保存副本</b>保存当前编辑器窗口内容的一个副本。文件可以在文件选择对话框中输入。</p></translation>
</message>
<message>
- <location filename="../QScintilla/MiniEditor.py" line="3412"/>
+ <location filename="../QScintilla/MiniEditor.py" line="3413"/>
<source>EditorConfig Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/MiniEditor.py" line="3412"/>
+ <location filename="../QScintilla/MiniEditor.py" line="3413"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -55272,7 +55292,7 @@
<translation>文件已移除</translation>
</message>
<message>
- <location filename="../Project/ProjectBrowser.py" line="398"/>
+ <location filename="../Project/ProjectBrowser.py" line="400"/>
<source>unknown status</source>
<translation>未知状态</translation>
</message>
