--- a/eric6/i18n/eric6_zh_CN.ts Mon Mar 09 20:21:38 2020 +0100
+++ b/eric6/i18n/eric6_zh_CN.ts Tue Mar 10 19:32:25 2020 +0100
@@ -52836,17 +52836,17 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1622"/>
+ <location filename="../Preferences/__init__.py" line="1624"/>
<source>Export Preferences</source>
<translation>导出首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1650"/>
+ <location filename="../Preferences/__init__.py" line="1652"/>
<source>Import Preferences</source>
<translation>导入首选项</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1650"/>
+ <location filename="../Preferences/__init__.py" line="1652"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>属性文件 (*.ini);;所有文件 (*)</translation>
</message>
@@ -54900,7 +54900,7 @@
<context>
<name>ProjectFormsBrowser</name>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1021"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="1029"/>
<source>Forms</source>
<translation>窗体</translation>
</message>
@@ -55040,72 +55040,72 @@
<translation>编译窗体</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="630"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="637"/>
<source>New Form</source>
<translation>新建窗体</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="585"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="592"/>
<source>Select a form type:</source>
<translation>选择窗体类型：</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="599"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="606"/>
<source>Qt User-Interface Files (*.ui);;All Files (*)</source>
<translation>Qt 用户界面文件 (*.ui);;所有文件 (*)</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="618"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="625"/>
<source>The file already exists! Overwrite it?</source>
<translation>文件已存在！是否覆盖？</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="658"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="665"/>
<source>Delete forms</source>
<translation>删除窗体</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="658"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="665"/>
<source>Do you really want to delete these forms from the project?</source>
<translation>确定要从项目中删除这些窗体？</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="812"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="819"/>
<source>Form Compilation</source>
<translation>窗体编译</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="784"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="791"/>
<source>The compilation of the form file was successful.</source>
<translation>窗体文件编译成功。</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="812"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="819"/>
<source>The compilation of the form file failed.</source>
<translation>窗体文件编译失败。</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="886"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="894"/>
<source>Process Generation Error</source>
<translation>进程生成错误</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="978"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="986"/>
<source>Compiling forms...</source>
<translation>正在编译窗体…</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1017"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="1025"/>
<source>Abort</source>
<translation>终止</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1017"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="1025"/>
<source>Determining changed forms...</source>
<translation>正在确定更改的窗体…</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1049"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="1057"/>
<source>Compiling changed forms...</source>
<translation>正在编译更改的窗体…</translation>
</message>
@@ -55115,17 +55115,17 @@
<translation>将路径复制到剪贴板</translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="630"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="637"/>
<source><p>The new form file <b>{0}</b> could not be created.<br>Problem: {1}</p></source>
<translation><p>新窗体文件 <b>{0}</b> 无法创建。<br>原因：{1}</p></translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="799"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="806"/>
<source><p>The compilation of the form file failed.</p><p>Reason: {0}</p></source>
<translation><p>窗体文件编译失败。</p><p>原因：{0}</p></translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="886"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="894"/>
<source>Could not start {0}.<br>Ensure that it is in the search path.</source>
<translation type="unfinished">无法启动 {0}。请保证它处在搜索路径中。</translation>
</message>
@@ -55180,20 +55180,15 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1017"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="1025"/>
<source>%v/%m Forms</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1102"/>
+ <location filename="../Project/ProjectFormsBrowser.py" line="352"/>
<source>Configure uic Compiler</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../Project/ProjectFormsBrowser.py" line="1102"/>
- <source>No project specific uic compiler flags are supported for PySide or PySide2.</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>ProjectInterfacesBrowser</name>
@@ -55825,7 +55820,7 @@
<context>
<name>ProjectResourcesBrowser</name>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="902"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="896"/>
<source>Resources</source>
<translation>资源</translation>
</message>
@@ -55940,27 +55935,27 @@
<translation>资源文件编译失败。</translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="757"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="751"/>
<source>Process Generation Error</source>
<translation>进程生成错误</translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="823"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="817"/>
<source>Compiling resources...</source>
<translation>正在编译资源…</translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="898"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="892"/>
<source>Abort</source>
<translation>终止</translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="898"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="892"/>
<source>Determining changed resources...</source>
<translation>正在确认改变的资源…</translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="936"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="930"/>
<source>Compiling changed resources...</source>
<translation>正在编译改变的资源…</translation>
</message>
@@ -55980,12 +55975,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="757"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="751"/>
<source>Could not start {0}.<br>Ensure that it is in the search path.</source>
<translation>无法启动 {0}。请保证它处在搜索路径中。</translation>
</message>
<message>
- <location filename="../Project/ProjectResourcesBrowser.py" line="898"/>
+ <location filename="../Project/ProjectResourcesBrowser.py" line="892"/>
<source>%v/%m Resources</source>
<translation type="unfinished"></translation>
</message>
@@ -61962,42 +61957,42 @@
<translation><b>配置 Qt</b></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/>
<source>Qt Tools</source>
<translation>Qt 工具</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="163"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/>
<source>This gives an example of the complete tool name</source>
<translation>这里给出了完整工具名称的一个范例</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="166"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/>
<source>designer</source>
<translation>设计师</translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="49"/>
+ <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source>
+ <translation><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/>
+ <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationPages/QtPage.ui" line="43"/>
- <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source>
- <translation><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="117"/>
- <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="37"/>
<source>Qt Translations Directory</source>
<translation>Qt 翻译文件夹</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="59"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="65"/>
<source>Enter the path of the Qt translations directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="66"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/>
<source><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are
<ul>
<li>QT4TRANSLATIONSDIR for Qt4</li>
@@ -62007,80 +62002,105 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="129"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/>
<source>Qt-Prefix:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="136"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/>
<source>Enter the prefix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="143"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/>
<source>Qt-Postfix:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="150"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/>
<source>Enter the postfix for the Qt tools name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/>
<source>pyuic / pyside-uic Options</source>
- <translation>pyuic / pyside-uic 选项</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/>
+ <translation type="obsolete">pyuic / pyside-uic 选项</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/>
<source>Indent Width:</source>
<translation>缩进宽度：</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/>
<source>Select the indent width (default: 4)</source>
<translation>缩进宽度（默认值：4）</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/>
<source>Generate imports relative to '.'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/>
<source>Tools Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="108"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/>
<source>Enter the path of the Qt tools directory, if they are not found.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="178"/>
- <source>PyQt Tools</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="200"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/>
<source>Enter the path of the PyQt tools directory, if they are not found.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.py" line="87"/>
<source>Sample: {0}designer{1}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/>
- <source>PySide2 Tools</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/>
<source>Enter the path of the PySide2 tools directory, if they are not found.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="37"/>
+ <source>Qt</source>
+ <translation type="unfinished">Qt</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/>
+ <source>PyQt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/>
+ <source>pyuic Options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/>
+ <source>Select to generate extra code to test and display the form</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/>
+ <source>Generate Extra Test Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/>
+ <source>PySide2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/>
+ <source>pyside2-uic Options</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Queues</name>
@@ -90204,12 +90224,12 @@
<context>
<name>eric6</name>
<message>
- <location filename="../eric6.py" line="390"/>
+ <location filename="../eric6.py" line="391"/>
<source>Starting...</source>
<translation>正在启动…</translation>
</message>
<message>
- <location filename="../eric6.py" line="395"/>
+ <location filename="../eric6.py" line="396"/>
<source>Generating Main Window...</source>
<translation>正在产生主窗口…</translation>
</message>
