--- a/eric6/i18n/eric6_zh_CN.ts Wed Jan 13 19:08:16 2021 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Wed Jan 13 19:12:35 2021 +0100 @@ -3180,17 +3180,17 @@ <context> <name>Closehead</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="50"/> <source>Revision <{0}> closed.</source> <translation>修订 <{0}> 已关闭。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="53"/> <source>Revisions <{0}> closed.</source> <translation>修订 <{0}> 已关闭。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py" line="59"/> <source>Closing Heads</source> <translation>正在关闭头文件</translation> </message> @@ -11291,927 +11291,927 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3097"/> + <location filename="../QScintilla/Editor.py" line="3110"/> <source>Open File</source> <translation>打开文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="455"/> + <location filename="../QScintilla/Editor.py" line="468"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>源代码编辑器窗口</b><p>该窗口用于显示和编辑源文件。可以打开任意多个窗口。文件名显示在窗口标题栏中。</p><p>要设置断点只需在行号与折叠标记之间的空白处点击即可。通过页边空白的上下文菜单可进行编辑。</p><p>要设置书签只需按住 Shift 键再在行号与折叠标记之间的空白处点击即可。</p><p>以上行为都可能通过上下文菜单进行反转。</p><p>按住 Ctrl 再语法错误标记上点击可显示该错误的部分信息。</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="770"/> - <source>Undo</source> - <translation>撤消</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="773"/> - <source>Redo</source> - <translation>重做</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="776"/> - <source>Revert to last saved state</source> - <translation>还原到最后保存的状态</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="780"/> - <source>Cut</source> - <translation>剪切</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="783"/> - <source>Copy</source> - <translation>复制</translation> + <source>Undo</source> + <translation>撤消</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="786"/> + <source>Redo</source> + <translation>重做</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="789"/> + <source>Revert to last saved state</source> + <translation>还原到最后保存的状态</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="793"/> + <source>Cut</source> + <translation>剪切</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="796"/> + <source>Copy</source> + <translation>复制</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="799"/> <source>Paste</source> <translation>粘贴</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="794"/> + <location filename="../QScintilla/Editor.py" line="807"/> <source>Indent</source> <translation>缩进</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="797"/> + <location filename="../QScintilla/Editor.py" line="810"/> <source>Unindent</source> <translation>取消缩进</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="800"/> - <source>Comment</source> - <translation>注释</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="803"/> - <source>Uncomment</source> - <translation>取消注释</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="806"/> - <source>Stream Comment</source> - <translation>流注释</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="809"/> - <source>Box Comment</source> - <translation>块注释</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="813"/> - <source>Select to brace</source> - <translation>选择括号内容</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="815"/> - <source>Select all</source> - <translation>全选</translation> + <source>Comment</source> + <translation>注释</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="816"/> + <source>Uncomment</source> + <translation>取消注释</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="819"/> + <source>Stream Comment</source> + <translation>流注释</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="822"/> + <source>Box Comment</source> + <translation>块注释</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="826"/> + <source>Select to brace</source> + <translation>选择括号内容</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="828"/> + <source>Select all</source> + <translation>全选</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="829"/> <source>Deselect all</source> <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7850"/> + <location filename="../QScintilla/Editor.py" line="7881"/> <source>Check spelling...</source> <translation>正在进行拼写检查…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="824"/> + <location filename="../QScintilla/Editor.py" line="837"/> <source>Check spelling of selection...</source> <translation>正在对所选内容进行拼写检查…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="834"/> + <location filename="../QScintilla/Editor.py" line="847"/> <source>Shorten empty lines</source> <translation>缩减空行</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="841"/> + <location filename="../QScintilla/Editor.py" line="854"/> <source>Use Monospaced Font</source> <translation>使用单空格字体</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="846"/> + <location filename="../QScintilla/Editor.py" line="859"/> <source>Autosave enabled</source> <translation>允许自动保存</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="850"/> + <location filename="../QScintilla/Editor.py" line="863"/> <source>Typing aids enabled</source> <translation>允许输入辅助</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="889"/> + <location filename="../QScintilla/Editor.py" line="902"/> <source>Close</source> <translation>关闭</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="895"/> + <location filename="../QScintilla/Editor.py" line="908"/> <source>Save</source> <translation>保存</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="898"/> - <source>Save As...</source> - <translation>另存为…</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="911"/> + <source>Save As...</source> + <translation>另存为…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="924"/> <source>Print Preview</source> <translation>打印预览</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="914"/> + <location filename="../QScintilla/Editor.py" line="927"/> <source>Print</source> <translation>打印</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="943"/> + <location filename="../QScintilla/Editor.py" line="956"/> <source>Complete from Document</source> <translation type="unfinished">从文档</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="945"/> + <location filename="../QScintilla/Editor.py" line="958"/> <source>Complete from APIs</source> <translation type="unfinished">从 APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="947"/> + <location filename="../QScintilla/Editor.py" line="960"/> <source>Complete from Document and APIs</source> <translation type="unfinished">从文档和 APIs</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="865"/> + <location filename="../QScintilla/Editor.py" line="878"/> <source>Calltip</source> <translation>调用提示</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="961"/> + <location filename="../QScintilla/Editor.py" line="974"/> <source>Check</source> <translation>检查</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="981"/> + <location filename="../QScintilla/Editor.py" line="994"/> <source>Show</source> <translation>显示</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="983"/> + <location filename="../QScintilla/Editor.py" line="996"/> <source>Code metrics...</source> <translation>代码度量…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="984"/> + <location filename="../QScintilla/Editor.py" line="997"/> <source>Code coverage...</source> <translation>代码覆盖率…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="986"/> + <location filename="../QScintilla/Editor.py" line="999"/> <source>Show code coverage annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="989"/> + <location filename="../QScintilla/Editor.py" line="1002"/> <source>Hide code coverage annotations</source> <translation>隐藏代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="992"/> - <source>Profile data...</source> - <translation>剖析数据…</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1005"/> + <source>Profile data...</source> + <translation>剖析数据…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1018"/> <source>Diagrams</source> <translation>图表</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1007"/> + <location filename="../QScintilla/Editor.py" line="1020"/> <source>Class Diagram...</source> <translation>类图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1009"/> + <location filename="../QScintilla/Editor.py" line="1022"/> <source>Package Diagram...</source> <translation>程序包图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1011"/> + <location filename="../QScintilla/Editor.py" line="1024"/> <source>Imports Diagram...</source> <translation>引用图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1013"/> + <location filename="../QScintilla/Editor.py" line="1026"/> <source>Application Diagram...</source> <translation>应用程序图…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1031"/> + <location filename="../QScintilla/Editor.py" line="1044"/> <source>Languages</source> <translation>语言</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1164"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>No Language</source> <translation>无语言</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1060"/> + <location filename="../QScintilla/Editor.py" line="1073"/> <source>Guessed</source> <translation>猜测</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1400"/> + <location filename="../QScintilla/Editor.py" line="1413"/> <source>Alternatives</source> <translation>备选</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1080"/> + <location filename="../QScintilla/Editor.py" line="1093"/> <source>Encodings</source> <translation>编码</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1121"/> + <location filename="../QScintilla/Editor.py" line="1134"/> <source>End-of-Line Type</source> <translation>行尾类型</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1125"/> + <location filename="../QScintilla/Editor.py" line="1138"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1132"/> + <location filename="../QScintilla/Editor.py" line="1145"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1139"/> + <location filename="../QScintilla/Editor.py" line="1152"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1189"/> + <location filename="../QScintilla/Editor.py" line="1202"/> <source>Export as</source> <translation>导出为</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1211"/> + <location filename="../QScintilla/Editor.py" line="1224"/> <source>Toggle bookmark</source> <translation>切换书签</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1213"/> - <source>Next bookmark</source> - <translation>下一个书签</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1215"/> - <source>Previous bookmark</source> - <translation>上一个书签</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1217"/> - <source>Clear all bookmarks</source> - <translation>清除所有书签</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1226"/> - <source>Toggle breakpoint</source> - <translation>切换断点</translation> + <source>Next bookmark</source> + <translation>下一个书签</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1228"/> + <source>Previous bookmark</source> + <translation>上一个书签</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1230"/> + <source>Clear all bookmarks</source> + <translation>清除所有书签</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1239"/> + <source>Toggle breakpoint</source> + <translation>切换断点</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1241"/> <source>Toggle temporary breakpoint</source> <translation>切换临时断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1231"/> + <location filename="../QScintilla/Editor.py" line="1244"/> <source>Edit breakpoint...</source> <translation>编辑断点…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5600"/> + <location filename="../QScintilla/Editor.py" line="5613"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1236"/> + <location filename="../QScintilla/Editor.py" line="1249"/> <source>Next breakpoint</source> <translation>下一个断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1238"/> + <location filename="../QScintilla/Editor.py" line="1251"/> <source>Previous breakpoint</source> <translation>上一个断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1243"/> + <location filename="../QScintilla/Editor.py" line="1256"/> <source>Clear all breakpoints</source> <translation>清除所有断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1291"/> + <location filename="../QScintilla/Editor.py" line="1304"/> <source>Goto syntax error</source> <translation>转到语法错误处</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1295"/> + <location filename="../QScintilla/Editor.py" line="1308"/> <source>Show syntax error message</source> <translation>显示语法错误消息</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1300"/> + <location filename="../QScintilla/Editor.py" line="1313"/> <source>Clear syntax error</source> <translation>清除语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1322"/> - <source>Next uncovered line</source> - <translation>下一个未覆盖行</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1326"/> - <source>Previous uncovered line</source> - <translation>上一个未覆盖行</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1331"/> - <source>Next task</source> - <translation>下一个任务</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1335"/> + <source>Next uncovered line</source> + <translation>下一个未覆盖行</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1339"/> + <source>Previous uncovered line</source> + <translation>上一个未覆盖行</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1344"/> + <source>Next task</source> + <translation>下一个任务</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1348"/> <source>Previous task</source> <translation>上一个任务</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1385"/> + <location filename="../QScintilla/Editor.py" line="1398"/> <source>Export source</source> <translation>导出源代码</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1385"/> + <location filename="../QScintilla/Editor.py" line="1398"/> <source>No export format given. Aborting...</source> <translation>没有给定导出格式。终止…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1416"/> + <location filename="../QScintilla/Editor.py" line="1429"/> <source>Pygments Lexer</source> <translation>Pygments 词法分析器</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1416"/> + <location filename="../QScintilla/Editor.py" line="1429"/> <source>Select the Pygments lexer to apply.</source> <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1952"/> + <location filename="../QScintilla/Editor.py" line="1965"/> <source>Modification of Read Only file</source> <translation>只读文件的改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1952"/> + <location filename="../QScintilla/Editor.py" line="1965"/> <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="2662"/> + <location filename="../QScintilla/Editor.py" line="2675"/> <source>Printing...</source> <translation>打印中…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2679"/> + <location filename="../QScintilla/Editor.py" line="2692"/> <source>Printing completed</source> <translation>打印已完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2681"/> + <location filename="../QScintilla/Editor.py" line="2694"/> <source>Error while printing</source> <translation>打印时出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2684"/> + <location filename="../QScintilla/Editor.py" line="2697"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3039"/> + <location filename="../QScintilla/Editor.py" line="3052"/> <source>File Modified</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3284"/> + <location filename="../QScintilla/Editor.py" line="3297"/> <source>Save File</source> <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4762"/> + <location filename="../QScintilla/Editor.py" line="4775"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4762"/> + <location filename="../QScintilla/Editor.py" line="4775"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效,没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5603"/> + <location filename="../QScintilla/Editor.py" line="5616"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5978"/> + <location filename="../QScintilla/Editor.py" line="5991"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5978"/> + <location filename="../QScintilla/Editor.py" line="5991"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6041"/> + <location filename="../QScintilla/Editor.py" line="6054"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6034"/> + <location filename="../QScintilla/Editor.py" line="6047"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6041"/> + <location filename="../QScintilla/Editor.py" line="6054"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6171"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6158"/> + <location filename="../QScintilla/Editor.py" line="6171"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6333"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6320"/> + <location filename="../QScintilla/Editor.py" line="6333"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6709"/> + <location filename="../QScintilla/Editor.py" line="6722"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6709"/> + <location filename="../QScintilla/Editor.py" line="6722"/> <source>Select a macro name:</source> <translation>选择一个宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6737"/> + <location filename="../QScintilla/Editor.py" line="6750"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6779"/> + <location filename="../QScintilla/Editor.py" line="6792"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6759"/> + <location filename="../QScintilla/Editor.py" line="6772"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6779"/> + <location filename="../QScintilla/Editor.py" line="6792"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6796"/> + <location filename="../QScintilla/Editor.py" line="6809"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6811"/> - <source>Error saving macro</source> - <translation>保存宏出错</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6824"/> - <source>Start Macro Recording</source> - <translation>开始宏录制</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="6824"/> + <source>Error saving macro</source> + <translation>保存宏出错</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6837"/> + <source>Start Macro Recording</source> + <translation>开始宏录制</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6837"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6850"/> + <location filename="../QScintilla/Editor.py" line="6863"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6850"/> + <location filename="../QScintilla/Editor.py" line="6863"/> <source>Enter name of the macro:</source> <translation>输入宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7002"/> + <location filename="../QScintilla/Editor.py" line="7033"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7323"/> + <location filename="../QScintilla/Editor.py" line="7354"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7344"/> + <location filename="../QScintilla/Editor.py" line="7375"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7346"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7348"/> + <location filename="../QScintilla/Editor.py" line="7379"/> <source>Add files...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7350"/> + <location filename="../QScintilla/Editor.py" line="7381"/> <source>Add aliased file...</source> <translation>添加别名文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7353"/> + <location filename="../QScintilla/Editor.py" line="7384"/> <source>Add localized resource...</source> <translation>添加本地资源…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7357"/> + <location filename="../QScintilla/Editor.py" line="7388"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7376"/> + <location filename="../QScintilla/Editor.py" line="7407"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7392"/> + <location filename="../QScintilla/Editor.py" line="7423"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7419"/> + <location filename="../QScintilla/Editor.py" line="7450"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7485"/> + <location filename="../QScintilla/Editor.py" line="7516"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7485"/> + <location filename="../QScintilla/Editor.py" line="7516"/> <source>Include class attributes?</source> <translation>包含类属性?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7507"/> + <location filename="../QScintilla/Editor.py" line="7538"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7507"/> + <location filename="../QScintilla/Editor.py" line="7538"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7521"/> + <location filename="../QScintilla/Editor.py" line="7552"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7521"/> + <location filename="../QScintilla/Editor.py" line="7552"/> <source>Include module names?</source> <translation>包含模块名?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7853"/> + <location filename="../QScintilla/Editor.py" line="7884"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7855"/> + <location filename="../QScintilla/Editor.py" line="7886"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="828"/> + <location filename="../QScintilla/Editor.py" line="841"/> <source>Remove from dictionary</source> <translation>从词典里移除</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="366"/> + <location filename="../QScintilla/Editor.py" line="379"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>文件 <b>{0}</b> 的大小为 <b>{1} KB</b>。确认要读取它?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1377"/> + <location filename="../QScintilla/Editor.py" line="1390"/> <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="1396"/> + <location filename="../QScintilla/Editor.py" line="1409"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3039"/> + <location filename="../QScintilla/Editor.py" line="3052"/> <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="3097"/> + <location filename="../QScintilla/Editor.py" line="3110"/> <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="3221"/> + <location filename="../QScintilla/Editor.py" line="3234"/> <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="6750"/> + <location filename="../QScintilla/Editor.py" line="6763"/> <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="6759"/> + <location filename="../QScintilla/Editor.py" line="6772"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6811"/> + <location filename="../QScintilla/Editor.py" line="6824"/> <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="7182"/> + <location filename="../QScintilla/Editor.py" line="7213"/> <source>{0} (ro)</source> <translation>{0}(只读)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7323"/> + <location filename="../QScintilla/Editor.py" line="7354"/> <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="7419"/> + <location filename="../QScintilla/Editor.py" line="7450"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1305"/> + <location filename="../QScintilla/Editor.py" line="1318"/> <source>Next warning</source> <translation>下一个警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1309"/> + <location filename="../QScintilla/Editor.py" line="1322"/> <source>Previous warning</source> <translation>上一个警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1313"/> + <location filename="../QScintilla/Editor.py" line="1326"/> <source>Show warning message</source> <translation>显示警告信息</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1317"/> + <location filename="../QScintilla/Editor.py" line="1330"/> <source>Clear warnings</source> <translation>清空警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3284"/> + <location filename="../QScintilla/Editor.py" line="3297"/> <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="6796"/> + <location filename="../QScintilla/Editor.py" line="6809"/> <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="6597"/> + <location filename="../QScintilla/Editor.py" line="6610"/> <source>Warning: {0}</source> <translation>警告:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6604"/> + <location filename="../QScintilla/Editor.py" line="6617"/> <source>Error: {0}</source> <translation>错误:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6998"/> + <location filename="../QScintilla/Editor.py" line="7029"/> <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="907"/> + <location filename="../QScintilla/Editor.py" line="920"/> <source>Open 'rejection' file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1017"/> + <location filename="../QScintilla/Editor.py" line="1030"/> <source>Load Diagram...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1340"/> + <location filename="../QScintilla/Editor.py" line="1353"/> <source>Next change</source> <translation>下一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1344"/> + <location filename="../QScintilla/Editor.py" line="1357"/> <source>Previous change</source> <translation>上一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8271"/> + <location filename="../QScintilla/Editor.py" line="8302"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8271"/> + <location filename="../QScintilla/Editor.py" line="8302"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6532"/> + <location filename="../QScintilla/Editor.py" line="6545"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6532"/> + <location filename="../QScintilla/Editor.py" line="6545"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6594"/> + <location filename="../QScintilla/Editor.py" line="6607"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="881"/> + <location filename="../QScintilla/Editor.py" line="894"/> <source>New Document View</source> <translation>新建文档视图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="884"/> + <location filename="../QScintilla/Editor.py" line="897"/> <source>New Document View (with new split)</source> <translation>新建文档视图(在新拆分页中)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="971"/> + <location filename="../QScintilla/Editor.py" line="984"/> <source>Tools</source> <translation>工具</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1102"/> + <location filename="../QScintilla/Editor.py" line="1115"/> <source>Re-Open With Encoding</source> <translation>使用指定编码重新打开</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="857"/> + <location filename="../QScintilla/Editor.py" line="870"/> <source>Automatic Completion enabled</source> <translation>允许自动补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="937"/> + <location filename="../QScintilla/Editor.py" line="950"/> <source>Complete</source> <translation>补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4892"/> + <location filename="../QScintilla/Editor.py" line="4905"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4892"/> + <location filename="../QScintilla/Editor.py" line="4905"/> <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="5171"/> + <location filename="../QScintilla/Editor.py" line="5184"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5171"/> + <location filename="../QScintilla/Editor.py" line="5184"/> <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="8360"/> + <location filename="../QScintilla/Editor.py" line="8391"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8360"/> + <location filename="../QScintilla/Editor.py" line="8391"/> <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="901"/> + <location filename="../QScintilla/Editor.py" line="914"/> <source>Save Copy...</source> <translation type="unfinished">保存副本…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="940"/> + <location filename="../QScintilla/Editor.py" line="953"/> <source>Clear Completions Cache</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="867"/> + <location filename="../QScintilla/Editor.py" line="880"/> <source>Code Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1348"/> + <location filename="../QScintilla/Editor.py" line="1361"/> <source>Clear changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="790"/> + <location filename="../QScintilla/Editor.py" line="803"/> <source>Execute Selection In Console</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8481"/> + <location filename="../QScintilla/Editor.py" line="8512"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8481"/> + <location filename="../QScintilla/Editor.py" line="8512"/> <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="1252"/> + <location filename="../QScintilla/Editor.py" line="1265"/> <source>Toggle all folds</source> <translation type="unfinished">开关所有折叠</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1257"/> + <location filename="../QScintilla/Editor.py" line="1270"/> <source>Toggle all folds (including children)</source> <translation type="unfinished">开关所有折叠(包含子项)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1262"/> + <location filename="../QScintilla/Editor.py" line="1275"/> <source>Toggle current fold</source> <translation type="unfinished">开关当前折叠</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1268"/> + <location filename="../QScintilla/Editor.py" line="1281"/> <source>Expand (including children)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1273"/> + <location filename="../QScintilla/Editor.py" line="1286"/> <source>Collapse (including children)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1279"/> + <location filename="../QScintilla/Editor.py" line="1292"/> <source>Clear all folds</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1160"/> + <location filename="../QScintilla/Editor.py" line="1173"/> <source>Spell Check Languages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6992"/> + <location filename="../QScintilla/Editor.py" line="7023"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -26957,12 +26957,12 @@ <context> <name>Gpg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="67"/> <source>Verify Signatures</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="117"/> <source>Sign Revision</source> <translation type="unfinished"></translation> </message> @@ -31543,242 +31543,242 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="586"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="615"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="671"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="891"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="933"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1185"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1462"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1338"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1653"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1857"/> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> + <source>Verifying the integrity of the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981"/> + <source>Showing the combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <source>Showing aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Recovering from interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1875"/> + <source>Showing current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2146"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2224"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2244"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2156"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2020"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> - <source>Creating branch in the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2188"/> - <source>Verifying the integrity of the Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/> - <source>Showing the combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> - <source>Showing aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> - <source>Recovering from interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2491"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2081"/> - <source>Showing current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2503"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2443"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2285"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2052"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>文件 <b>{0}</b> 已经存在。是否覆盖?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2184"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2290"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2396"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2664"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2326"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2319"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="530"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2977"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2977"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2890"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2553"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2695"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3077"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -31793,32 +31793,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="885"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="958"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="876"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="967"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="885"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> @@ -31828,132 +31828,132 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="916"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="843"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1864"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="992"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3089"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3103"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3103"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3114"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3577"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3138"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3619"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3172"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3745"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3275"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3287"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1062"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="962"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="976"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2951"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2964"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2019"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1835"/> <source>Aborting uncommitted merge</source> <translation type="unfinished"></translation> </message> @@ -32540,12 +32540,12 @@ <translation type="obsolete">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="46"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> @@ -32560,7 +32560,7 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py" line="114"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -32650,72 +32650,72 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="118"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="39"/> + <source>Refresh</source> + <translation type="unfinished">刷新</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="41"/> - <source>Refresh</source> - <translation type="unfinished">刷新</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="43"/> <source>Press to refresh the bookmarks display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="247"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="251"/> <source>Delete</source> <translation type="unfinished">删除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="254"/> <source>Rename</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="258"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="276"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="262"/> <source>Push</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="277"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="277"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="296"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="296"/> <source><p>Shall the bookmark <b>{0}</b> really be deleted?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="312"/> <source>Rename Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py" line="312"/> <source><p>Enter the new name for bookmark <b>{0}</b>:</p></source> <translation type="unfinished"></translation> </message> @@ -33135,7 +33135,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="186"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="173"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -33145,7 +33145,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="171"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -33205,12 +33205,12 @@ <translation type="obsolete">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="51"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="55"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="53"/> <source>Press to refresh the list of conflicts</source> <translation type="unfinished"></translation> </message> @@ -33225,7 +33225,7 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="188"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="175"/> <source>Unknown Status</source> <translation type="unfinished"></translation> </message> @@ -33713,7 +33713,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="218"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> @@ -33788,7 +33788,7 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="89"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -34411,7 +34411,7 @@ <translation type="obsolete">无法启动 hg 可执行程序。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="842"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -34482,12 +34482,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1997"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2302"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -34512,7 +34512,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2068"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> @@ -34532,7 +34532,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1135"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> @@ -34577,12 +34577,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2443"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2443"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> @@ -34607,7 +34607,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2165"/> <source>Pull Changes</source> <translation type="unfinished"></translation> </message> @@ -34637,7 +34637,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2211"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> @@ -34667,27 +34667,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2115"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2115"/> <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="2044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2054"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> @@ -34748,7 +34748,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2302"/> <source>Apply Changegroup</source> <translation type="unfinished"></translation> </message> @@ -34788,57 +34788,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/> <source>Side-by-Side Diff to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1387"/> <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="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1523"/> <source>Pull Selected 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="2487"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2497"/> <source>Differences to Parent {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2513"/> <source>Diff to Parent {0}{1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2538"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2680"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2648"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2665"/> <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="2673"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2680"/> <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> @@ -34848,7 +34848,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2479"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2486"/> <source>Generating differences ...</source> <translation type="unfinished"></translation> </message> @@ -35600,7 +35600,7 @@ <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1728"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> @@ -35885,7 +35885,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1860"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> @@ -35900,7 +35900,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1357"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -35980,7 +35980,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1371"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1370"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -36065,7 +36065,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1348"/> <source>Specials</source> <translation type="unfinished">特殊</translation> </message> @@ -36090,12 +36090,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1672"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1671"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2001"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2000"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -36125,7 +36125,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1415"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -36205,7 +36205,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1917"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1916"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> @@ -36225,12 +36225,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1364"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1936"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> @@ -36275,7 +36275,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1956"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> @@ -36305,7 +36305,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1971"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -36370,7 +36370,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1435"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36425,7 +36425,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1323"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36610,17 +36610,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1394"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1378"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1386"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> <source>Branches</source> <translation type="unfinished"></translation> </message> @@ -36675,7 +36675,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1523"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> @@ -36750,17 +36750,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Merge Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1986"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1985"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2001"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2000"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -36876,32 +36876,32 @@ <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="96"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="96"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="205"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="205"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="253"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="267"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="253"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -36985,7 +36985,7 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="108"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -37003,12 +37003,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="66"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="71"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -37093,32 +37093,32 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="138"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="43"/> + <source>applied</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="45"/> - <source>applied</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="47"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="48"/> - <source>missing</source> - <translation type="unfinished">遗漏</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="209"/> - <source>unknown</source> - <translation type="unfinished">未知</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="46"/> + <source>missing</source> + <translation type="unfinished">遗漏</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="193"/> + <source>unknown</source> + <translation type="unfinished">未知</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="44"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -37156,7 +37156,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="88"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -37272,12 +37272,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="67"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -38026,27 +38026,27 @@ <translation type="obsolete">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="51"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="49"/> <source>&Refresh</source> <translation type="unfinished">刷新(&R)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="51"/> <source>Press to refresh the list of shelves</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="60"/> + <source>Restore selected shelve</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="62"/> - <source>Restore selected shelve</source> + <source>Delete selected shelves</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="64"/> - <source>Delete selected shelves</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="66"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> @@ -38061,21 +38061,21 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="266"/> <source>%n file(s) changed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="268"/> <source>%n line(s) inserted</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="270"/> <source>%n line(s) deleted</source> <translation type="unfinished"> <numerusform></numerusform> @@ -38277,37 +38277,37 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="498"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="664"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="562"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="562"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="626"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="592"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="585"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="626"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -38327,17 +38327,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="644"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="505"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="498"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -38352,12 +38352,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="671"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="671"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -38457,7 +38457,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="765"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> @@ -38602,12 +38602,12 @@ <translation type="unfinished">错误</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="34"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="32"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="36"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="34"/> <source>Press to refresh the summary display</source> <translation type="unfinished"></translation> </message> @@ -38622,247 +38622,247 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="234"/> <source><tr><td><b>Parent</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="238"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="242"/> <source><tr><td><b>Commit Message</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="248"/> <source>empty repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="250"/> <source>no revision checked out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="262"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="251"/> <source><tr><td><b>Remarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="255"/> <source><tr><td><b>Branch</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="263"/> + <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="270"/> + <source>{0} modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="272"/> + <source>{0} added</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="274"/> - <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="281"/> - <source>{0} modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="283"/> - <source>{0} added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="285"/> <source>{0} removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="276"/> <source>{0} renamed</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="278"/> + <source>{0} copied</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="280"/> + <source>{0} deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="282"/> + <source>{0} unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="284"/> + <source>{0} ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="286"/> + <source>{0} unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="289"/> - <source>{0} copied</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="291"/> - <source>{0} deleted</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="293"/> - <source>{0} unknown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="295"/> - <source>{0} ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="297"/> - <source>{0} unresolved</source> + <source>{0} subrepos</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="292"/> + <source>Merge needed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="294"/> + <source>New Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="296"/> + <source>Head is closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="298"/> + <source>No commit required</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="300"/> - <source>{0} subrepos</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="303"/> - <source>Merge needed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="305"/> - <source>New Branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="307"/> - <source>Head is closed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="309"/> - <source>No commit required</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="311"/> <source>New Branch Head</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="301"/> <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="306"/> <source>current</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="321"/> <source>unknown status</source> <translation type="unfinished">未知状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="333"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="322"/> <source><tr><td><b>Update Status</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="327"/> <source>synched</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="331"/> <source>1 or more incoming changesets</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="333"/> <source>%n outgoing changeset(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="342"/> <source><tr><td><b>Remote Status</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="347"/> <source>empty queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="362"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="351"/> <source>{0} applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="354"/> <source>{0} unapplied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="357"/> <source><tr><td><b>Queues Status</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="371"/> <source><p>No status information available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="230"/> <source><tr><td><b>Parent #{0}</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="308"/> <source>%n new changeset(s)<br/>Update required</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="312"/> <source>%n new changeset(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="325"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="314"/> <source>%n branch head(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="316"/> <source>{0}<br/>{1}<br/>Merge required</source> <comment>0 is changesets, 1 is branch heads</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="336"/> <source>%n incoming bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="339"/> <source>%n outgoing bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="362"/> <source>No files to upload</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="364"/> <source>%n file(s) to upload</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="377"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="366"/> <source><tr><td><b>Large Files</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -38943,12 +38943,12 @@ <translation type="obsolete">Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="88"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/> <source>Status</source> <translation>状态</translation> </message> @@ -38963,62 +38963,62 @@ <translation type="obsolete">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="200"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="205"/> <source>yes</source> <translation type="unfinished">是</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="42"/> + <source>&Refresh</source> + <translation type="unfinished">刷新(&R)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="44"/> - <source>&Refresh</source> - <translation type="unfinished">刷新(&R)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="46"/> <source>Press to refresh the list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="278"/> <source>Switch to</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="333"/> <source>Close Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="307"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="320"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="307"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="339"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="326"/> <source>The branch "default" cannot be closed. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="333"/> <source><p>Shall the branch <b>{0}</b> really be closed?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="366"/> <source>Close Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="366"/> <source>Do you really want to close all listed branches?</source> <translation type="unfinished"></translation> </message> @@ -39638,22 +39638,22 @@ <context> <name>Histedit</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="66"/> <source>Starting histedit session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="92"/> <source>Continue histedit session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="120"/> <source>Abort histedit session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py" line="147"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -39706,7 +39706,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="180"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -39726,22 +39726,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="131"/> <source>Start History Editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="180"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="147"/> <source>Continue History Editing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py" line="163"/> <source>Abort History Editing</source> <translation type="unfinished"></translation> </message> @@ -44769,30 +44769,40 @@ <context> <name>Largefiles</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="69"/> <source>Convert Project - Converting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="93"/> <source>Convert Project - Extracting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="139"/> <source>Adding files to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="168"/> <source>Pulling large files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="189"/> <source>Verifying the integrity of large files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="82"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="82"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>LargefilesProjectBrowserHelper</name> @@ -48819,599 +48829,599 @@ <context> <name>MiniEditor</name> <message> - <location filename="../QScintilla/MiniEditor.py" line="514"/> + <location filename="../QScintilla/MiniEditor.py" line="545"/> <source>New</source> <translation>新建</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="514"/> + <location filename="../QScintilla/MiniEditor.py" line="545"/> <source>&New</source> <translation>新建(&N)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="514"/> + <location filename="../QScintilla/MiniEditor.py" line="545"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="520"/> + <location filename="../QScintilla/MiniEditor.py" line="551"/> <source>Open an empty editor window</source> <translation>打开一个空白编辑器窗口</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="521"/> + <location filename="../QScintilla/MiniEditor.py" line="552"/> <source><b>New</b><p>An empty editor window will be created.</p></source> <translation><b>新建</b><p>创建一个空白编辑器窗口。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="528"/> + <location filename="../QScintilla/MiniEditor.py" line="559"/> <source>Open</source> <translation>打开</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="528"/> + <location filename="../QScintilla/MiniEditor.py" line="559"/> <source>&Open...</source> <translation>打开(&O)…</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="528"/> + <location filename="../QScintilla/MiniEditor.py" line="559"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="534"/> + <location filename="../QScintilla/MiniEditor.py" line="565"/> <source>Open a file</source> <translation>打开一个文件</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="535"/> + <location filename="../QScintilla/MiniEditor.py" line="566"/> <source><b>Open a file</b><p>You will be asked for the name of a file to be opened.</p></source> <translation><b>打开一个文件</b><p>将询问要打开的文件名称。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="542"/> + <location filename="../QScintilla/MiniEditor.py" line="573"/> <source>Save</source> <translation>保存</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="542"/> + <location filename="../QScintilla/MiniEditor.py" line="573"/> <source>&Save</source> <translation>保存(&S)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="542"/> + <location filename="../QScintilla/MiniEditor.py" line="573"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="548"/> + <location filename="../QScintilla/MiniEditor.py" line="579"/> <source>Save the current file</source> <translation>保存当前文件</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="549"/> + <location filename="../QScintilla/MiniEditor.py" line="580"/> <source><b>Save File</b><p>Save the contents of current editor window.</p></source> <translation><b>保存文件</b><p>保存当前编辑器窗口的内容。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="556"/> + <location filename="../QScintilla/MiniEditor.py" line="587"/> <source>Save as</source> <translation>另存为</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="556"/> + <location filename="../QScintilla/MiniEditor.py" line="587"/> <source>Save &as...</source> <translation>另存为(&A)…</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="556"/> + <location filename="../QScintilla/MiniEditor.py" line="587"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="562"/> - <source>Save the current file to a new one</source> - <translation>将当前文件保存到一个新文件中</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="564"/> - <source><b>Save File as</b><p>Save the contents of current editor window to a new file. The file can be entered in a file selection dialog.</p></source> - <translation><b>文件另存为</b><p>将当前编辑器窗口的内容保存到一个新文件中。可以在文件选择对话框中输入该文件。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="587"/> - <source>Close</source> - <translation>关闭</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="587"/> - <source>&Close</source> - <translation>关闭(&C)</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="587"/> - <source>Ctrl+W</source> - <comment>File|Close</comment> - <translation>Ctrl+W</translation> - </message> - <message> <location filename="../QScintilla/MiniEditor.py" line="593"/> + <source>Save the current file to a new one</source> + <translation>将当前文件保存到一个新文件中</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="595"/> + <source><b>Save File as</b><p>Save the contents of current editor window to a new file. The file can be entered in a file selection dialog.</p></source> + <translation><b>文件另存为</b><p>将当前编辑器窗口的内容保存到一个新文件中。可以在文件选择对话框中输入该文件。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="618"/> + <source>Close</source> + <translation>关闭</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="618"/> + <source>&Close</source> + <translation>关闭(&C)</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="618"/> + <source>Ctrl+W</source> + <comment>File|Close</comment> + <translation>Ctrl+W</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="624"/> <source>Close the editor window</source> <translation>关闭编辑器窗口</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="594"/> + <location filename="../QScintilla/MiniEditor.py" line="625"/> <source><b>Close Window</b><p>Close the current window.</p></source> <translation><b>关闭窗口</b><p>关闭当前窗口。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="601"/> + <location filename="../QScintilla/MiniEditor.py" line="632"/> <source>Print</source> <translation>打印</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="601"/> + <location filename="../QScintilla/MiniEditor.py" line="632"/> <source>&Print</source> <translation>打印(&P)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="601"/> + <location filename="../QScintilla/MiniEditor.py" line="632"/> <source>Ctrl+P</source> <comment>File|Print</comment> <translation>Ctrl+P</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="607"/> + <location filename="../QScintilla/MiniEditor.py" line="638"/> <source>Print the current file</source> <translation>打印当前文件</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="608"/> + <location filename="../QScintilla/MiniEditor.py" line="639"/> <source><b>Print File</b><p>Print the contents of the current file.</p></source> <translation><b>打印文件</b><p>打印当前文件的内容。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="615"/> + <location filename="../QScintilla/MiniEditor.py" line="646"/> <source>Print Preview</source> <translation>打印预览</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="620"/> + <location filename="../QScintilla/MiniEditor.py" line="651"/> <source>Print preview of the current file</source> <translation>当前文件的打印预览</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="622"/> + <location filename="../QScintilla/MiniEditor.py" line="653"/> <source><b>Print Preview</b><p>Print preview of the current file.</p></source> <translation><b>打印预览</b><p>当前文件的打印预览。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="633"/> + <location filename="../QScintilla/MiniEditor.py" line="664"/> <source>Undo</source> <translation>撤消</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="633"/> + <location filename="../QScintilla/MiniEditor.py" line="664"/> <source>&Undo</source> <translation>撤消(&U)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="633"/> + <location filename="../QScintilla/MiniEditor.py" line="664"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="633"/> + <location filename="../QScintilla/MiniEditor.py" line="664"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="640"/> + <location filename="../QScintilla/MiniEditor.py" line="671"/> <source>Undo the last change</source> <translation>撤消最后一次更改</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="641"/> + <location filename="../QScintilla/MiniEditor.py" line="672"/> <source><b>Undo</b><p>Undo the last change done in the current editor.</p></source> <translation><b>撤消</b><p>在当前编辑器中撤消最后一次更改。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="648"/> + <location filename="../QScintilla/MiniEditor.py" line="679"/> <source>Redo</source> <translation>重做</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="648"/> + <location filename="../QScintilla/MiniEditor.py" line="679"/> <source>&Redo</source> <translation>重做(&R)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="648"/> + <location filename="../QScintilla/MiniEditor.py" line="679"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="654"/> + <location filename="../QScintilla/MiniEditor.py" line="685"/> <source>Redo the last change</source> <translation>重做最后一次更改</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="655"/> - <source><b>Redo</b><p>Redo the last change done in the current editor.</p></source> - <translation><b>重做</b><p>在当前编辑器中重做最后一次更改。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="662"/> - <source>Cut</source> - <translation>剪切</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="662"/> - <source>Cu&t</source> - <translation>剪切(&t)</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="662"/> - <source>Ctrl+X</source> - <comment>Edit|Cut</comment> - <translation>Ctrl+X</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="662"/> - <source>Shift+Del</source> - <comment>Edit|Cut</comment> - <translation>Shift+Del</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="669"/> - <source>Cut the selection</source> - <translation>剪切所选内容</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="670"/> - <source><b>Cut</b><p>Cut the selected text of the current editor to the clipboard.</p></source> - <translation><b>剪切</b><p>将当前编辑器所选内容剪切到剪贴板中。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="678"/> - <source>Copy</source> - <translation>复制</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="678"/> - <source>&Copy</source> - <translation>复制(&C)</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="678"/> - <source>Ctrl+C</source> - <comment>Edit|Copy</comment> - <translation>Ctrl+C</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="678"/> - <source>Ctrl+Ins</source> - <comment>Edit|Copy</comment> - <translation>Ctrl+Ins</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="685"/> - <source>Copy the selection</source> - <translation>复制所选内容</translation> - </message> - <message> <location filename="../QScintilla/MiniEditor.py" line="686"/> + <source><b>Redo</b><p>Redo the last change done in the current editor.</p></source> + <translation><b>重做</b><p>在当前编辑器中重做最后一次更改。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="693"/> + <source>Cut</source> + <translation>剪切</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="693"/> + <source>Cu&t</source> + <translation>剪切(&t)</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="693"/> + <source>Ctrl+X</source> + <comment>Edit|Cut</comment> + <translation>Ctrl+X</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="693"/> + <source>Shift+Del</source> + <comment>Edit|Cut</comment> + <translation>Shift+Del</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="700"/> + <source>Cut the selection</source> + <translation>剪切所选内容</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="701"/> + <source><b>Cut</b><p>Cut the selected text of the current editor to the clipboard.</p></source> + <translation><b>剪切</b><p>将当前编辑器所选内容剪切到剪贴板中。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="709"/> + <source>Copy</source> + <translation>复制</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="709"/> + <source>&Copy</source> + <translation>复制(&C)</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="709"/> + <source>Ctrl+C</source> + <comment>Edit|Copy</comment> + <translation>Ctrl+C</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="709"/> + <source>Ctrl+Ins</source> + <comment>Edit|Copy</comment> + <translation>Ctrl+Ins</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="716"/> + <source>Copy the selection</source> + <translation>复制所选内容</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="717"/> <source><b>Copy</b><p>Copy the selected text of the current editor to the clipboard.</p></source> <translation><b>复制</b><p>将当前编辑器所选内容复制到剪贴板中。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="694"/> + <location filename="../QScintilla/MiniEditor.py" line="725"/> <source>Paste</source> <translation>粘贴</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="694"/> + <location filename="../QScintilla/MiniEditor.py" line="725"/> <source>&Paste</source> <translation>粘贴(&P)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="694"/> + <location filename="../QScintilla/MiniEditor.py" line="725"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="694"/> + <location filename="../QScintilla/MiniEditor.py" line="725"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="701"/> + <location filename="../QScintilla/MiniEditor.py" line="732"/> <source>Paste the last cut/copied text</source> <translation>粘贴最近剪切或复制的文本</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="703"/> + <location filename="../QScintilla/MiniEditor.py" line="734"/> <source><b>Paste</b><p>Paste the last cut/copied text from the clipboard to the current editor.</p></source> <translation><b>粘贴</b><p>将最近剪切或复制的文本从剪贴板粘贴到当前编辑器中。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="711"/> + <location filename="../QScintilla/MiniEditor.py" line="742"/> <source>Clear</source> <translation>清除</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="711"/> + <location filename="../QScintilla/MiniEditor.py" line="742"/> <source>Cl&ear</source> <translation>清除(&E)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="711"/> + <location filename="../QScintilla/MiniEditor.py" line="742"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="718"/> + <location filename="../QScintilla/MiniEditor.py" line="749"/> <source>Clear all text</source> <translation>清除所有文本</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="719"/> + <location filename="../QScintilla/MiniEditor.py" line="750"/> <source><b>Clear</b><p>Delete all text of the current editor.</p></source> <translation><b>清除</b><p>删除当前编辑器中的所有文本。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2322"/> + <location filename="../QScintilla/MiniEditor.py" line="2353"/> <source>About</source> <translation>关于</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2322"/> - <source>&About</source> - <translation>关于(&A)</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2326"/> - <source>Display information about this software</source> - <translation>显示软件信息</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2328"/> - <source><b>About</b><p>Display some information about this software.</p></source> - <translation><b>关于</b><p>显示与本软件有关的部分信息。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2334"/> - <source>About Qt</source> - <translation>关于 Qt</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2334"/> - <source>About &Qt</source> - <translation>关于 &Qt</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2338"/> - <source>Display information about the Qt toolkit</source> - <translation>显示 Qt 工具包信息</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2340"/> - <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> - <translation><b>关于 Qt</b><p>显示 Qt 工具包的部分相关信息。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2347"/> - <source>What's This?</source> - <translation>这是什么?</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2347"/> - <source>&What's This?</source> - <translation>这是什么(&W)?</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2347"/> - <source>Shift+F1</source> - <comment>Help|What's This?'</comment> - <translation>Shift+F1</translation> - </message> - <message> <location filename="../QScintilla/MiniEditor.py" line="2353"/> + <source>&About</source> + <translation>关于(&A)</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2357"/> + <source>Display information about this software</source> + <translation>显示软件信息</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2359"/> + <source><b>About</b><p>Display some information about this software.</p></source> + <translation><b>关于</b><p>显示与本软件有关的部分信息。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2365"/> + <source>About Qt</source> + <translation>关于 Qt</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2365"/> + <source>About &Qt</source> + <translation>关于 &Qt</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2369"/> + <source>Display information about the Qt toolkit</source> + <translation>显示 Qt 工具包信息</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2371"/> + <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> + <translation><b>关于 Qt</b><p>显示 Qt 工具包的部分相关信息。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2378"/> + <source>What's This?</source> + <translation>这是什么?</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2378"/> + <source>&What's This?</source> + <translation>这是什么(&W)?</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2378"/> + <source>Shift+F1</source> + <comment>Help|What's This?'</comment> + <translation>Shift+F1</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2384"/> <source>Context sensitive help</source> <translation>背景帮助</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2354"/> + <location filename="../QScintilla/MiniEditor.py" line="2385"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>显示背景帮助</b><p>在“这是什么?”模式中,鼠标光标显示为带问号的箭头,通过点击界面元素你可以获得“在做什么”和“怎样使用”的简短描述。使用标题栏中的上下文帮助按钮可以获得此功能。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2370"/> + <location filename="../QScintilla/MiniEditor.py" line="2401"/> <source>&File</source> <translation>文件(&F)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2382"/> + <location filename="../QScintilla/MiniEditor.py" line="2413"/> <source>&Edit</source> <translation>编辑(&E)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2408"/> + <location filename="../QScintilla/MiniEditor.py" line="2439"/> <source>&Help</source> <translation>帮助(&H)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2420"/> + <location filename="../QScintilla/MiniEditor.py" line="2451"/> <source>File</source> <translation>文件</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2433"/> + <location filename="../QScintilla/MiniEditor.py" line="2464"/> <source>Edit</source> <translation>编辑</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2443"/> + <location filename="../QScintilla/MiniEditor.py" line="2474"/> <source>Find</source> <translation>查找</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2457"/> + <location filename="../QScintilla/MiniEditor.py" line="2488"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2478"/> - <source><p>This part of the status bar displays an indication of the editors files writability.</p></source> - <translation><p>状态条的这一部分显示编辑器文件是否为可写。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2485"/> - <source><p>This part of the status bar displays the line number of the editor.</p></source> - <translation><p>状态条的这一部分显示编辑器的行号。</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2492"/> - <source><p>This part of the status bar displays the cursor position of the editor.</p></source> - <translation><p>状态条的这一部分显示编辑的光标位置。</p></translation> - </message> - <message> <location filename="../QScintilla/MiniEditor.py" line="2509"/> + <source><p>This part of the status bar displays an indication of the editors files writability.</p></source> + <translation><p>状态条的这一部分显示编辑器文件是否为可写。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2516"/> + <source><p>This part of the status bar displays the line number of the editor.</p></source> + <translation><p>状态条的这一部分显示编辑器的行号。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2523"/> + <source><p>This part of the status bar displays the cursor position of the editor.</p></source> + <translation><p>状态条的这一部分显示编辑的光标位置。</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2540"/> <source>Ready</source> <translation>就绪</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2591"/> + <location filename="../QScintilla/MiniEditor.py" line="2622"/> <source>File loaded</source> <translation>文件已载入</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2677"/> + <location filename="../QScintilla/MiniEditor.py" line="2708"/> <source>File saved</source> <translation>文件已保存</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3024"/> + <location filename="../QScintilla/MiniEditor.py" line="3055"/> <source>Untitled</source> <translation>未命名</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2706"/> + <location filename="../QScintilla/MiniEditor.py" line="2737"/> <source>Mini Editor</source> <translation>迷你编辑器</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2987"/> + <location filename="../QScintilla/MiniEditor.py" line="3018"/> <source>Printing...</source> <translation>打印中…</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3005"/> + <location filename="../QScintilla/MiniEditor.py" line="3036"/> <source>Printing completed</source> <translation>打印已完成</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3007"/> + <location filename="../QScintilla/MiniEditor.py" line="3038"/> <source>Error while printing</source> <translation>打印时出错</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3010"/> + <location filename="../QScintilla/MiniEditor.py" line="3041"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3065"/> + <location filename="../QScintilla/MiniEditor.py" line="3096"/> <source>Select all</source> <translation>全选</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3066"/> + <location filename="../QScintilla/MiniEditor.py" line="3097"/> <source>Deselect all</source> <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3080"/> + <location filename="../QScintilla/MiniEditor.py" line="3111"/> <source>Languages</source> <translation>语言</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3083"/> + <location filename="../QScintilla/MiniEditor.py" line="3114"/> <source>No Language</source> <translation>无语言</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3107"/> + <location filename="../QScintilla/MiniEditor.py" line="3138"/> <source>Guessed</source> <translation>猜测</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3129"/> + <location filename="../QScintilla/MiniEditor.py" line="3160"/> <source>Alternatives</source> <translation>备选</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3153"/> + <location filename="../QScintilla/MiniEditor.py" line="3184"/> <source>Pygments Lexer</source> <translation>Pygments 词法分析器</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3153"/> + <location filename="../QScintilla/MiniEditor.py" line="3184"/> <source>Select the Pygments lexer to apply.</source> <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2563"/> + <location filename="../QScintilla/MiniEditor.py" line="2594"/> <source>Open File</source> <translation>打开文件</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="436"/> + <location filename="../QScintilla/MiniEditor.py" line="467"/> <source>Line: {0:5}</source> <translation>行:{0:5}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="440"/> + <location filename="../QScintilla/MiniEditor.py" line="471"/> <source>Pos: {0:5}</source> <translation>列:{0:5}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2563"/> + <location filename="../QScintilla/MiniEditor.py" line="2594"/> <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/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2701"/> <source>Save File</source> <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2670"/> + <location filename="../QScintilla/MiniEditor.py" line="2701"/> <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/MiniEditor.py" line="2706"/> + <location filename="../QScintilla/MiniEditor.py" line="2737"/> <source>{0}[*] - {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3125"/> + <location filename="../QScintilla/MiniEditor.py" line="3156"/> <source>Alternatives ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2536"/> + <location filename="../QScintilla/MiniEditor.py" line="2567"/> <source>The document has unsaved changes.</source> <translation>文档有未保存的更改。</translation> </message> @@ -49431,77 +49441,77 @@ <translation type="obsolete">eric6 迷你编辑器</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="572"/> + <location filename="../QScintilla/MiniEditor.py" line="603"/> <source>Save Copy</source> <translation>保存副本</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="572"/> + <location filename="../QScintilla/MiniEditor.py" line="603"/> <source>Save &Copy...</source> <translation>保存副本(&C)…</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="577"/> + <location filename="../QScintilla/MiniEditor.py" line="608"/> <source>Save a copy of the current file</source> <translation>保存当前文件的一个副本</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="579"/> + <location filename="../QScintilla/MiniEditor.py" line="610"/> <source><b>Save Copy</b><p>Save a copy of the contents of current editor window. The file can be entered in a file selection dialog.</p></source> <translation><b>保存副本</b>保存当前编辑器窗口内容的一个副本。文件可以在文件选择对话框中输入。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3667"/> + <location filename="../QScintilla/MiniEditor.py" line="3698"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3667"/> + <location filename="../QScintilla/MiniEditor.py" line="3698"/> <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/MiniEditor.py" line="2689"/> + <location filename="../QScintilla/MiniEditor.py" line="2720"/> <source>[*] - {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="455"/> + <location filename="../QScintilla/MiniEditor.py" line="486"/> <source>Language: {0}</source> <translation type="unfinished">语言:{0}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2400"/> + <location filename="../QScintilla/MiniEditor.py" line="2431"/> <source>&View</source> <translation type="unfinished">视图(&V)</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2450"/> + <location filename="../QScintilla/MiniEditor.py" line="2481"/> <source>View</source> <translation type="unfinished">视图</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2470"/> + <location filename="../QScintilla/MiniEditor.py" line="2501"/> <source><p>This part of the status bar displays the editor language.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2503"/> + <location filename="../QScintilla/MiniEditor.py" line="2534"/> <source><p>This part of the status bar allows zooming the editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="366"/> + <location filename="../QScintilla/MiniEditor.py" line="397"/> <source>About eric Mini Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="366"/> + <location filename="../QScintilla/MiniEditor.py" line="397"/> <source>The eric Mini Editor is an editor component based on QScintilla. It may be used for simple editing tasks, that don't need the power of a full blown editor.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2536"/> + <location filename="../QScintilla/MiniEditor.py" line="2567"/> <source>eric Mini Editor</source> <translation type="unfinished"></translation> </message> @@ -53439,22 +53449,22 @@ <context> <name>PluginManager</name> <message> - <location filename="../PluginManager/PluginManager.py" line="408"/> + <location filename="../PluginManager/PluginManager.py" line="406"/> <source>Module is missing the 'autoactivate' attribute.</source> <translation>模块丢失“autoactivate”属性。</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="419"/> + <location filename="../PluginManager/PluginManager.py" line="417"/> <source>Module is missing the 'pluginType' and/or 'pluginTypename' attributes.</source> <translation>模块丢失“pluginType”和/或“pluginTypename”属性。</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="630"/> + <location filename="../PluginManager/PluginManager.py" line="628"/> <source>Incompatible plugin activation method.</source> <translation>插件激活方法不兼容。</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1213"/> + <location filename="../PluginManager/PluginManager.py" line="1211"/> <source>Plugin Manager Error</source> <translation>插件管理错误</translation> </message> @@ -53464,37 +53474,37 @@ <translation>无法为 {0} 创建包。</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="244"/> + <location filename="../PluginManager/PluginManager.py" line="242"/> <source>The internal plugin directory <b>{0}</b> does not exits.</source> <translation>内置的插件目录 <b>{0}</b> 不存在。</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="443"/> + <location filename="../PluginManager/PluginManager.py" line="441"/> <source>Module failed to load. Error: {0}</source> <translation>模块加载失败。错误:{0}</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1213"/> + <location filename="../PluginManager/PluginManager.py" line="1211"/> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>插件下载目录 <b>{0}</b> 无法创建。请使用配置对话框进行配置。</p><p>原因:{1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1294"/> + <location filename="../PluginManager/PluginManager.py" line="1292"/> <source>Error downloading file</source> <translation>下载文件出错</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1294"/> + <location filename="../PluginManager/PluginManager.py" line="1292"/> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>无法从 {0} 下载指定文件。</p><p>错误:{1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1331"/> + <location filename="../PluginManager/PluginManager.py" line="1329"/> <source>New plugin versions available</source> <translation>新插件版本可用</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1331"/> + <location filename="../PluginManager/PluginManager.py" line="1329"/> <source><p>There are new plug-ins or plug-in updates available. Use the plug-in repository dialog to get them.</p></source> <translation><p>有新的插件或插件更新可用。请使用插件仓库对话框来获取它们。</p></translation> </message> @@ -58307,22 +58317,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="70"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="71"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="75"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="76"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -63600,182 +63610,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="197"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="239"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="284"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="319"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="288"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="323"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="292"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="304"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="387"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="345"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="370"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="443"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="382"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="391"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="429"/> + <source>Fold Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="424"/> + <source>No patches selected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="429"/> + <source>No patches available to be folded.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="446"/> + <source>List Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="446"/> + <source>No patches available to list guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="472"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> - <source>Fold Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>No patches selected.</source> + <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="500"/> - <source>No patches available to be folded.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> - <source>List Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="527"/> - <source>No patches available to list guards for.</source> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="484"/> + <source>Select the patch to drop guards for (leave empty for the current patch):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="528"/> + <source>Set Active Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="528"/> + <source>No guards available to select from.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="541"/> + <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="565"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="602"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="586"/> - <source>Select the patch to drop guards for (leave empty for the current patch):</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> - <source>Set Active Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="639"/> - <source>No guards available to select from.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="661"/> - <source>Deactivate Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="702"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="704"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="567"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="726"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="589"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="592"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="615"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="617"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="764"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="619"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="644"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="646"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="648"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="668"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -64388,12 +64398,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="826"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="826"/> <source>Changing Applied Patches</source> <translation type="unfinished"></translation> </message> @@ -64570,17 +64580,17 @@ <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="78"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="68"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="86"/> + <source>Rebase Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="104"/> - <source>Rebase Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="130"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -64588,7 +64598,7 @@ <context> <name>RebaseProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="108"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> @@ -64638,17 +64648,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="122"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py" line="136"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -67263,47 +67273,47 @@ <context> <name>Shelve</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="95"/> <source>Shelve current changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="135"/> <source>Restore shelved changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="152"/> <source>Abort restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="212"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="171"/> <source>Continue restore operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="236"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="187"/> <source>Select the shelves to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="208"/> <source>Delete shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="198"/> <source>Do you really want to delete these shelves?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="225"/> <source>Delete all shelves</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="275"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="217"/> <source>Do you really want to delete all shelved changes?</source> <translation type="unfinished"></translation> </message> @@ -67464,17 +67474,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="200"/> <source>Unshelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="207"/> <source>Abort Unshelve</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="216"/> <source>Continue Unshelve</source> <translation type="unfinished"></translation> </message> @@ -68221,7 +68231,7 @@ <context> <name>SnapshotFreehandGrabber</name> <message> - <location filename="../Snapshot/SnapshotFreehandGrabber.py" line="70"/> + <location filename="../Snapshot/SnapshotFreehandGrabber.py" line="72"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation>使用鼠标选择一个区域。要截取快照,点击 Enter 键或双击鼠标。点击 Esc 以退出。</translation> </message> @@ -68229,7 +68239,7 @@ <context> <name>SnapshotRegionGrabber</name> <message> - <location filename="../Snapshot/SnapshotRegionGrabber.py" line="102"/> + <location filename="../Snapshot/SnapshotRegionGrabber.py" line="104"/> <source>Select a region using the mouse. To take the snapshot, press the Enter key or double click. Press Esc to quit.</source> <translation>使用鼠标选择一个区域。要截取快照,点击 Enter 键或双击鼠标。点击 Esc 以退出。</translation> </message> @@ -69840,7 +69850,7 @@ <context> <name>Strip</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="60"/> <source>Stripping changesets from repository</source> <translation type="unfinished"></translation> </message> @@ -80021,7 +80031,7 @@ <translation>显示可以下载的版本</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3816"/> + <location filename="../UI/UserInterface.py" line="3814"/> <source>Report Bug</source> <translation>报告错误</translation> </message> @@ -80061,7 +80071,7 @@ <translation><b>请求功能…</b><p>打开一个对话框并发送一个功能请求。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3355"/> + <location filename="../UI/UserInterface.py" line="3353"/> <source>Unittest</source> <translation>单元测试</translation> </message> @@ -80226,302 +80236,302 @@ <translation><b>小型编辑器</b><p>打开一个具有简化功能编辑器的对话框。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2510"/> + <location filename="../UI/UserInterface.py" line="2508"/> <source>Preferences</source> <translation>首选项</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2510"/> + <location filename="../UI/UserInterface.py" line="2508"/> <source>&Preferences...</source> <translation>首选项(&P)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2513"/> + <source>Set the prefered configuration</source> + <translation>设定偏好配置</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2515"/> - <source>Set the prefered configuration</source> - <translation>设定偏好配置</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2517"/> <source><b>Preferences</b><p>Set the configuration items of the application with your prefered values.</p></source> <translation><b>首选项</b><p>将应用程序的配置项设定为你喜欢的值。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2526"/> + <location filename="../UI/UserInterface.py" line="2524"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2526"/> + <location filename="../UI/UserInterface.py" line="2524"/> <source>E&xport Preferences...</source> <translation>导出首选项(&X)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2529"/> + <source>Export the current configuration</source> + <translation>导出当前配置</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2531"/> - <source>Export the current configuration</source> - <translation>导出当前配置</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2533"/> <source><b>Export Preferences</b><p>Export the current configuration to a file.</p></source> <translation><b>导出首选项</b><p>将当前配置导出到一个文件中。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2540"/> + <location filename="../UI/UserInterface.py" line="2538"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2540"/> + <location filename="../UI/UserInterface.py" line="2538"/> <source>I&mport Preferences...</source> <translation>导入首选项(&M)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2543"/> + <source>Import a previously exported configuration</source> + <translation>导入以前导出的配置</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2545"/> - <source>Import a previously exported configuration</source> - <translation>导入以前导出的配置</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2547"/> <source><b>Import Preferences</b><p>Import a previously exported configuration.</p></source> <translation><b>导入首选项</b><p>导入以前导出的配置。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2554"/> + <location filename="../UI/UserInterface.py" line="2552"/> <source>Reload APIs</source> <translation>重新载入 API</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2554"/> + <location filename="../UI/UserInterface.py" line="2552"/> <source>Reload &APIs</source> <translation>重新载入 &API</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2556"/> + <source>Reload the API information</source> + <translation>重新载入 API 信息</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2558"/> - <source>Reload the API information</source> - <translation>重新载入 API 信息</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2560"/> <source><b>Reload APIs</b><p>Reload the API information.</p></source> <translation><b>重新载入 API</b><p>重新载入 API 信息。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2572"/> + <location filename="../UI/UserInterface.py" line="2570"/> <source>Show external tools</source> <translation>显示外部工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2567"/> + <location filename="../UI/UserInterface.py" line="2565"/> <source>Show external &tools</source> <translation>显示外部工具(&T)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2583"/> + <location filename="../UI/UserInterface.py" line="2581"/> <source>View Profiles</source> <translation>视图模式</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2583"/> + <location filename="../UI/UserInterface.py" line="2581"/> <source>&View Profiles...</source> <translation>视图模式(&V)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2586"/> + <source>Configure view profiles</source> + <translation>配置视图模式</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2588"/> - <source>Configure view profiles</source> - <translation>配置视图模式</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2590"/> <source><b>View Profiles</b><p>Configure the view profiles. With this dialog you may set the visibility of the various windows for the predetermined view profiles.</p></source> <translation><b>视图模式</b><p>配置视图模式。通过该对话框可以为预先确定的视图设置多个窗口的可见性。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2600"/> + <location filename="../UI/UserInterface.py" line="2598"/> <source>Toolbars</source> <translation>工具栏</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2600"/> + <location filename="../UI/UserInterface.py" line="2598"/> <source>Tool&bars...</source> <translation>工具栏(&B)…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2605"/> + <location filename="../UI/UserInterface.py" line="2603"/> <source>Configure toolbars</source> <translation>配置工具栏</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2606"/> + <location filename="../UI/UserInterface.py" line="2604"/> <source><b>Toolbars</b><p>Configure the toolbars. With this dialog you may change the actions shown on the various toolbars and define your own toolbars.</p></source> <translation><b>工具栏</b><p>配置工具栏通过该对话框可以改变显示于多个工具栏的动作,还可以自定义工具栏。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2615"/> + <location filename="../UI/UserInterface.py" line="2613"/> <source>Keyboard Shortcuts</source> <translation>键盘快捷键</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2615"/> + <location filename="../UI/UserInterface.py" line="2613"/> <source>Keyboard &Shortcuts...</source> <translation>键盘快捷键(&S)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2618"/> + <source>Set the keyboard shortcuts</source> + <translation>设置键盘快捷键</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2620"/> - <source>Set the keyboard shortcuts</source> - <translation>设置键盘快捷键</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2622"/> <source><b>Keyboard Shortcuts</b><p>Set the keyboard shortcuts of the application with your prefered values.</p></source> <translation><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6289"/> + <location filename="../UI/UserInterface.py" line="6287"/> <source>Export Keyboard Shortcuts</source> <translation>导出键盘快捷键</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2630"/> + <location filename="../UI/UserInterface.py" line="2628"/> <source>&Export Keyboard Shortcuts...</source> <translation>导出键盘快捷键(&E)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2633"/> + <source>Export the keyboard shortcuts</source> + <translation>导出键盘快捷键</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2635"/> - <source>Export the keyboard shortcuts</source> - <translation>导出键盘快捷键</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2637"/> <source><b>Export Keyboard Shortcuts</b><p>Export the keyboard shortcuts of the application.</p></source> <translation><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6311"/> <source>Import Keyboard Shortcuts</source> <translation>导入键盘快捷键</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2644"/> + <location filename="../UI/UserInterface.py" line="2642"/> <source>&Import Keyboard Shortcuts...</source> <translation>导入键盘快捷键(&I)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2647"/> + <source>Import the keyboard shortcuts</source> + <translation>导入键盘快捷键</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2649"/> - <source>Import the keyboard shortcuts</source> - <translation>导入键盘快捷键</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2651"/> <source><b>Import Keyboard Shortcuts</b><p>Import the keyboard shortcuts of the application.</p></source> <translation><b>导入键盘快捷键</b><p>导入程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2709"/> + <location filename="../UI/UserInterface.py" line="2707"/> <source>Activate current editor</source> <translation>激活当前编辑器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2709"/> + <location filename="../UI/UserInterface.py" line="2707"/> <source>Alt+Shift+E</source> <translation>Alt+Shift+E</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2719"/> + <location filename="../UI/UserInterface.py" line="2717"/> <source>Show next</source> <translation>显示下一个</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2719"/> + <location filename="../UI/UserInterface.py" line="2717"/> <source>Ctrl+Alt+Tab</source> <translation>Ctrl+Alt+Tab</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2728"/> + <location filename="../UI/UserInterface.py" line="2726"/> <source>Show previous</source> <translation>显示上一个</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2728"/> + <location filename="../UI/UserInterface.py" line="2726"/> <source>Shift+Ctrl+Alt+Tab</source> <translation>Shift+Ctrl+Alt+Tab</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2737"/> + <location filename="../UI/UserInterface.py" line="2735"/> <source>Switch between tabs</source> <translation>在选项卡间切换</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2737"/> + <location filename="../UI/UserInterface.py" line="2735"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2746"/> + <location filename="../UI/UserInterface.py" line="2744"/> <source>Plugin Infos</source> <translation>插件信息</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2746"/> + <location filename="../UI/UserInterface.py" line="2744"/> <source>&Plugin Infos...</source> <translation>插件信息(&P)…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2750"/> + <location filename="../UI/UserInterface.py" line="2748"/> <source>Show Plugin Infos</source> <translation>显示插件信息</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2751"/> + <location filename="../UI/UserInterface.py" line="2749"/> <source><b>Plugin Infos...</b><p>This opens a dialog, that show some information about loaded plugins.</p></source> <translation><b>插件信息…</b><p>打开一个对话框,显示与已载入插件有关的一些信息。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2764"/> + <location filename="../UI/UserInterface.py" line="2762"/> <source>Install Plugins</source> <translation>安装插件</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2759"/> + <location filename="../UI/UserInterface.py" line="2757"/> <source>&Install Plugins...</source> <translation>安装插件(&I)…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2765"/> + <location filename="../UI/UserInterface.py" line="2763"/> <source><b>Install Plugins...</b><p>This opens a dialog to install or update plugins.</p></source> <translation><b>安装插件…</b><p>打开一个对话框安装或更新插件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2777"/> + <location filename="../UI/UserInterface.py" line="2775"/> <source>Uninstall Plugin</source> <translation>卸载插件</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2772"/> + <location filename="../UI/UserInterface.py" line="2770"/> <source>&Uninstall Plugin...</source> <translation>卸载插件(&U)…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2778"/> + <location filename="../UI/UserInterface.py" line="2776"/> <source><b>Uninstall Plugin...</b><p>This opens a dialog to uninstall a plugin.</p></source> <translation><b>卸载插件…</b><p>打开一个对话框卸载插件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2785"/> + <location filename="../UI/UserInterface.py" line="2783"/> <source>Plugin Repository</source> <translation>插件储存库</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2785"/> + <location filename="../UI/UserInterface.py" line="2783"/> <source>Plugin &Repository...</source> <translation>插件储存库(&R)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2788"/> + <source>Show Plugins available for download</source> + <translation>显示可以下载的插件</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2790"/> - <source>Show Plugins available for download</source> - <translation>显示可以下载的插件</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2792"/> <source><b>Plugin Repository...</b><p>This opens a dialog, that shows a list of plugins available on the Internet.</p></source> <translation><b>插件储存库…</b><p>打开一个对话框,显示互联网上可用的插件列表。</p></translation> </message> @@ -80551,7 +80561,7 @@ <translation type="obsolete">打开 PyQt4 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2942"/> + <location filename="../UI/UserInterface.py" line="2940"/> <source>Eric API Documentation</source> <translation>Eric API 文档</translation> </message> @@ -80561,112 +80571,112 @@ <translation type="obsolete">&Eric API 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2946"/> + <location filename="../UI/UserInterface.py" line="2944"/> <source>Open Eric API Documentation</source> <translation>打开 Eric API 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3147"/> + <location filename="../UI/UserInterface.py" line="3145"/> <source>&Unittest</source> <translation>单元测试(&U)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3091"/> + <location filename="../UI/UserInterface.py" line="3089"/> <source>E&xtras</source> <translation>附加程序(&X)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3101"/> + <location filename="../UI/UserInterface.py" line="3099"/> <source>Wi&zards</source> <translation>向导(&Z)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3164"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Select Tool Group</source> <translation>选择工具组</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3175"/> + <location filename="../UI/UserInterface.py" line="3173"/> <source>Se&ttings</source> <translation>设置(&T)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3205"/> + <location filename="../UI/UserInterface.py" line="3203"/> <source>&Window</source> <translation>窗口(&W)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3266"/> + <location filename="../UI/UserInterface.py" line="3264"/> <source>&Toolbars</source> <translation>工具栏(&T)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3126"/> <source>P&lugins</source> <translation>插件(&L)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3137"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3280"/> + <location filename="../UI/UserInterface.py" line="3278"/> <source>&Help</source> <translation>帮助(&H)</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="3352"/> + <source>Tools</source> + <translation>工具</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="3354"/> - <source>Tools</source> - <translation>工具</translation> + <source>Settings</source> + <translation>设置</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="5216"/> + <source>Help</source> + <translation>帮助</translation> </message> <message> <location filename="../UI/UserInterface.py" line="3356"/> - <source>Settings</source> - <translation>设置</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="5218"/> - <source>Help</source> - <translation>帮助</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="3358"/> <source>Profiles</source> <translation>模式</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3359"/> + <location filename="../UI/UserInterface.py" line="3357"/> <source>Plugins</source> <translation>插件</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3528"/> + <location filename="../UI/UserInterface.py" line="3526"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>状态栏的这一部分显示当前编辑器语言。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3535"/> + <location filename="../UI/UserInterface.py" line="3533"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>状态栏的这一部分显示当前编辑器编码。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3542"/> + <location filename="../UI/UserInterface.py" line="3540"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>状态栏的这一部分显示当前编辑器行尾设置。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3549"/> + <location filename="../UI/UserInterface.py" line="3547"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>状态栏的这一部分显示当前编辑器文件是否可写。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3556"/> + <location filename="../UI/UserInterface.py" line="3554"/> <source><p>This part of the status bar displays the line number of the current editor.</p></source> <translation><p>状态栏的这一部分显示当前编辑的行号。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3563"/> + <location filename="../UI/UserInterface.py" line="3561"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>状态栏的这一部分显示当前编辑器的光标位置。</p></translation> </message> @@ -80676,52 +80686,52 @@ <translation type="obsolete"><h3>版本号</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7255"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3816"/> + <location filename="../UI/UserInterface.py" line="3814"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>电子邮件地址或邮件服务器地址为空。请在首选项对话框中配置你的电子邮件设置。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4136"/> + <location filename="../UI/UserInterface.py" line="4134"/> <source>Restart application</source> <translation>重启程序</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4136"/> + <location filename="../UI/UserInterface.py" line="4134"/> <source>The application needs to be restarted. Do it now?</source> <translation>程序需要重启。现在重启?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4217"/> + <location filename="../UI/UserInterface.py" line="4215"/> <source>Configure Tool Groups ...</source> <translation>配置工具组…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4221"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>Configure current Tool Group ...</source> <translation>配置当前工具组…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4172"/> + <location filename="../UI/UserInterface.py" line="4170"/> <source>&Builtin Tools</source> <translation>内建工具(&B)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4189"/> + <location filename="../UI/UserInterface.py" line="4187"/> <source>&Plugin Tools</source> <translation>插件工具(&P)</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="4336"/> + <source>&Show all</source> + <translation>全部显示(&S)</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="4338"/> - <source>&Show all</source> - <translation>全部显示(&S)</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="4340"/> <source>&Hide all</source> <translation>全部隐藏(&H)</translation> </message> @@ -80731,47 +80741,47 @@ <translation type="obsolete">当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5346"/> + <location filename="../UI/UserInterface.py" line="5344"/> <source>Problem</source> <translation>问题</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5541"/> + <location filename="../UI/UserInterface.py" line="5539"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6081"/> + <location filename="../UI/UserInterface.py" line="6079"/> <source>Open Browser</source> <translation>打开浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6081"/> + <location filename="../UI/UserInterface.py" line="6079"/> <source>Could not start a web browser</source> <translation>无法启动网络浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5218"/> + <location filename="../UI/UserInterface.py" line="5216"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>目前没有选择自定义浏览器。请使用首选项对话框指定一个。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5252"/> + <location filename="../UI/UserInterface.py" line="5250"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>无法开启帮助浏览器。<br>确保其有效如 <b>hh</b>。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5486"/> + <location filename="../UI/UserInterface.py" line="5484"/> <source>External Tools</source> <translation>外部工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5881"/> + <location filename="../UI/UserInterface.py" line="5879"/> <source>Documentation Missing</source> <translation>文档缺失</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5864"/> + <location filename="../UI/UserInterface.py" line="5862"/> <source>Documentation</source> <translation>文档</translation> </message> @@ -80781,57 +80791,57 @@ <translation type="obsolete"><p>未配置 PyQt4 文档起点。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6483"/> + <location filename="../UI/UserInterface.py" line="6481"/> <source>Save tasks</source> <translation>保存任务</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6512"/> + <location filename="../UI/UserInterface.py" line="6510"/> <source>Read tasks</source> <translation>读取任务</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6608"/> + <location filename="../UI/UserInterface.py" line="6606"/> <source>Save session</source> <translation>保存会话</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6592"/> + <location filename="../UI/UserInterface.py" line="6590"/> <source>Read session</source> <translation>读取会话</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6875"/> + <location filename="../UI/UserInterface.py" line="6873"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7218"/> + <location filename="../UI/UserInterface.py" line="7216"/> <source>Error during updates check</source> <translation>检查更新时出错</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7040"/> + <location filename="../UI/UserInterface.py" line="7038"/> <source>&Cancel</source> <translation>取消(&C)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7199"/> + <location filename="../UI/UserInterface.py" line="7197"/> <source>Update available</source> <translation>可用更新</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7218"/> + <location filename="../UI/UserInterface.py" line="7216"/> <source>Could not perform updates check.</source> <translation>无法完成更新检查。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7242"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source><h3>Available versions</h3><table></source> <translation><h3>可用版本</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7294"/> + <location filename="../UI/UserInterface.py" line="7292"/> <source>First time usage</source> <translation>第一次使用</translation> </message> @@ -80901,12 +80911,12 @@ <translation><b>SQL 浏览器</b><p>浏览 SQL 数据库。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2481"/> + <location filename="../UI/UserInterface.py" line="2479"/> <source>Icon Editor</source> <translation>图标编辑器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2481"/> + <location filename="../UI/UserInterface.py" line="2479"/> <source>&Icon Editor...</source> <translation>图标编辑器(&I)…</translation> </message> @@ -80946,111 +80956,111 @@ <translation>{0} - {1} - {2} - 被动模式</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3634"/> + <location filename="../UI/UserInterface.py" line="3632"/> <source>External Tools/{0}</source> <translation>外部工具/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5346"/> + <location filename="../UI/UserInterface.py" line="5344"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>文件 <b>{0}</b> 不存在或者长度为零。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5071"/> + <location filename="../UI/UserInterface.py" line="5069"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 设计师。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5141"/> + <location filename="../UI/UserInterface.py" line="5139"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 语言家。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5185"/> + <location filename="../UI/UserInterface.py" line="5183"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 助手。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5232"/> + <location filename="../UI/UserInterface.py" line="5230"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动自定义的查看器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5302"/> + <location filename="../UI/UserInterface.py" line="5300"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 UI 预览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5359"/> + <location filename="../UI/UserInterface.py" line="5357"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动翻译预览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5382"/> + <location filename="../UI/UserInterface.py" line="5380"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 SQL 浏览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5477"/> + <location filename="../UI/UserInterface.py" line="5475"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5486"/> + <location filename="../UI/UserInterface.py" line="5484"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5525"/> + <location filename="../UI/UserInterface.py" line="5523"/> <source>Starting process '{0} {1}'. </source> <translation>正在启动进程“{0} {1}”。 </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5541"/> + <location filename="../UI/UserInterface.py" line="5539"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5619"/> + <location filename="../UI/UserInterface.py" line="5617"/> <source>Process '{0}' has exited. </source> <translation>进程“{0}”已退出。 </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5881"/> + <location filename="../UI/UserInterface.py" line="5879"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6483"/> + <location filename="../UI/UserInterface.py" line="6481"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>任务文件 <b>{0}</b> 无法写入。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6512"/> + <location filename="../UI/UserInterface.py" line="6510"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>任务文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6546"/> + <location filename="../UI/UserInterface.py" line="6544"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>会话文件 <b>{0}</b> 无法写入。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6592"/> + <location filename="../UI/UserInterface.py" line="6590"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>会话文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6875"/> + <location filename="../UI/UserInterface.py" line="6873"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7049"/> + <location filename="../UI/UserInterface.py" line="7047"/> <source>Trying host {0}</source> <translation>正在尝试主机 {0}</translation> </message> @@ -81085,12 +81095,12 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6311"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>键盘快捷键文件 (*.e4k)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2920"/> + <location filename="../UI/UserInterface.py" line="2918"/> <source>Python 3 Documentation</source> <translation>Python 3 文档</translation> </message> @@ -81100,7 +81110,7 @@ <translation type="obsolete">Python &3 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2924"/> + <location filename="../UI/UserInterface.py" line="2922"/> <source>Open Python 3 Documentation</source> <translation>打开 Python 3 文档</translation> </message> @@ -81120,17 +81130,17 @@ <translation type="obsolete">打开 Python 2 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7107"/> + <location filename="../UI/UserInterface.py" line="7105"/> <source>Error getting versions information</source> <translation>获取版本信息出错</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7098"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation>无法获取版本信息。请连线并再试一次。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7107"/> + <location filename="../UI/UserInterface.py" line="7105"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>过去7天均无法获取版本信息。请连线并再试一次。</translation> </message> @@ -81196,32 +81206,32 @@ <translation>并排比较文件(&F)…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2495"/> + <location filename="../UI/UserInterface.py" line="2493"/> <source>Snapshot</source> <translation>快照</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2495"/> + <location filename="../UI/UserInterface.py" line="2493"/> <source>&Snapshot...</source> <translation>快照(&S)…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2498"/> + <source>Take snapshots of a screen region</source> + <translation>截取屏幕区域的快照</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2500"/> - <source>Take snapshots of a screen region</source> - <translation>截取屏幕区域的快照</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2502"/> <source><b>Snapshot</b><p>This opens a dialog to take snapshots of a screen region.</p></source> <translation><b>快照</b><p>打开一个对话框来截取屏幕一个区域的快照。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5454"/> + <location filename="../UI/UserInterface.py" line="5452"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动快照工具。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7313"/> + <location filename="../UI/UserInterface.py" line="7311"/> <source>Select Workspace Directory</source> <translation>选择工作区目录</translation> </message> @@ -81441,7 +81451,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3214"/> + <location filename="../UI/UserInterface.py" line="3212"/> <source>&Windows</source> <translation>窗口(&W)</translation> </message> @@ -81516,7 +81526,7 @@ <translation><b>Qt 语言家</b><p>启动 Qt 语言家。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2851"/> + <location filename="../UI/UserInterface.py" line="2849"/> <source>Qt5 Documentation</source> <translation>Qt5 文档</translation> </message> @@ -81526,7 +81536,7 @@ <translation type="obsolete">Qt&5 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2855"/> + <location filename="../UI/UserInterface.py" line="2853"/> <source>Open Qt5 Documentation</source> <translation>打开 Qt5 文档</translation> </message> @@ -81536,42 +81546,42 @@ <translation type="obsolete"><p>状态栏的这一部分允许对当前编辑器、shell 或终端进行缩放。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2659"/> + <location filename="../UI/UserInterface.py" line="2657"/> <source>Manage SSL Certificates</source> <translation>管理 SSL 证书</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2659"/> + <location filename="../UI/UserInterface.py" line="2657"/> <source>Manage SSL Certificates...</source> <translation>管理 SSL 证书…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2662"/> + <source>Manage the saved SSL certificates</source> + <translation>管理保存的 SSL 证书</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2664"/> - <source>Manage the saved SSL certificates</source> - <translation>管理保存的 SSL 证书</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2666"/> <source><b>Manage SSL Certificates...</b><p>Opens a dialog to manage the saved SSL certificates.</p></source> <translation><b>管理 SSL 证书…</b><p>打开一个对话框来管理保存的 SSL 证书。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2675"/> + <location filename="../UI/UserInterface.py" line="2673"/> <source>Edit Message Filters</source> <translation>编辑消息过滤器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2675"/> + <location filename="../UI/UserInterface.py" line="2673"/> <source>Edit Message Filters...</source> <translation>编辑消息过滤器…</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2678"/> + <source>Edit the message filters used to suppress unwanted messages</source> + <translation>编辑消息过滤器使得不期望的消息不显示</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2680"/> - <source>Edit the message filters used to suppress unwanted messages</source> - <translation>编辑消息过滤器使得不期望的消息不显示</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2682"/> <source><b>Edit Message Filters</b><p>Opens a dialog to edit the message filters used to suppress unwanted messages been shown in an error window.</p></source> <translation><b>编辑消息过滤器</b><p>打开对话框来编辑消息过滤器,使得不期望的错误信息不再在错误窗口中显示。</p></translation> </message> @@ -81581,7 +81591,7 @@ <translation type="obsolete">PyQt&4 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2881"/> + <location filename="../UI/UserInterface.py" line="2879"/> <source>PyQt5 Documentation</source> <translation>PyQt5 文档</translation> </message> @@ -81591,7 +81601,7 @@ <translation type="obsolete">PyQt&5 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2885"/> + <location filename="../UI/UserInterface.py" line="2883"/> <source>Open PyQt5 Documentation</source> <translation>打开 PyQt5 文档</translation> </message> @@ -81601,17 +81611,17 @@ <translation type="obsolete"><p>未配置 PyQt5 文档起始位置。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2825"/> + <location filename="../UI/UserInterface.py" line="2823"/> <source><b>Virtualenv Configurator</b><p>This opens a dialog for entering all the parameters needed to create a Python virtual environment using virtualenv or pyvenv.</p></source> <translation type="unfinished"><b>Qt5 文档</b><p>显示 Qt5 文档。依赖于您的设置,这可能会在 eric 的内置帮助查看器内显示,或是启动一个网页浏览器,或是启动 Qt 助手。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2926"/> + <location filename="../UI/UserInterface.py" line="2924"/> <source><b>Python 3 Documentation</b><p>Display the Python 3 documentation. If no documentation directory is configured, the location of the Python 3 documentation is assumed to be the doc directory underneath the location of the Python 3 executable on Windows and <i>/usr/share/doc/packages/python/html</i> on Unix. Set PYTHON3DOCDIR in your environment to override this.</p></source> <translation><b>Python 3 文档</b><p>显示 Python 3 文档。如果尚未配置文档目录,则在 Windows 系统上,文档位置将默认为 Python 3 可执行文件所在目录下的 doc 目录;在类 Unix 系统上,则默认为 <i>/usr/share/doc/packages/python/html</i>。请在环境中设置 PYTHON3DOCDIR 以覆盖默认行为。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7040"/> + <location filename="../UI/UserInterface.py" line="7038"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -81631,7 +81641,7 @@ <translation><b>显示错误日志…</b><p>打开一个对话框显示最近的错误日志。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7044"/> + <location filename="../UI/UserInterface.py" line="7042"/> <source>Version Check</source> <translation>版本检查</translation> </message> @@ -81726,12 +81736,12 @@ <translation>生成插件工具栏…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4192"/> + <location filename="../UI/UserInterface.py" line="4190"/> <source>&User Tools</source> <translation>用户工具(&U)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4264"/> + <location filename="../UI/UserInterface.py" line="4262"/> <source>No User Tools Configured</source> <translation>没有配置的用户工具</translation> </message> @@ -81761,12 +81771,12 @@ <translation type="obsolete"><b>十六进制编辑器</b><p>启动 eric6 十六进制编辑器来查看、修改二进制文件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2698"/> + <location filename="../UI/UserInterface.py" line="2696"/> <source>Clear private data</source> <translation type="unfinished">清空隐私数据</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2700"/> + <location filename="../UI/UserInterface.py" line="2698"/> <source><b>Clear private data</b><p>Clears the private data like the various list of recently opened files, projects or multi projects.</p></source> <translation type="unfinished"></translation> </message> @@ -81781,7 +81791,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6628"/> <source>Load session</source> <translation type="unfinished">载入会话</translation> </message> @@ -81796,12 +81806,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6681"/> + <location filename="../UI/UserInterface.py" line="6679"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6681"/> + <location filename="../UI/UserInterface.py" line="6679"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -81816,12 +81826,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7187"/> + <location filename="../UI/UserInterface.py" line="7185"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7187"/> + <location filename="../UI/UserInterface.py" line="7185"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> @@ -81831,77 +81841,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2856"/> + <location filename="../UI/UserInterface.py" line="2854"/> <source><b>Qt5 Documentation</b><p>Display the Qt5 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer/web browser, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2887"/> + <location filename="../UI/UserInterface.py" line="2885"/> <source><b>PyQt5 Documentation</b><p>Display the PyQt5 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer/web browser, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2963"/> + <location filename="../UI/UserInterface.py" line="2961"/> <source>PySide2 Documentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2965"/> + <source>Open PySide2 Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2967"/> - <source>Open PySide2 Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2969"/> <source><b>PySide2 Documentation</b><p>Display the PySide2 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer/web browser, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5864"/> + <location filename="../UI/UserInterface.py" line="5862"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2804"/> + <source>Virtualenv Manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2798"/> + <source>&Virtualenv Manager...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2806"/> - <source>Virtualenv Manager</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2800"/> - <source>&Virtualenv Manager...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2808"/> <source><b>Virtualenv Manager</b><p>This opens a dialog to manage the defined Python virtual environments.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2823"/> + <location filename="../UI/UserInterface.py" line="2821"/> <source>Virtualenv Configurator</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2817"/> + <location filename="../UI/UserInterface.py" line="2815"/> <source>Virtualenv &Configurator...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3221"/> + <location filename="../UI/UserInterface.py" line="3219"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3233"/> + <location filename="../UI/UserInterface.py" line="3231"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3240"/> + <location filename="../UI/UserInterface.py" line="3238"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3260"/> + <location filename="../UI/UserInterface.py" line="3258"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -81927,7 +81937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6038"/> + <location filename="../UI/UserInterface.py" line="6036"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> @@ -81942,7 +81952,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3574"/> + <location filename="../UI/UserInterface.py" line="3572"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -82017,27 +82027,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3218"/> + <location filename="../UI/UserInterface.py" line="3216"/> <source>Central Park</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3743"/> + <location filename="../UI/UserInterface.py" line="3741"/> <source><h2>Version Numbers</h2><table></source> <translation type="unfinished"><h3>版本号</h3><table> {2>?} {2>?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5080"/> + <location filename="../UI/UserInterface.py" line="5078"/> <source><p>Could not find the Qt-Designer executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5150"/> + <location filename="../UI/UserInterface.py" line="5148"/> <source><p>Could not find the Qt-Linguist executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5194"/> + <location filename="../UI/UserInterface.py" line="5192"/> <source><p>Could not find the Qt-Assistant executable.<br>Ensure that it is installed and optionally configured on the Qt configuration page.</p></source> <translation type="unfinished"></translation> </message> @@ -82062,52 +82072,52 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2866"/> + <location filename="../UI/UserInterface.py" line="2864"/> <source>Qt6 Documentation</source> <translation type="unfinished">Qt5 文档 {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2870"/> + <location filename="../UI/UserInterface.py" line="2868"/> <source>Open Qt6 Documentation</source> <translation type="unfinished">打开 Qt5 文档 {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2871"/> + <location filename="../UI/UserInterface.py" line="2869"/> <source><b>Qt6 Documentation</b><p>Display the Qt6 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer/web browser, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2898"/> + <location filename="../UI/UserInterface.py" line="2896"/> <source>PyQt6 Documentation</source> <translation type="unfinished">PyQt5 文档 {6 ?}</translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2900"/> + <source>Open PyQt6 Documentation</source> + <translation type="unfinished">打开 PyQt5 文档 {6 ?}</translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2902"/> - <source>Open PyQt6 Documentation</source> - <translation type="unfinished">打开 PyQt5 文档 {6 ?}</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2904"/> <source><b>PyQt6 Documentation</b><p>Display the PyQt6 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer/web browser, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2983"/> + <location filename="../UI/UserInterface.py" line="2981"/> <source>PySide6 Documentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../UI/UserInterface.py" line="2985"/> + <source>Open PySide6 Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="2987"/> - <source>Open PySide6 Documentation</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="2989"/> <source><b>PySide6 Documentation</b><p>Display the PySide6 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer/web browser, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5759"/> + <location filename="../UI/UserInterface.py" line="5757"/> <source><p>The PyQt{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -82167,62 +82177,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2486"/> + <location filename="../UI/UserInterface.py" line="2484"/> <source>Start the eric Icon Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2488"/> + <location filename="../UI/UserInterface.py" line="2486"/> <source><b>Icon Editor</b><p>Starts the eric Icon Editor for editing simple icons.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2574"/> + <location filename="../UI/UserInterface.py" line="2572"/> <source><b>Show external tools</b><p>Opens a dialog to show the path and versions of all extenal tools used by eric.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2948"/> + <location filename="../UI/UserInterface.py" line="2946"/> <source><b>Eric API Documentation</b><p>Display the Eric API documentation. The location for the documentation is the Documentation/Source subdirectory of the eric installation directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5977"/> + <location filename="../UI/UserInterface.py" line="5975"/> <source>The eric web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6038"/> + <location filename="../UI/UserInterface.py" line="6036"/> <source><p>The eric web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6630"/> + <location filename="../UI/UserInterface.py" line="6628"/> <source>eric Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7199"/> + <location filename="../UI/UserInterface.py" line="7197"/> <source>The update to <b>{0}</b> of eric is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7177"/> + <location filename="../UI/UserInterface.py" line="7175"/> <source>You are using a snapshot release of eric. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7211"/> + <location filename="../UI/UserInterface.py" line="7209"/> <source>eric is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7211"/> + <location filename="../UI/UserInterface.py" line="7209"/> <source>You are using the latest version of eric</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7294"/> + <location filename="../UI/UserInterface.py" line="7292"/> <source>eric has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> @@ -92486,46 +92496,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1239"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1751"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1761"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1259"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1909"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1929"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1933"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1770"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -92533,12 +92543,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -92549,13 +92559,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1901"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1738"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>