--- a/i18n/eric6_zh_CN.GB2312.ts Wed Nov 05 19:28:50 2014 +0100
+++ b/i18n/eric6_zh_CN.GB2312.ts Fri Nov 07 19:11:33 2014 +0100
@@ -4744,7 +4744,7 @@
<translation>uic 错误</translation>
</message>
<message>
- <location filename="../Project/CreateDialogCodeDialog.py" line="516"/>
+ <location filename="../Project/CreateDialogCodeDialog.py" line="517"/>
<source>Code Generation</source>
<translation>代码生成</translation>
</message>
@@ -4759,17 +4759,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/CreateDialogCodeDialog.py" line="401"/>
+ <location filename="../Project/CreateDialogCodeDialog.py" line="402"/>
<source><p>Could not open the code template file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/CreateDialogCodeDialog.py" line="437"/>
+ <location filename="../Project/CreateDialogCodeDialog.py" line="438"/>
<source><p>Could not open the source file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/CreateDialogCodeDialog.py" line="516"/>
+ <location filename="../Project/CreateDialogCodeDialog.py" line="517"/>
<source><p>Could not write the source file "{0}".</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -8469,862 +8469,862 @@
<context>
<name>Editor</name>
<message>
- <location filename="../QScintilla/Editor.py" line="2844"/>
+ <location filename="../QScintilla/Editor.py" line="2845"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="384"/>
+ <location filename="../QScintilla/Editor.py" line="385"/>
<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="642"/>
+ <location filename="../QScintilla/Editor.py" line="643"/>
<source>Undo</source>
<translation>撤消</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="645"/>
+ <location filename="../QScintilla/Editor.py" line="646"/>
<source>Redo</source>
<translation>重做</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="648"/>
+ <location filename="../QScintilla/Editor.py" line="649"/>
<source>Revert to last saved state</source>
<translation>还原到最后保存的状态</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="652"/>
+ <location filename="../QScintilla/Editor.py" line="653"/>
<source>Cut</source>
<translation>剪切</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="655"/>
+ <location filename="../QScintilla/Editor.py" line="656"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="658"/>
+ <location filename="../QScintilla/Editor.py" line="659"/>
<source>Paste</source>
<translation>粘贴</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="663"/>
+ <location filename="../QScintilla/Editor.py" line="664"/>
<source>Indent</source>
<translation>缩进</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="666"/>
+ <location filename="../QScintilla/Editor.py" line="667"/>
<source>Unindent</source>
<translation>取消缩进</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="669"/>
+ <location filename="../QScintilla/Editor.py" line="670"/>
<source>Comment</source>
<translation>注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="672"/>
+ <location filename="../QScintilla/Editor.py" line="673"/>
<source>Uncomment</source>
<translation>取消注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="675"/>
+ <location filename="../QScintilla/Editor.py" line="676"/>
<source>Stream Comment</source>
<translation>流注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="678"/>
+ <location filename="../QScintilla/Editor.py" line="679"/>
<source>Box Comment</source>
<translation>块注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="682"/>
+ <location filename="../QScintilla/Editor.py" line="683"/>
<source>Select to brace</source>
<translation>选择括号内容</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="684"/>
- <source>Select all</source>
- <translation>全选</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="685"/>
+ <source>Select all</source>
+ <translation>全选</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="686"/>
<source>Deselect all</source>
<translation>全部取消选择</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6919"/>
+ <location filename="../QScintilla/Editor.py" line="6920"/>
<source>Check spelling...</source>
<translation>正在进行拼写检查……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="691"/>
+ <location filename="../QScintilla/Editor.py" line="692"/>
<source>Check spelling of selection...</source>
<translation>正在对所选内容进行拼写检查……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="699"/>
+ <location filename="../QScintilla/Editor.py" line="700"/>
<source>Shorten empty lines</source>
<translation>缩减空行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="706"/>
+ <location filename="../QScintilla/Editor.py" line="707"/>
<source>Use Monospaced Font</source>
<translation>使用单空格字体</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="711"/>
+ <location filename="../QScintilla/Editor.py" line="712"/>
<source>Autosave enabled</source>
<translation>允许自动保存</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="715"/>
+ <location filename="../QScintilla/Editor.py" line="716"/>
<source>Typing aids enabled</source>
<translation>允许输入辅助</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="722"/>
+ <location filename="../QScintilla/Editor.py" line="723"/>
<source>Autocompletion enabled</source>
<translation>自动完成已启用</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="750"/>
+ <location filename="../QScintilla/Editor.py" line="751"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="756"/>
+ <location filename="../QScintilla/Editor.py" line="757"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="759"/>
+ <location filename="../QScintilla/Editor.py" line="760"/>
<source>Save As...</source>
<translation>另存为……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="769"/>
+ <location filename="../QScintilla/Editor.py" line="770"/>
<source>Print Preview</source>
<translation>打印预览</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="772"/>
+ <location filename="../QScintilla/Editor.py" line="773"/>
<source>Print</source>
<translation>打印</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="793"/>
+ <location filename="../QScintilla/Editor.py" line="794"/>
<source>Autocomplete</source>
<translation>自动完成</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="795"/>
+ <location filename="../QScintilla/Editor.py" line="796"/>
<source>dynamic</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="798"/>
+ <location filename="../QScintilla/Editor.py" line="799"/>
<source>from Document</source>
<translation>从文档</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="800"/>
+ <location filename="../QScintilla/Editor.py" line="801"/>
<source>from APIs</source>
<translation>从 APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="802"/>
+ <location filename="../QScintilla/Editor.py" line="803"/>
<source>from Document and APIs</source>
<translation>从文档和 APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="805"/>
+ <location filename="../QScintilla/Editor.py" line="806"/>
<source>Calltip</source>
<translation>调用提示</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="818"/>
+ <location filename="../QScintilla/Editor.py" line="819"/>
<source>Check</source>
<translation>检查</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="838"/>
+ <location filename="../QScintilla/Editor.py" line="839"/>
<source>Show</source>
<translation>显示</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="840"/>
- <source>Code metrics...</source>
- <translation>代码度量……</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="841"/>
+ <source>Code metrics...</source>
+ <translation>代码度量……</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="842"/>
<source>Code coverage...</source>
<translation>代码覆盖率……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="843"/>
+ <location filename="../QScintilla/Editor.py" line="844"/>
<source>Show code coverage annotations</source>
<translation>显示代码覆盖率注解</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="846"/>
+ <location filename="../QScintilla/Editor.py" line="847"/>
<source>Hide code coverage annotations</source>
<translation>隐藏代码覆盖率注解</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="849"/>
+ <location filename="../QScintilla/Editor.py" line="850"/>
<source>Profile data...</source>
<translation>剖析数据……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="862"/>
+ <location filename="../QScintilla/Editor.py" line="863"/>
<source>Diagrams</source>
<translation>图表</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="864"/>
+ <location filename="../QScintilla/Editor.py" line="865"/>
<source>Class Diagram...</source>
<translation>类图……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="866"/>
+ <location filename="../QScintilla/Editor.py" line="867"/>
<source>Package Diagram...</source>
<translation>程序包图……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="868"/>
+ <location filename="../QScintilla/Editor.py" line="869"/>
<source>Imports Diagram...</source>
<translation>引用图……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="870"/>
+ <location filename="../QScintilla/Editor.py" line="871"/>
<source>Application Diagram...</source>
<translation>应用程序图……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="888"/>
+ <location filename="../QScintilla/Editor.py" line="889"/>
<source>Languages</source>
<translation>语言</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="891"/>
+ <location filename="../QScintilla/Editor.py" line="892"/>
<source>No Language</source>
<translation>无语言</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="914"/>
+ <location filename="../QScintilla/Editor.py" line="915"/>
<source>Guessed</source>
<translation>已推测</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1249"/>
+ <location filename="../QScintilla/Editor.py" line="1250"/>
<source>Alternatives</source>
<translation>备选</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="934"/>
+ <location filename="../QScintilla/Editor.py" line="935"/>
<source>Encodings</source>
<translation>编码</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="975"/>
+ <location filename="../QScintilla/Editor.py" line="976"/>
<source>End-of-Line Type</source>
<translation>行尾类型</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="979"/>
+ <location filename="../QScintilla/Editor.py" line="980"/>
<source>Unix</source>
<translation>Unix</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="986"/>
+ <location filename="../QScintilla/Editor.py" line="987"/>
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="993"/>
+ <location filename="../QScintilla/Editor.py" line="994"/>
<source>Macintosh</source>
<translation>Macintosh</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1011"/>
+ <location filename="../QScintilla/Editor.py" line="1012"/>
<source>Export as</source>
<translation>导出为</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1134"/>
+ <location filename="../QScintilla/Editor.py" line="1135"/>
<source>Toggle bookmark</source>
<translation>切换书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1136"/>
+ <location filename="../QScintilla/Editor.py" line="1137"/>
<source>Next bookmark</source>
<translation>下一个书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1138"/>
+ <location filename="../QScintilla/Editor.py" line="1139"/>
<source>Previous bookmark</source>
<translation>上一个书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1140"/>
+ <location filename="../QScintilla/Editor.py" line="1141"/>
<source>Clear all bookmarks</source>
<translation>清除所有书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1160"/>
+ <location filename="../QScintilla/Editor.py" line="1161"/>
<source>Toggle breakpoint</source>
<translation>切换断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1162"/>
+ <location filename="../QScintilla/Editor.py" line="1163"/>
<source>Toggle temporary breakpoint</source>
<translation>切换临时断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1165"/>
+ <location filename="../QScintilla/Editor.py" line="1166"/>
<source>Edit breakpoint...</source>
<translation>编辑断点……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4856"/>
+ <location filename="../QScintilla/Editor.py" line="4857"/>
<source>Enable breakpoint</source>
<translation>允许断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1170"/>
+ <location filename="../QScintilla/Editor.py" line="1171"/>
<source>Next breakpoint</source>
<translation>下一个断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1172"/>
+ <location filename="../QScintilla/Editor.py" line="1173"/>
<source>Previous breakpoint</source>
<translation>上一个断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1174"/>
+ <location filename="../QScintilla/Editor.py" line="1175"/>
<source>Clear all breakpoints</source>
<translation>清除所有断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1143"/>
+ <location filename="../QScintilla/Editor.py" line="1144"/>
<source>Goto syntax error</source>
<translation>转到语法错误处</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1145"/>
+ <location filename="../QScintilla/Editor.py" line="1146"/>
<source>Show syntax error message</source>
<translation>显示语法错误消息</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1147"/>
+ <location filename="../QScintilla/Editor.py" line="1148"/>
<source>Clear syntax error</source>
<translation>清除语法错误</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1177"/>
+ <location filename="../QScintilla/Editor.py" line="1178"/>
<source>Next uncovered line</source>
<translation>下一个未覆盖行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1180"/>
+ <location filename="../QScintilla/Editor.py" line="1181"/>
<source>Previous uncovered line</source>
<translation>上一个未覆盖行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1183"/>
+ <location filename="../QScintilla/Editor.py" line="1184"/>
<source>Next task</source>
<translation>下一个任务</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1185"/>
+ <location filename="../QScintilla/Editor.py" line="1186"/>
<source>Previous task</source>
<translation>上一个任务</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1194"/>
+ <location filename="../QScintilla/Editor.py" line="1195"/>
<source>LMB toggles bookmarks</source>
<translation>左键切换书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1198"/>
+ <location filename="../QScintilla/Editor.py" line="1199"/>
<source>LMB toggles breakpoints</source>
<translation>左键切换断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1234"/>
+ <location filename="../QScintilla/Editor.py" line="1235"/>
<source>Export source</source>
<translation>导出源代码</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1234"/>
+ <location filename="../QScintilla/Editor.py" line="1235"/>
<source>No export format given. Aborting...</source>
<translation>没有给定导出格式。终止……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1265"/>
+ <location filename="../QScintilla/Editor.py" line="1266"/>
<source>Pygments Lexer</source>
<translation>Pygments 词法分析器</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1265"/>
+ <location filename="../QScintilla/Editor.py" line="1266"/>
<source>Select the Pygments lexer to apply.</source>
<translation>选择要应用的 Pygments 词法分析器。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1717"/>
+ <location filename="../QScintilla/Editor.py" line="1718"/>
<source>Modification of Read Only file</source>
<translation>只读文件的改变</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1717"/>
+ <location filename="../QScintilla/Editor.py" line="1718"/>
<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="2409"/>
+ <location filename="../QScintilla/Editor.py" line="2410"/>
<source>Printing...</source>
<translation>打印中……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2426"/>
+ <location filename="../QScintilla/Editor.py" line="2427"/>
<source>Printing completed</source>
<translation>打印已完成</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2428"/>
+ <location filename="../QScintilla/Editor.py" line="2429"/>
<source>Error while printing</source>
<translation>打印时出错</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2431"/>
+ <location filename="../QScintilla/Editor.py" line="2432"/>
<source>Printing aborted</source>
<translation>打印失败</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2789"/>
+ <location filename="../QScintilla/Editor.py" line="2790"/>
<source>File Modified</source>
<translation>文件已改变</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3014"/>
+ <location filename="../QScintilla/Editor.py" line="3015"/>
<source>Save File</source>
<translation>保存文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4329"/>
+ <location filename="../QScintilla/Editor.py" line="4330"/>
<source>Autocompletion</source>
<translation>自动完成</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4329"/>
+ <location filename="../QScintilla/Editor.py" line="4330"/>
<source>Autocompletion is not available because there is no autocompletion source set.</source>
<translation>自动完成无效，没有设定自动完成源。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4859"/>
+ <location filename="../QScintilla/Editor.py" line="4860"/>
<source>Disable breakpoint</source>
<translation>去除断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5203"/>
+ <location filename="../QScintilla/Editor.py" line="5204"/>
<source>Code Coverage</source>
<translation>代码覆盖率</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5203"/>
+ <location filename="../QScintilla/Editor.py" line="5204"/>
<source>Please select a coverage file</source>
<translation>请选择一个覆盖率文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5267"/>
+ <location filename="../QScintilla/Editor.py" line="5268"/>
<source>Show Code Coverage Annotations</source>
<translation>显示代码覆盖率注解</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5260"/>
+ <location filename="../QScintilla/Editor.py" line="5261"/>
<source>All lines have been covered.</source>
<translation>所有行均被已覆盖。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5267"/>
+ <location filename="../QScintilla/Editor.py" line="5268"/>
<source>There is no coverage file available.</source>
<translation>没有有效的覆盖率文件。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5382"/>
+ <location filename="../QScintilla/Editor.py" line="5383"/>
<source>Profile Data</source>
<translation>剖析数据</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5382"/>
+ <location filename="../QScintilla/Editor.py" line="5383"/>
<source>Please select a profile file</source>
<translation>请选择一个剖析文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5542"/>
+ <location filename="../QScintilla/Editor.py" line="5543"/>
<source>Syntax Error</source>
<translation>语法错误</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5542"/>
+ <location filename="../QScintilla/Editor.py" line="5543"/>
<source>No syntax error message available.</source>
<translation>语法错误消息无效。</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5857"/>
+ <location filename="../QScintilla/Editor.py" line="5858"/>
<source>Macro Name</source>
<translation>宏名称</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5857"/>
+ <location filename="../QScintilla/Editor.py" line="5858"/>
<source>Select a macro name:</source>
<translation>选择一个宏名称：</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5885"/>
+ <location filename="../QScintilla/Editor.py" line="5886"/>
<source>Load macro file</source>
<translation>输入宏文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5928"/>
+ <location filename="../QScintilla/Editor.py" line="5929"/>
<source>Macro files (*.macro)</source>
<translation>宏文件 (*.macro)</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5908"/>
+ <location filename="../QScintilla/Editor.py" line="5909"/>
<source>Error loading macro</source>
<translation>载入宏文件出错</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5928"/>
+ <location filename="../QScintilla/Editor.py" line="5929"/>
<source>Save macro file</source>
<translation>保存宏文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5945"/>
+ <location filename="../QScintilla/Editor.py" line="5946"/>
<source>Save macro</source>
<translation>保存宏</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5961"/>
+ <location filename="../QScintilla/Editor.py" line="5962"/>
<source>Error saving macro</source>
<translation>保存宏出错</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5974"/>
+ <location filename="../QScintilla/Editor.py" line="5975"/>
<source>Start Macro Recording</source>
<translation>开始宏录制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5974"/>
+ <location filename="../QScintilla/Editor.py" line="5975"/>
<source>Macro recording is already active. Start new?</source>
<translation>宏录制已激活。开始录制新宏？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6000"/>
+ <location filename="../QScintilla/Editor.py" line="6001"/>
<source>Macro Recording</source>
<translation>宏录制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6000"/>
+ <location filename="../QScintilla/Editor.py" line="6001"/>
<source>Enter name of the macro:</source>
<translation>输入宏名称：</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6134"/>
+ <location filename="../QScintilla/Editor.py" line="6135"/>
<source>File changed</source>
<translation>文件已改变</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6436"/>
+ <location filename="../QScintilla/Editor.py" line="6437"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6457"/>
+ <location filename="../QScintilla/Editor.py" line="6458"/>
<source>Resources</source>
<translation>资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6459"/>
+ <location filename="../QScintilla/Editor.py" line="6460"/>
<source>Add file...</source>
<translation>添加文件……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6461"/>
+ <location filename="../QScintilla/Editor.py" line="6462"/>
<source>Add files...</source>
<translation>添加文件……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6463"/>
+ <location filename="../QScintilla/Editor.py" line="6464"/>
<source>Add aliased file...</source>
<translation>添加别名文件……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6466"/>
+ <location filename="../QScintilla/Editor.py" line="6467"/>
<source>Add localized resource...</source>
<translation>添加本地资源……</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6470"/>
+ <location filename="../QScintilla/Editor.py" line="6471"/>
<source>Add resource frame</source>
<translation>添加资源结构</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6489"/>
+ <location filename="../QScintilla/Editor.py" line="6490"/>
<source>Add file resource</source>
<translation>添加文件资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6505"/>
+ <location filename="../QScintilla/Editor.py" line="6506"/>
<source>Add file resources</source>
<translation>添加多个文件资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6533"/>
+ <location filename="../QScintilla/Editor.py" line="6534"/>
<source>Add aliased file resource</source>
<translation>添加别名文件资源</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6597"/>
+ <location filename="../QScintilla/Editor.py" line="6598"/>
<source>Package Diagram</source>
<translation>程序包图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6597"/>
+ <location filename="../QScintilla/Editor.py" line="6598"/>
<source>Include class attributes?</source>
<translation>包含类属性？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6617"/>
+ <location filename="../QScintilla/Editor.py" line="6618"/>
<source>Imports Diagram</source>
<translation>引用图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6617"/>
+ <location filename="../QScintilla/Editor.py" line="6618"/>
<source>Include imports from external modules?</source>
<translation>从外部模块包含引用？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6631"/>
+ <location filename="../QScintilla/Editor.py" line="6632"/>
<source>Application Diagram</source>
<translation>应用程序图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6631"/>
+ <location filename="../QScintilla/Editor.py" line="6632"/>
<source>Include module names?</source>
<translation>包含模块名？</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6922"/>
+ <location filename="../QScintilla/Editor.py" line="6923"/>
<source>Add to dictionary</source>
<translation>添加到文件夹</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6924"/>
+ <location filename="../QScintilla/Editor.py" line="6925"/>
<source>Ignore All</source>
<translation>全部忽略</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="695"/>
+ <location filename="../QScintilla/Editor.py" line="696"/>
<source>Remove from dictionary</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="331"/>
+ <location filename="../QScintilla/Editor.py" line="332"/>
<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 type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1226"/>
+ <location filename="../QScintilla/Editor.py" line="1227"/>
<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="1245"/>
+ <location filename="../QScintilla/Editor.py" line="1246"/>
<source>Alternatives ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2789"/>
+ <location filename="../QScintilla/Editor.py" line="2790"/>
<source><p>The file <b>{0}</b> has unsaved changes.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2844"/>
+ <location filename="../QScintilla/Editor.py" line="2845"/>
<source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2947"/>
+ <location filename="../QScintilla/Editor.py" line="2948"/>
<source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5899"/>
+ <location filename="../QScintilla/Editor.py" line="5900"/>
<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="5908"/>
+ <location filename="../QScintilla/Editor.py" line="5909"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5961"/>
+ <location filename="../QScintilla/Editor.py" line="5962"/>
<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="6296"/>
+ <location filename="../QScintilla/Editor.py" line="6297"/>
<source>{0} (ro)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6436"/>
+ <location filename="../QScintilla/Editor.py" line="6437"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6533"/>
+ <location filename="../QScintilla/Editor.py" line="6534"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1150"/>
+ <location filename="../QScintilla/Editor.py" line="1151"/>
<source>Next warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1153"/>
+ <location filename="../QScintilla/Editor.py" line="1154"/>
<source>Previous warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1155"/>
+ <location filename="../QScintilla/Editor.py" line="1156"/>
<source>Show warning message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1157"/>
+ <location filename="../QScintilla/Editor.py" line="1158"/>
<source>Clear warnings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3014"/>
+ <location filename="../QScintilla/Editor.py" line="3015"/>
<source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5945"/>
+ <location filename="../QScintilla/Editor.py" line="5946"/>
<source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5796"/>
+ <location filename="../QScintilla/Editor.py" line="5797"/>
<source>Warning: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5803"/>
+ <location filename="../QScintilla/Editor.py" line="5804"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6130"/>
+ <location filename="../QScintilla/Editor.py" line="6131"/>
<source><br><b>Warning:</b> You will lose your changes upon reopening it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4430"/>
+ <location filename="../QScintilla/Editor.py" line="4431"/>
<source>Activating Auto-Completion Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4430"/>
+ <location filename="../QScintilla/Editor.py" line="4431"/>
<source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4620"/>
+ <location filename="../QScintilla/Editor.py" line="4621"/>
<source>Activating Calltip Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4620"/>
+ <location filename="../QScintilla/Editor.py" line="4621"/>
<source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="765"/>
+ <location filename="../QScintilla/Editor.py" line="766"/>
<source>Open 'rejection' file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="874"/>
+ <location filename="../QScintilla/Editor.py" line="875"/>
<source>Load Diagram...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1188"/>
+ <location filename="../QScintilla/Editor.py" line="1189"/>
<source>Next change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1191"/>
+ <location filename="../QScintilla/Editor.py" line="1192"/>
<source>Previous change</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7336"/>
+ <location filename="../QScintilla/Editor.py" line="7337"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7336"/>
+ <location filename="../QScintilla/Editor.py" line="7337"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5732"/>
+ <location filename="../QScintilla/Editor.py" line="5733"/>
<source>Warning</source>
<translation type="unfinished">警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5732"/>
+ <location filename="../QScintilla/Editor.py" line="5733"/>
<source>No warning messages available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="5793"/>
+ <location filename="../QScintilla/Editor.py" line="5794"/>
<source>Style: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="742"/>
+ <location filename="../QScintilla/Editor.py" line="743"/>
<source>New Document View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="745"/>
+ <location filename="../QScintilla/Editor.py" line="746"/>
<source>New Document View (with new split)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="828"/>
+ <location filename="../QScintilla/Editor.py" line="829"/>
<source>Tools</source>
<translation type="unfinished">工具</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="956"/>
+ <location filename="../QScintilla/Editor.py" line="957"/>
<source>Re-Open With Encoding</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
+ <location filename="../QScintilla/Editor.py" line="6125"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
@@ -10645,6 +10645,14 @@
</message>
</context>
<context>
+ <name>EditorMarkerMap</name>
+ <message>
+ <location filename="../QScintilla/EditorMarkerMap.py" line="29"/>
+ <source><b>Editor Map</b><p>This shows a 'map' of the editor. The visible area is highlighted by the box and all markers like bookmarks, breakpoints, errors or changed lines are indicated by differently colored lines configurable via the Editoru279dStyle page of the configuration dialog.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>EditorPropertiesPage</name>
<message>
<location filename="../Preferences/ConfigurationPages/EditorPropertiesPage.ui" line="17"/>
@@ -13039,17 +13047,17 @@
<translation>要忽略的文件夹基本名称列表</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="192"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="194"/>
<source>Select output file</source>
<translation>选择输出文件</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="192"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="194"/>
<source>API files (*.api);;All files (*)</source>
<translation>API 文件 (*.api);;所有文件 (*)</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="223"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="225"/>
<source>Select directory to exclude</source>
<translation>选择要排除的文件夹</translation>
</message>
@@ -13369,22 +13377,22 @@
<translation>显示已选颜色的样例。</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="302"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="305"/>
<source>Select output directory</source>
<translation>选择输出文件夹</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="327"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="330"/>
<source>Select directory to exclude</source>
<translation>选择要排除的文件夹</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="367"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="370"/>
<source>Select CSS style sheet</source>
<translation>选择 CSS 样式表</translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="367"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="370"/>
<source>Style sheet (*.css);;All files (*)</source>
<translation>样式表 (*.css);;所有文件 (*)</translation>
</message>
@@ -13449,7 +13457,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="516"/>
+ <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="519"/>
<source>Select output directory for QtHelp files</source>
<translation type="unfinished"></translation>
</message>
@@ -18921,117 +18929,117 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2392"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2417"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2686"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2618"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2746"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2639"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2778"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2575"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2678"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2812"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2592"/>
<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="2860"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -19041,72 +19049,72 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3508"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3348"/>
<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="3509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3508"/>
<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="2928"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2927"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2974"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3021"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3074"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3217"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3250"/>
<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="3199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3198"/>
<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="3270"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
<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="3270"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3238"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
@@ -19136,7 +19144,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
@@ -19161,7 +19169,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2246"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
@@ -19171,67 +19179,67 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2206"/>
<source>Cancelling uncommitted merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/>
<source>Delete Bookmark</source>
<translation type="unfinished">删除书签</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3634"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3645"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3673"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3791"/>
<source>Pull Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3791"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3802"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/>
<source>Push Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3824"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
@@ -19256,12 +19264,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
<source>Marking as 'unresolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/>
<source>Marking as 'resolved'</source>
<translation type="unfinished"></translation>
</message>
@@ -24948,21 +24956,21 @@
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="367"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="370"/>
<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="369"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="372"/>
<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="371"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="374"/>
<source>%n line(s) deleted</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -52997,7 +53005,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1248"/>
+ <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1249"/>
<source>{0} (ro)</source>
<translation type="unfinished"></translation>
</message>
@@ -62591,12 +62599,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/>
<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="2117"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
@@ -62608,23 +62616,23 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/>
<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="2102"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/>
<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="2122"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/>
<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="2126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
<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>
@@ -62632,7 +62640,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
