--- a/eric6/i18n/eric6_zh_CN.ts Thu Oct 01 17:34:48 2020 +0200 +++ b/eric6/i18n/eric6_zh_CN.ts Thu Oct 01 17:39:16 2020 +0200 @@ -11227,7 +11227,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <source>Open File</source> <translation>打开文件</translation> </message> @@ -11312,7 +11312,7 @@ <translation>全部取消选择</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7832"/> + <location filename="../QScintilla/Editor.py" line="7835"/> <source>Check spelling...</source> <translation>正在进行拼写检查…</translation> </message> @@ -11532,7 +11532,7 @@ <translation>编辑断点…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5602"/> + <location filename="../QScintilla/Editor.py" line="5605"/> <source>Enable breakpoint</source> <translation>允许断点</translation> </message> @@ -11607,257 +11607,257 @@ <translation>选择要应用的 Pygments 词法分析器。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <source>Modification of Read Only file</source> <translation>只读文件的改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1947"/> + <location filename="../QScintilla/Editor.py" line="1950"/> <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="2657"/> + <location filename="../QScintilla/Editor.py" line="2660"/> <source>Printing...</source> <translation>打印中…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2674"/> + <location filename="../QScintilla/Editor.py" line="2677"/> <source>Printing completed</source> <translation>打印已完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2676"/> - <source>Error while printing</source> - <translation>打印时出错</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2679"/> + <source>Error while printing</source> + <translation>打印时出错</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2682"/> <source>Printing aborted</source> <translation>打印失败</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <source>File Modified</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <source>Save File</source> <translation>保存文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4764"/> + <location filename="../QScintilla/Editor.py" line="4767"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>自动完成无效,没有设定自动完成源。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5605"/> + <location filename="../QScintilla/Editor.py" line="5608"/> <source>Disable breakpoint</source> <translation>去除断点</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5980"/> + <location filename="../QScintilla/Editor.py" line="5983"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>Show Code Coverage Annotations</source> <translation>显示代码覆盖率注解</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6036"/> + <location filename="../QScintilla/Editor.py" line="6039"/> <source>All lines have been covered.</source> <translation>所有行均被已覆盖。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6043"/> + <location filename="../QScintilla/Editor.py" line="6046"/> <source>There is no coverage file available.</source> <translation>没有有效的覆盖率文件。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6160"/> + <location filename="../QScintilla/Editor.py" line="6163"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>Syntax Error</source> <translation>语法错误</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6322"/> + <location filename="../QScintilla/Editor.py" line="6325"/> <source>No syntax error message available.</source> <translation>语法错误消息无效。</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Macro Name</source> <translation>宏名称</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6711"/> + <location filename="../QScintilla/Editor.py" line="6714"/> <source>Select a macro name:</source> <translation>选择一个宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6739"/> + <location filename="../QScintilla/Editor.py" line="6742"/> <source>Load macro file</source> <translation>输入宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Macro files (*.macro)</source> <translation>宏文件 (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source>Error loading macro</source> <translation>载入宏文件出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6782"/> + <location filename="../QScintilla/Editor.py" line="6785"/> <source>Save macro file</source> <translation>保存宏文件</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <source>Save macro</source> <translation>保存宏</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <source>Error saving macro</source> <translation>保存宏出错</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Start Macro Recording</source> <translation>开始宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6828"/> + <location filename="../QScintilla/Editor.py" line="6831"/> <source>Macro recording is already active. Start new?</source> <translation>宏录制已激活。开始录制新宏?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Macro Recording</source> <translation>宏录制</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6854"/> + <location filename="../QScintilla/Editor.py" line="6857"/> <source>Enter name of the macro:</source> <translation>输入宏名称:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6994"/> + <location filename="../QScintilla/Editor.py" line="6997"/> <source>File changed</source> <translation>文件已改变</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7326"/> + <location filename="../QScintilla/Editor.py" line="7329"/> <source>Resources</source> <translation>资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7328"/> + <location filename="../QScintilla/Editor.py" line="7331"/> <source>Add file...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7330"/> + <location filename="../QScintilla/Editor.py" line="7333"/> <source>Add files...</source> <translation>添加文件…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7332"/> - <source>Add aliased file...</source> - <translation>添加别名文件…</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7335"/> + <source>Add aliased file...</source> + <translation>添加别名文件…</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7338"/> <source>Add localized resource...</source> <translation>添加本地资源…</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7339"/> + <location filename="../QScintilla/Editor.py" line="7342"/> <source>Add resource frame</source> <translation>添加资源结构</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7358"/> + <location filename="../QScintilla/Editor.py" line="7361"/> <source>Add file resource</source> <translation>添加文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7374"/> + <location filename="../QScintilla/Editor.py" line="7377"/> <source>Add file resources</source> <translation>添加多个文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Add aliased file resource</source> <translation>添加别名文件资源</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Package Diagram</source> <translation>程序包图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7467"/> + <location filename="../QScintilla/Editor.py" line="7470"/> <source>Include class attributes?</source> <translation>包含类属性?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Imports Diagram</source> <translation>引用图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7492"/> <source>Include imports from external modules?</source> <translation>从外部模块包含引用?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7503"/> + <location filename="../QScintilla/Editor.py" line="7506"/> <source>Include module names?</source> <translation>包含模块名?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7835"/> + <location filename="../QScintilla/Editor.py" line="7838"/> <source>Add to dictionary</source> <translation>添加到文件夹</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7837"/> + <location filename="../QScintilla/Editor.py" line="7840"/> <source>Ignore All</source> <translation>全部忽略</translation> </message> @@ -11882,47 +11882,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3034"/> + <location filename="../QScintilla/Editor.py" line="3037"/> <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="3094"/> + <location filename="../QScintilla/Editor.py" line="3097"/> <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="3220"/> + <location filename="../QScintilla/Editor.py" line="3223"/> <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="6753"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <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="6762"/> + <location filename="../QScintilla/Editor.py" line="6765"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6815"/> + <location filename="../QScintilla/Editor.py" line="6818"/> <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="7164"/> + <location filename="../QScintilla/Editor.py" line="7167"/> <source>{0} (ro)</source> <translation>{0}(只读)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7305"/> + <location filename="../QScintilla/Editor.py" line="7308"/> <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="7401"/> + <location filename="../QScintilla/Editor.py" line="7404"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> @@ -11947,27 +11947,27 @@ <translation>清空警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3283"/> + <location filename="../QScintilla/Editor.py" line="3286"/> <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="6799"/> + <location filename="../QScintilla/Editor.py" line="6802"/> <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="6599"/> + <location filename="../QScintilla/Editor.py" line="6602"/> <source>Warning: {0}</source> <translation>警告:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6606"/> + <location filename="../QScintilla/Editor.py" line="6609"/> <source>Error: {0}</source> <translation>错误:{0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6990"/> + <location filename="../QScintilla/Editor.py" line="6993"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>警告:</b>您在重新打开时将丢失所有更改。</translation> </message> @@ -11992,27 +11992,27 @@ <translation>上一个更改</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8253"/> + <location filename="../QScintilla/Editor.py" line="8256"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>Warning</source> <translation>警告</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6534"/> + <location filename="../QScintilla/Editor.py" line="6537"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6596"/> + <location filename="../QScintilla/Editor.py" line="6599"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -12037,7 +12037,7 @@ <translation>使用指定编码重新打开</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6984"/> + <location filename="../QScintilla/Editor.py" line="6987"/> <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> @@ -12052,32 +12052,32 @@ <translation>补全</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4894"/> + <location filename="../QScintilla/Editor.py" line="4897"/> <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="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5173"/> + <location filename="../QScintilla/Editor.py" line="5176"/> <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="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8342"/> + <location filename="../QScintilla/Editor.py" line="8345"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -12107,12 +12107,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8463"/> + <location filename="../QScintilla/Editor.py" line="8466"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13570,12 +13570,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Tab and Indent Override</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="217"/> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="213"/> <source>Shall the selected entries really be removed?</source> <translation type="unfinished"></translation> </message> @@ -14064,28 +14064,53 @@ <message> <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> <source>Language:</source> - <translation type="unfinished">语言:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="40"/> + <translation type="obsolete">语言:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="57"/> <source>Tab Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="47"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="64"/> <source>Enter the tab width</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="93"/> <source>Indentation width:</source> <translation type="unfinished">缩进宽度:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="83"/> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="100"/> <source>Enter the indentation width</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="23"/> + <source>Lexer Language:</source> + <translation type="unfinished">词法分析器语言:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="36"/> + <source>Select the lexer language to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="43"/> + <source>Alternative Lexer:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui" line="50"/> + <source>Select the alternative lexer to override</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py" line="51"/> + <source>Alternative</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorMarkerMap</name> @@ -49038,12 +49063,12 @@ <translation><b>保存副本</b>保存当前编辑器窗口内容的一个副本。文件可以在文件选择对话框中输入。</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3487"/> + <location filename="../QScintilla/MiniEditor.py" line="3490"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -91861,12 +91886,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="397"/> + <location filename="../eric6.py" line="398"/> <source>Starting...</source> <translation>正在启动…</translation> </message> <message> - <location filename="../eric6.py" line="402"/> + <location filename="../eric6.py" line="403"/> <source>Generating Main Window...</source> <translation>正在产生主窗口…</translation> </message>