--- a/i18n/eric6_zh_CN.ts Sat Feb 03 18:37:36 2018 +0100
+++ b/i18n/eric6_zh_CN.ts Sat Feb 03 18:41:49 2018 +0100
@@ -10176,117 +10176,117 @@
<context>
<name>Editor</name>
<message>
- <location filename="../QScintilla/Editor.py" line="2996"/>
+ <location filename="../QScintilla/Editor.py" line="3004"/>
<source>Open File</source>
<translation>打开文件</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="441"/>
+ <location filename="../QScintilla/Editor.py" line="449"/>
<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="747"/>
+ <location filename="../QScintilla/Editor.py" line="755"/>
<source>Undo</source>
<translation>撤消</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="750"/>
+ <location filename="../QScintilla/Editor.py" line="758"/>
<source>Redo</source>
<translation>重做</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="753"/>
+ <location filename="../QScintilla/Editor.py" line="761"/>
<source>Revert to last saved state</source>
<translation>还原到最后保存的状态</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="757"/>
+ <location filename="../QScintilla/Editor.py" line="765"/>
<source>Cut</source>
<translation>剪切</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="760"/>
+ <location filename="../QScintilla/Editor.py" line="768"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="763"/>
- <source>Paste</source>
- <translation>粘贴</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="771"/>
+ <source>Paste</source>
+ <translation>粘贴</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="779"/>
<source>Indent</source>
<translation>缩进</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="774"/>
+ <location filename="../QScintilla/Editor.py" line="782"/>
<source>Unindent</source>
<translation>取消缩进</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="777"/>
+ <location filename="../QScintilla/Editor.py" line="785"/>
<source>Comment</source>
<translation>注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="780"/>
+ <location filename="../QScintilla/Editor.py" line="788"/>
<source>Uncomment</source>
<translation>取消注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="783"/>
+ <location filename="../QScintilla/Editor.py" line="791"/>
<source>Stream Comment</source>
<translation>流注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="786"/>
+ <location filename="../QScintilla/Editor.py" line="794"/>
<source>Box Comment</source>
<translation>块注释</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="790"/>
+ <location filename="../QScintilla/Editor.py" line="798"/>
<source>Select to brace</source>
<translation>选择括号内容</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="792"/>
+ <location filename="../QScintilla/Editor.py" line="800"/>
<source>Select all</source>
<translation>全选</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="793"/>
- <source>Deselect all</source>
- <translation>全部取消选择</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7501"/>
- <source>Check spelling...</source>
- <translation>正在进行拼写检查…</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="801"/>
- <source>Check spelling of selection...</source>
- <translation>正在对所选内容进行拼写检查…</translation>
+ <source>Deselect all</source>
+ <translation>全部取消选择</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7533"/>
+ <source>Check spelling...</source>
+ <translation>正在进行拼写检查…</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="809"/>
+ <source>Check spelling of selection...</source>
+ <translation>正在对所选内容进行拼写检查…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="817"/>
<source>Shorten empty lines</source>
<translation>缩减空行</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="816"/>
+ <location filename="../QScintilla/Editor.py" line="824"/>
<source>Use Monospaced Font</source>
<translation>使用单空格字体</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="821"/>
+ <location filename="../QScintilla/Editor.py" line="829"/>
<source>Autosave enabled</source>
<translation>允许自动保存</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="825"/>
+ <location filename="../QScintilla/Editor.py" line="833"/>
<source>Typing aids enabled</source>
<translation>允许输入辅助</translation>
</message>
@@ -10296,27 +10296,27 @@
<translation type="obsolete">自动完成已启用</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="864"/>
+ <location filename="../QScintilla/Editor.py" line="872"/>
<source>Close</source>
<translation>关闭</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="870"/>
+ <location filename="../QScintilla/Editor.py" line="878"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="873"/>
+ <location filename="../QScintilla/Editor.py" line="881"/>
<source>Save As...</source>
<translation>另存为…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="886"/>
+ <location filename="../QScintilla/Editor.py" line="894"/>
<source>Print Preview</source>
<translation>打印预览</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="889"/>
+ <location filename="../QScintilla/Editor.py" line="897"/>
<source>Print</source>
<translation>打印</translation>
</message>
@@ -10331,762 +10331,762 @@
<translation type="obsolete">动态</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="918"/>
+ <location filename="../QScintilla/Editor.py" line="926"/>
<source>Complete from Document</source>
<translation type="unfinished">从文档</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="920"/>
+ <location filename="../QScintilla/Editor.py" line="928"/>
<source>Complete from APIs</source>
<translation type="unfinished">从 APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="922"/>
+ <location filename="../QScintilla/Editor.py" line="930"/>
<source>Complete from Document and APIs</source>
<translation type="unfinished">从文档和 APIs</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="840"/>
+ <location filename="../QScintilla/Editor.py" line="848"/>
<source>Calltip</source>
<translation>调用提示</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="936"/>
+ <location filename="../QScintilla/Editor.py" line="944"/>
<source>Check</source>
<translation>检查</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="956"/>
- <source>Show</source>
- <translation>显示</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="958"/>
- <source>Code metrics...</source>
- <translation>代码度量…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="959"/>
- <source>Code coverage...</source>
- <translation>代码覆盖率…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="961"/>
- <source>Show code coverage annotations</source>
- <translation>显示代码覆盖率注解</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="964"/>
- <source>Hide code coverage annotations</source>
- <translation>隐藏代码覆盖率注解</translation>
+ <source>Show</source>
+ <translation>显示</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="966"/>
+ <source>Code metrics...</source>
+ <translation>代码度量…</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="967"/>
+ <source>Code coverage...</source>
+ <translation>代码覆盖率…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="969"/>
+ <source>Show code coverage annotations</source>
+ <translation>显示代码覆盖率注解</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="972"/>
+ <source>Hide code coverage annotations</source>
+ <translation>隐藏代码覆盖率注解</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="975"/>
<source>Profile data...</source>
<translation>剖析数据…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="980"/>
- <source>Diagrams</source>
- <translation>图表</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="982"/>
- <source>Class Diagram...</source>
- <translation>类图…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="984"/>
- <source>Package Diagram...</source>
- <translation>程序包图…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="986"/>
- <source>Imports Diagram...</source>
- <translation>引用图…</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="988"/>
+ <source>Diagrams</source>
+ <translation>图表</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="990"/>
+ <source>Class Diagram...</source>
+ <translation>类图…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="992"/>
+ <source>Package Diagram...</source>
+ <translation>程序包图…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="994"/>
+ <source>Imports Diagram...</source>
+ <translation>引用图…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="996"/>
<source>Application Diagram...</source>
<translation>应用程序图…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1006"/>
+ <location filename="../QScintilla/Editor.py" line="1014"/>
<source>Languages</source>
<translation>语言</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1009"/>
+ <location filename="../QScintilla/Editor.py" line="1017"/>
<source>No Language</source>
<translation>无语言</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1032"/>
+ <location filename="../QScintilla/Editor.py" line="1040"/>
<source>Guessed</source>
<translation>猜测</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1373"/>
+ <location filename="../QScintilla/Editor.py" line="1381"/>
<source>Alternatives</source>
<translation>备选</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1052"/>
+ <location filename="../QScintilla/Editor.py" line="1060"/>
<source>Encodings</source>
<translation>编码</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1093"/>
+ <location filename="../QScintilla/Editor.py" line="1101"/>
<source>End-of-Line Type</source>
<translation>行尾类型</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1097"/>
+ <location filename="../QScintilla/Editor.py" line="1105"/>
<source>Unix</source>
<translation>Unix</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1104"/>
+ <location filename="../QScintilla/Editor.py" line="1112"/>
<source>Windows</source>
<translation>Windows</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1111"/>
+ <location filename="../QScintilla/Editor.py" line="1119"/>
<source>Macintosh</source>
<translation>Macintosh</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1129"/>
+ <location filename="../QScintilla/Editor.py" line="1137"/>
<source>Export as</source>
<translation>导出为</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1255"/>
+ <location filename="../QScintilla/Editor.py" line="1263"/>
<source>Toggle bookmark</source>
<translation>切换书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1257"/>
+ <location filename="../QScintilla/Editor.py" line="1265"/>
<source>Next bookmark</source>
<translation>下一个书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1259"/>
+ <location filename="../QScintilla/Editor.py" line="1267"/>
<source>Previous bookmark</source>
<translation>上一个书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1261"/>
+ <location filename="../QScintilla/Editor.py" line="1269"/>
<source>Clear all bookmarks</source>
<translation>清除所有书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1281"/>
+ <location filename="../QScintilla/Editor.py" line="1289"/>
<source>Toggle breakpoint</source>
<translation>切换断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1283"/>
- <source>Toggle temporary breakpoint</source>
- <translation>切换临时断点</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1286"/>
- <source>Edit breakpoint...</source>
- <translation>编辑断点…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5406"/>
- <source>Enable breakpoint</source>
- <translation>允许断点</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1291"/>
+ <source>Toggle temporary breakpoint</source>
+ <translation>切换临时断点</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1294"/>
+ <source>Edit breakpoint...</source>
+ <translation>编辑断点…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5414"/>
+ <source>Enable breakpoint</source>
+ <translation>允许断点</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1299"/>
<source>Next breakpoint</source>
<translation>下一个断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1293"/>
- <source>Previous breakpoint</source>
- <translation>上一个断点</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1295"/>
- <source>Clear all breakpoints</source>
- <translation>清除所有断点</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1264"/>
- <source>Goto syntax error</source>
- <translation>转到语法错误处</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1266"/>
- <source>Show syntax error message</source>
- <translation>显示语法错误消息</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1268"/>
- <source>Clear syntax error</source>
- <translation>清除语法错误</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1298"/>
- <source>Next uncovered line</source>
- <translation>下一个未覆盖行</translation>
- </message>
- <message>
<location filename="../QScintilla/Editor.py" line="1301"/>
- <source>Previous uncovered line</source>
- <translation>上一个未覆盖行</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1304"/>
- <source>Next task</source>
- <translation>下一个任务</translation>
+ <source>Previous breakpoint</source>
+ <translation>上一个断点</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1303"/>
+ <source>Clear all breakpoints</source>
+ <translation>清除所有断点</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1272"/>
+ <source>Goto syntax error</source>
+ <translation>转到语法错误处</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1274"/>
+ <source>Show syntax error message</source>
+ <translation>显示语法错误消息</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1276"/>
+ <source>Clear syntax error</source>
+ <translation>清除语法错误</translation>
</message>
<message>
<location filename="../QScintilla/Editor.py" line="1306"/>
+ <source>Next uncovered line</source>
+ <translation>下一个未覆盖行</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1309"/>
+ <source>Previous uncovered line</source>
+ <translation>上一个未覆盖行</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1312"/>
+ <source>Next task</source>
+ <translation>下一个任务</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1314"/>
<source>Previous task</source>
<translation>上一个任务</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1318"/>
+ <location filename="../QScintilla/Editor.py" line="1326"/>
<source>LMB toggles bookmarks</source>
<translation>左键切换书签</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1322"/>
+ <location filename="../QScintilla/Editor.py" line="1330"/>
<source>LMB toggles breakpoints</source>
<translation>左键切换断点</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1358"/>
+ <location filename="../QScintilla/Editor.py" line="1366"/>
<source>Export source</source>
<translation>导出源代码</translation>
</message>
<message>
+ <location filename="../QScintilla/Editor.py" line="1366"/>
+ <source>No export format given. Aborting...</source>
+ <translation>没有给定导出格式。终止…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1397"/>
+ <source>Pygments Lexer</source>
+ <translation>Pygments 词法分析器</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1397"/>
+ <source>Select the Pygments lexer to apply.</source>
+ <translation>选择要应用的 Pygments 词法分析器。</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1873"/>
+ <source>Modification of Read Only file</source>
+ <translation>只读文件的改变</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="1873"/>
+ <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="2564"/>
+ <source>Printing...</source>
+ <translation>打印中…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="2581"/>
+ <source>Printing completed</source>
+ <translation>打印已完成</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="2583"/>
+ <source>Error while printing</source>
+ <translation>打印时出错</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="2586"/>
+ <source>Printing aborted</source>
+ <translation>打印失败</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="2944"/>
+ <source>File Modified</source>
+ <translation>文件已改变</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="3177"/>
+ <source>Save File</source>
+ <translation>保存文件</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="4610"/>
+ <source>Autocompletion</source>
+ <translation>自动完成</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="4610"/>
+ <source>Autocompletion is not available because there is no autocompletion source set.</source>
+ <translation>自动完成无效，没有设定自动完成源。</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5417"/>
+ <source>Disable breakpoint</source>
+ <translation>去除断点</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5794"/>
+ <source>Code Coverage</source>
+ <translation>代码覆盖率</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5794"/>
+ <source>Please select a coverage file</source>
+ <translation>请选择一个覆盖率文件</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5857"/>
+ <source>Show Code Coverage Annotations</source>
+ <translation>显示代码覆盖率注解</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5850"/>
+ <source>All lines have been covered.</source>
+ <translation>所有行均被已覆盖。</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5857"/>
+ <source>There is no coverage file available.</source>
+ <translation>没有有效的覆盖率文件。</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5972"/>
+ <source>Profile Data</source>
+ <translation>剖析数据</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="5972"/>
+ <source>Please select a profile file</source>
+ <translation>请选择一个剖析文件</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6132"/>
+ <source>Syntax Error</source>
+ <translation>语法错误</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6132"/>
+ <source>No syntax error message available.</source>
+ <translation>语法错误消息无效。</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6471"/>
+ <source>Macro Name</source>
+ <translation>宏名称</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6471"/>
+ <source>Select a macro name:</source>
+ <translation>选择一个宏名称：</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6499"/>
+ <source>Load macro file</source>
+ <translation>输入宏文件</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6542"/>
+ <source>Macro files (*.macro)</source>
+ <translation>宏文件 (*.macro)</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6522"/>
+ <source>Error loading macro</source>
+ <translation>载入宏文件出错</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6542"/>
+ <source>Save macro file</source>
+ <translation>保存宏文件</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6559"/>
+ <source>Save macro</source>
+ <translation>保存宏</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6575"/>
+ <source>Error saving macro</source>
+ <translation>保存宏出错</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6588"/>
+ <source>Start Macro Recording</source>
+ <translation>开始宏录制</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6588"/>
+ <source>Macro recording is already active. Start new?</source>
+ <translation>宏录制已激活。开始录制新宏？</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6614"/>
+ <source>Macro Recording</source>
+ <translation>宏录制</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6614"/>
+ <source>Enter name of the macro:</source>
+ <translation>输入宏名称：</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="6752"/>
+ <source>File changed</source>
+ <translation>文件已改变</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7056"/>
+ <source>Drop Error</source>
+ <translation>降落误差</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7077"/>
+ <source>Resources</source>
+ <translation>资源</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7079"/>
+ <source>Add file...</source>
+ <translation>添加文件…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7081"/>
+ <source>Add files...</source>
+ <translation>添加文件…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7083"/>
+ <source>Add aliased file...</source>
+ <translation>添加别名文件…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7086"/>
+ <source>Add localized resource...</source>
+ <translation>添加本地资源…</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7090"/>
+ <source>Add resource frame</source>
+ <translation>添加资源结构</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7109"/>
+ <source>Add file resource</source>
+ <translation>添加文件资源</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7125"/>
+ <source>Add file resources</source>
+ <translation>添加多个文件资源</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7153"/>
+ <source>Add aliased file resource</source>
+ <translation>添加别名文件资源</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7217"/>
+ <source>Package Diagram</source>
+ <translation>程序包图</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7217"/>
+ <source>Include class attributes?</source>
+ <translation>包含类属性？</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7237"/>
+ <source>Imports Diagram</source>
+ <translation>引用图</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7237"/>
+ <source>Include imports from external modules?</source>
+ <translation>从外部模块包含引用？</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7251"/>
+ <source>Application Diagram</source>
+ <translation>应用程序图</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7251"/>
+ <source>Include module names?</source>
+ <translation>包含模块名？</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7536"/>
+ <source>Add to dictionary</source>
+ <translation>添加到文件夹</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="7538"/>
+ <source>Ignore All</source>
+ <translation>全部忽略</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="813"/>
+ <source>Remove from dictionary</source>
+ <translation>从词典里移除</translation>
+ </message>
+ <message>
+ <location filename="../QScintilla/Editor.py" line="367"/>
+ <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="1358"/>
- <source>No export format given. Aborting...</source>
- <translation>没有给定导出格式。终止…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1389"/>
- <source>Pygments Lexer</source>
- <translation>Pygments 词法分析器</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1389"/>
- <source>Select the Pygments lexer to apply.</source>
- <translation>选择要应用的 Pygments 词法分析器。</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1865"/>
- <source>Modification of Read Only file</source>
- <translation>只读文件的改变</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="1865"/>
- <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="2556"/>
- <source>Printing...</source>
- <translation>打印中…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="2573"/>
- <source>Printing completed</source>
- <translation>打印已完成</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="2575"/>
- <source>Error while printing</source>
- <translation>打印时出错</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="2578"/>
- <source>Printing aborted</source>
- <translation>打印失败</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="2936"/>
- <source>File Modified</source>
- <translation>文件已改变</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="3169"/>
- <source>Save File</source>
- <translation>保存文件</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="4602"/>
- <source>Autocompletion</source>
- <translation>自动完成</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="4602"/>
- <source>Autocompletion is not available because there is no autocompletion source set.</source>
- <translation>自动完成无效，没有设定自动完成源。</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5409"/>
- <source>Disable breakpoint</source>
- <translation>去除断点</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5786"/>
- <source>Code Coverage</source>
- <translation>代码覆盖率</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5786"/>
- <source>Please select a coverage file</source>
- <translation>请选择一个覆盖率文件</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5849"/>
- <source>Show Code Coverage Annotations</source>
- <translation>显示代码覆盖率注解</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5842"/>
- <source>All lines have been covered.</source>
- <translation>所有行均被已覆盖。</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5849"/>
- <source>There is no coverage file available.</source>
- <translation>没有有效的覆盖率文件。</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5964"/>
- <source>Profile Data</source>
- <translation>剖析数据</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="5964"/>
- <source>Please select a profile file</source>
- <translation>请选择一个剖析文件</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
- <source>Syntax Error</source>
- <translation>语法错误</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6124"/>
- <source>No syntax error message available.</source>
- <translation>语法错误消息无效。</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6439"/>
- <source>Macro Name</source>
- <translation>宏名称</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6439"/>
- <source>Select a macro name:</source>
- <translation>选择一个宏名称：</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6467"/>
- <source>Load macro file</source>
- <translation>输入宏文件</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6510"/>
- <source>Macro files (*.macro)</source>
- <translation>宏文件 (*.macro)</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6490"/>
- <source>Error loading macro</source>
- <translation>载入宏文件出错</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6510"/>
- <source>Save macro file</source>
- <translation>保存宏文件</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6527"/>
- <source>Save macro</source>
- <translation>保存宏</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
- <source>Error saving macro</source>
- <translation>保存宏出错</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6556"/>
- <source>Start Macro Recording</source>
- <translation>开始宏录制</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6556"/>
- <source>Macro recording is already active. Start new?</source>
- <translation>宏录制已激活。开始录制新宏？</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6582"/>
- <source>Macro Recording</source>
- <translation>宏录制</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6582"/>
- <source>Enter name of the macro:</source>
- <translation>输入宏名称：</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="6720"/>
- <source>File changed</source>
- <translation>文件已改变</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7024"/>
- <source>Drop Error</source>
- <translation>降落误差</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7045"/>
- <source>Resources</source>
- <translation>资源</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7047"/>
- <source>Add file...</source>
- <translation>添加文件…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7049"/>
- <source>Add files...</source>
- <translation>添加文件…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7051"/>
- <source>Add aliased file...</source>
- <translation>添加别名文件…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7054"/>
- <source>Add localized resource...</source>
- <translation>添加本地资源…</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7058"/>
- <source>Add resource frame</source>
- <translation>添加资源结构</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7077"/>
- <source>Add file resource</source>
- <translation>添加文件资源</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7093"/>
- <source>Add file resources</source>
- <translation>添加多个文件资源</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7121"/>
- <source>Add aliased file resource</source>
- <translation>添加别名文件资源</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7185"/>
- <source>Package Diagram</source>
- <translation>程序包图</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7185"/>
- <source>Include class attributes?</source>
- <translation>包含类属性？</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7205"/>
- <source>Imports Diagram</source>
- <translation>引用图</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7205"/>
- <source>Include imports from external modules?</source>
- <translation>从外部模块包含引用？</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7219"/>
- <source>Application Diagram</source>
- <translation>应用程序图</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7219"/>
- <source>Include module names?</source>
- <translation>包含模块名？</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7504"/>
- <source>Add to dictionary</source>
- <translation>添加到文件夹</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="7506"/>
- <source>Ignore All</source>
- <translation>全部忽略</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="805"/>
- <source>Remove from dictionary</source>
- <translation>从词典里移除</translation>
- </message>
- <message>
- <location filename="../QScintilla/Editor.py" line="359"/>
- <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="1350"/>
<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="1369"/>
+ <location filename="../QScintilla/Editor.py" line="1377"/>
<source>Alternatives ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="2936"/>
+ <location filename="../QScintilla/Editor.py" line="2944"/>
<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="2996"/>
+ <location filename="../QScintilla/Editor.py" line="3004"/>
<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="3110"/>
+ <location filename="../QScintilla/Editor.py" line="3118"/>
<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="6481"/>
+ <location filename="../QScintilla/Editor.py" line="6513"/>
<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="6490"/>
+ <location filename="../QScintilla/Editor.py" line="6522"/>
<source><p>The macro file <b>{0}</b> is corrupt.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6543"/>
+ <location filename="../QScintilla/Editor.py" line="6575"/>
<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="6884"/>
+ <location filename="../QScintilla/Editor.py" line="6916"/>
<source>{0} (ro)</source>
<translation>{0}（只读）</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7024"/>
+ <location filename="../QScintilla/Editor.py" line="7056"/>
<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="7121"/>
+ <location filename="../QScintilla/Editor.py" line="7153"/>
<source>Alias for file <b>{0}</b>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1271"/>
+ <location filename="../QScintilla/Editor.py" line="1279"/>
<source>Next warning</source>
<translation>下一个警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1274"/>
+ <location filename="../QScintilla/Editor.py" line="1282"/>
<source>Previous warning</source>
<translation>上一个警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1276"/>
+ <location filename="../QScintilla/Editor.py" line="1284"/>
<source>Show warning message</source>
<translation>显示警告信息</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1278"/>
+ <location filename="../QScintilla/Editor.py" line="1286"/>
<source>Clear warnings</source>
<translation>清空警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="3169"/>
+ <location filename="../QScintilla/Editor.py" line="3177"/>
<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="6527"/>
+ <location filename="../QScintilla/Editor.py" line="6559"/>
<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="6378"/>
+ <location filename="../QScintilla/Editor.py" line="6410"/>
<source>Warning: {0}</source>
<translation>警告：{0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6385"/>
+ <location filename="../QScintilla/Editor.py" line="6417"/>
<source>Error: {0}</source>
<translation>错误：{0}</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6716"/>
+ <location filename="../QScintilla/Editor.py" line="6748"/>
<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="882"/>
+ <location filename="../QScintilla/Editor.py" line="890"/>
<source>Open 'rejection' file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="992"/>
+ <location filename="../QScintilla/Editor.py" line="1000"/>
<source>Load Diagram...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1309"/>
+ <location filename="../QScintilla/Editor.py" line="1317"/>
<source>Next change</source>
<translation>下一个更改</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1312"/>
+ <location filename="../QScintilla/Editor.py" line="1320"/>
<source>Previous change</source>
<translation>上一个更改</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7918"/>
+ <location filename="../QScintilla/Editor.py" line="7950"/>
<source>Sort Lines</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="7918"/>
+ <location filename="../QScintilla/Editor.py" line="7950"/>
<source>The selection contains illegal data for a numerical sort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6314"/>
+ <location filename="../QScintilla/Editor.py" line="6346"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6314"/>
+ <location filename="../QScintilla/Editor.py" line="6346"/>
<source>No warning messages available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6375"/>
+ <location filename="../QScintilla/Editor.py" line="6407"/>
<source>Style: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="856"/>
+ <location filename="../QScintilla/Editor.py" line="864"/>
<source>New Document View</source>
<translation>新建文档视图</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="859"/>
+ <location filename="../QScintilla/Editor.py" line="867"/>
<source>New Document View (with new split)</source>
<translation>新建文档视图（在新拆分页中）</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="946"/>
+ <location filename="../QScintilla/Editor.py" line="954"/>
<source>Tools</source>
<translation>工具</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1074"/>
+ <location filename="../QScintilla/Editor.py" line="1082"/>
<source>Re-Open With Encoding</source>
<translation>使用指定编码重新打开</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="6710"/>
+ <location filename="../QScintilla/Editor.py" line="6742"/>
<source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="832"/>
+ <location filename="../QScintilla/Editor.py" line="840"/>
<source>Automatic Completion enabled</source>
<translation>允许自动补全</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="912"/>
+ <location filename="../QScintilla/Editor.py" line="920"/>
<source>Complete</source>
<translation>补全</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4727"/>
+ <location filename="../QScintilla/Editor.py" line="4735"/>
<source>Auto-Completion Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4727"/>
+ <location filename="../QScintilla/Editor.py" line="4735"/>
<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="4989"/>
+ <location filename="../QScintilla/Editor.py" line="4997"/>
<source>Call-Tips Provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="4989"/>
+ <location filename="../QScintilla/Editor.py" line="4997"/>
<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="8005"/>
+ <location filename="../QScintilla/Editor.py" line="8037"/>
<source>Register Mouse Click Handler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8005"/>
+ <location filename="../QScintilla/Editor.py" line="8037"/>
<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="876"/>
+ <location filename="../QScintilla/Editor.py" line="884"/>
<source>Save Copy...</source>
<translation type="unfinished">保存副本…</translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="915"/>
+ <location filename="../QScintilla/Editor.py" line="923"/>
<source>Clear Completions Cache</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="842"/>
+ <location filename="../QScintilla/Editor.py" line="850"/>
<source>Code Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="1315"/>
+ <location filename="../QScintilla/Editor.py" line="1323"/>
<source>Clear changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="767"/>
+ <location filename="../QScintilla/Editor.py" line="775"/>
<source>Execute Selection In Console</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8126"/>
+ <location filename="../QScintilla/Editor.py" line="8158"/>
<source>EditorConfig Properties</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Editor.py" line="8126"/>
+ <location filename="../QScintilla/Editor.py" line="8158"/>
<source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -14055,7 +14055,7 @@
<translation>改变背景颜色</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1860"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1883"/>
<source>Various</source>
<translation>其它</translation>
</message>
@@ -14070,12 +14070,12 @@
<translation>显示空格</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1866"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1889"/>
<source>Select to show a minimalistic context menu</source>
<translation>选择显示简化的上下文菜单</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1869"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1892"/>
<source>Show minimal context menu</source>
<translation>显示最简上下文菜单</translation>
</message>
@@ -14460,12 +14460,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/>
<source>Background:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1870"/>
<source>Select the background colour for the marker map</source>
<translation type="unfinished"></translation>
</message>
@@ -14515,12 +14515,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1876"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/>
<source>Select to hide the Format Buttons bar when formatting is not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1879"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/>
<source>Hide Format Buttons bar when not supported</source>
<translation type="unfinished"></translation>
</message>
@@ -14534,6 +14534,16 @@
<source>Use background colours</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/>
+ <source>Conflict Marker Line:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1847"/>
+ <source>Select the colour for the conflict marker line marker</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>EditorSyntaxPage</name>
@@ -50126,27 +50136,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1650"/>
+ <location filename="../Preferences/__init__.py" line="1651"/>
<source>Export Preferences</source>
<translation>导出首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1678"/>
+ <location filename="../Preferences/__init__.py" line="1679"/>
<source>Import Preferences</source>
<translation>导入首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1678"/>
+ <location filename="../Preferences/__init__.py" line="1679"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>属性文件 (*.ini);;所有文件 (*)</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1780"/>
+ <location filename="../Preferences/__init__.py" line="1781"/>
<source>Select Python{0} Interpreter</source>
<translation>选择 Python{0} 解释器</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1780"/>
+ <location filename="../Preferences/__init__.py" line="1781"/>
<source>Select the Python{0} interpreter to be used:</source>
<translation>选择要使用的 Python{0} 解释器：</translation>
</message>
