--- a/i18n/eric6_zh_CN.ts Sat Jun 30 14:01:25 2018 +0200
+++ b/i18n/eric6_zh_CN.ts Sat Jun 30 14:09:32 2018 +0200
@@ -7205,7 +7205,7 @@
<translation type="obsolete">选择调试客户的解释器</translation>
</message>
<message>
- <location filename="../Project/DebuggerPropertiesDialog.py" line="134"/>
+ <location filename="../Project/DebuggerPropertiesDialog.py" line="133"/>
<source>All Files (*)</source>
<translation>所有文件 (*)</translation>
</message>
@@ -7236,6 +7236,109 @@
</message>
</context>
<context>
+ <name>DebuggerPython2Page</name>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="17"/>
+ <source><b>Configure Python2 Debugger</b></source>
+ <translation type="unfinished"><b>配置 Python 调试器</b></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="37"/>
+ <source>Python2 Virtual Environment</source>
+ <translation type="unfinished">调试客户的 Python 解释器</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="43"/>
+ <source>Select the virtual environment to be used</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="50"/>
+ <source>Press to open the virtual environment manager dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="63"/>
+ <source>Debug Client Type</source>
+ <translation type="unfinished">调试客户类型</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="75"/>
+ <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source>
+ <translation type="unfinished">输入要使用的调试客户路径。为空时使用默认设置。</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="82"/>
+ <source>Select the standard debug client</source>
+ <translation type="unfinished">选择多线程调试客户</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="85"/>
+ <source>Standard</source>
+ <translation type="unfinished">标准</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="92"/>
+ <source>Select the custom selected debug client</source>
+ <translation type="unfinished">选择自定义选择的调试客户</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="95"/>
+ <source>Custom</source>
+ <translation type="unfinished">自定义</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="105"/>
+ <source>Source association</source>
+ <translation type="unfinished">源代码关联</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="111"/>
+ <source>Please configure the associated file extensions on the 'Python' page.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="143"/>
+ <source>Press to update the display of the source associations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="146"/>
+ <source>Refresh</source>
+ <translation type="unfinished">刷新</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="171"/>
+ <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source>
+ <translation type="unfinished">选择对在 Eric4 IDE 中调试的程序的 stdin 、stdout 和 stderr 进行重定向 {5 ?} {6 ?}</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="174"/>
+ <source>Redirect stdin/stdout/stderr</source>
+ <translation type="unfinished">重定向 stdin/stdout/stderr</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="181"/>
+ <source>Select to not set the debug client encoding</source>
+ <translation type="unfinished">选择不设定调试客户编码</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="184"/>
+ <source>Don't set the encoding of the debug client</source>
+ <translation type="unfinished">不要设定调试客户的编码</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.py" line="45"/>
+ <source>Press to select the Debug Client via a file selection dialog</source>
+ <translation type="unfinished">点击以通过选择对话框选择调试客户</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.py" line="47"/>
+ <source>Python Files (*.py *.py2)</source>
+ <translation type="unfinished">Python 文件 (*.py *.py3) {2)?}</translation>
+ </message>
+</context>
+<context>
<name>DebuggerPython3Page</name>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="17"/>
@@ -7245,40 +7348,40 @@
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="37"/>
<source>Python3 Virtual Environment</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="53"/>
+ <translation type="unfinished">调试客户的 Python 解释器 {3 ?}</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="63"/>
<source>Debug Client Type</source>
<translation type="unfinished">调试客户类型</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="65"/>
- <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source>
- <translation type="unfinished">输入要使用的调试客户路径。为空时使用默认设置。</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="42"/>
- <source>Press to select the Debug Client via a file selection dialog</source>
- <translation type="unfinished">点击以通过选择对话框选择调试客户</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="72"/>
- <source>Select the standard debug client</source>
- <translation type="unfinished">选择多线程调试客户</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="75"/>
- <source>Standard</source>
- <translation>标准</translation>
+ <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source>
+ <translation type="unfinished">输入要使用的调试客户路径。为空时使用默认设置。</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="45"/>
+ <source>Press to select the Debug Client via a file selection dialog</source>
+ <translation type="unfinished">点击以通过选择对话框选择调试客户</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="82"/>
- <source>Select the custom selected debug client</source>
- <translation type="unfinished">选择自定义选择的调试客户</translation>
+ <source>Select the standard debug client</source>
+ <translation type="unfinished">选择多线程调试客户</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="85"/>
+ <source>Standard</source>
+ <translation>标准</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="92"/>
+ <source>Select the custom selected debug client</source>
+ <translation type="unfinished">选择自定义选择的调试客户</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="95"/>
<source>Custom</source>
<translation>自定义</translation>
</message>
@@ -7288,27 +7391,22 @@
<translation type="obsolete">多线程</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="95"/>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="105"/>
<source>Source association</source>
<translation type="unfinished">源代码关联</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="101"/>
- <source>Enter the file extensions to be associated with the Python3 debugger separated by a space. They must not overlap with the ones for Python2.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="120"/>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="174"/>
<source>Redirect stdin/stdout/stderr</source>
<translation type="unfinished">重定向 stdin/stdout/stderr</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="127"/>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="181"/>
<source>Select to not set the debug client encoding</source>
<translation type="unfinished">选择不设定调试客户编码</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="130"/>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="184"/>
<source>Don't set the encoding of the debug client</source>
<translation type="unfinished">不要设定调试客户的编码</translation>
</message>
@@ -7323,12 +7421,12 @@
<translation type="obsolete">选择调试客户</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="44"/>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="47"/>
<source>Python Files (*.py *.py3)</source>
<translation>Python 文件 (*.py *.py3)</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="117"/>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="171"/>
<source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source>
<translation type="unfinished">选择对在 Eric4 IDE 中调试的程序的 stdin 、stdout 和 stderr 进行重定向 {5 ?} {6 ?}</translation>
</message>
@@ -7337,18 +7435,38 @@
<source>Select the virtual environment to be used</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="50"/>
+ <source>Press to open the virtual environment manager dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="111"/>
+ <source>Please configure the associated file extensions on the 'Python' page.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="143"/>
+ <source>Press to update the display of the source associations</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="146"/>
+ <source>Refresh</source>
+ <translation type="unfinished">刷新</translation>
+ </message>
</context>
<context>
<name>DebuggerPythonPage</name>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="17"/>
<source><b>Configure Python2 Debugger</b></source>
- <translation type="unfinished"><b>配置 Python 调试器</b></translation>
+ <translation type="obsolete"><b>配置 Python 调试器</b></translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="37"/>
<source>Python2 Virtual Environment</source>
- <translation type="unfinished">调试客户的 Python 解释器</translation>
+ <translation type="obsolete">调试客户的 Python 解释器</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="33"/>
@@ -7358,37 +7476,37 @@
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="53"/>
<source>Debug Client Type</source>
- <translation>调试客户类型</translation>
+ <translation type="obsolete">调试客户类型</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="65"/>
<source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source>
- <translation>输入要使用的调试客户路径。为空时使用默认设置。</translation>
+ <translation type="obsolete">输入要使用的调试客户路径。为空时使用默认设置。</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="42"/>
<source>Press to select the Debug Client via a file selection dialog</source>
- <translation>点击以通过选择对话框选择调试客户</translation>
+ <translation type="obsolete">点击以通过选择对话框选择调试客户</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="72"/>
<source>Select the standard debug client</source>
- <translation type="unfinished">选择多线程调试客户</translation>
+ <translation type="obsolete">选择多线程调试客户</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/>
<source>Standard</source>
- <translation>标准</translation>
+ <translation type="obsolete">标准</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="82"/>
<source>Select the custom selected debug client</source>
- <translation>选择自定义选择的调试客户</translation>
+ <translation type="obsolete">选择自定义选择的调试客户</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="85"/>
<source>Custom</source>
- <translation>自定义</translation>
+ <translation type="obsolete">自定义</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/>
@@ -7398,17 +7516,17 @@
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="120"/>
<source>Redirect stdin/stdout/stderr</source>
- <translation>重定向 stdin/stdout/stderr</translation>
+ <translation type="obsolete">重定向 stdin/stdout/stderr</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="127"/>
<source>Select to not set the debug client encoding</source>
- <translation>选择不设定调试客户编码</translation>
+ <translation type="obsolete">选择不设定调试客户编码</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/>
<source>Don't set the encoding of the debug client</source>
- <translation>不要设定调试客户的编码</translation>
+ <translation type="obsolete">不要设定调试客户的编码</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="94"/>
@@ -7423,27 +7541,17 @@
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="95"/>
<source>Source association</source>
- <translation type="unfinished">源代码关联</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="101"/>
- <source>Enter the file extensions to be associated with the Python2 debugger separated by a space. They must not overlap with the ones for Python3.</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">源代码关联</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="44"/>
<source>Python Files (*.py *.py2)</source>
- <translation type="unfinished">Python 文件 (*.py *.py3) {2)?}</translation>
+ <translation type="obsolete">Python 文件 (*.py *.py3) {2)?}</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="117"/>
<source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</source>
- <translation type="unfinished">选择对在 Eric4 IDE 中调试的程序的 stdin 、stdout 和 stderr 进行重定向 {5 ?} {6 ?}</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="43"/>
- <source>Select the virtual environment to be used</source>
- <translation type="unfinished"></translation>
+ <translation type="obsolete">选择对在 Eric4 IDE 中调试的程序的 stdin 、stdout 和 stderr 进行重定向 {5 ?} {6 ?}</translation>
</message>
</context>
<context>
@@ -26549,22 +26657,22 @@
<translation>使用安全（https）连接</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="78"/>
+ <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="76"/>
<source>Checking validity of the service key...</source>
<translation>正在检查服务密钥的有效性…</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="96"/>
+ <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="94"/>
<source>The service key is valid.</source>
<translation>服务密钥有效。</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="100"/>
+ <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="98"/>
<source><font color="#FF0000">The service key is not valid.</font></source>
<translation><font color="#FF0000">服务密钥无效。</font></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="104"/>
+ <location filename="../Preferences/ConfigurationPages/HelpVirusTotalPage.py" line="102"/>
<source><font color="#FF0000"><b>Error:</b> {0}</font></source>
<translation><font color="#FF0000"><b>错误：</b>{0}</font></translation>
</message>
@@ -45260,12 +45368,12 @@
<translation>恢复默认</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="62"/>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="60"/>
<source>Reset Mime Types</source>
<translation>重置 MIME 类型</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="62"/>
+ <location filename="../Preferences/ConfigurationPages/MimeTypesPage.py" line="60"/>
<source>Do you really want to reset the configured list of mime types?</source>
<translation>确认要重置已配置的 MIME 类型列表吗？</translation>
</message>
@@ -56466,24 +56574,39 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="102"/>
+ <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="147"/>
<source>Python 2:</source>
<translation>Python 2：</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="112"/>
+ <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="161"/>
<source>Python 3:</source>
<translation>Python 3：</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="125"/>
- <source>Python 2 Interpreter</source>
- <translation>Python 2 解释器</translation>
+ <source>Python Environments</source>
+ <translation type="unfinished">Python 2 解释器</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="131"/>
- <source>Please configure the Python 2 interpreter on the 'Python 2 Debugger' page.</source>
- <translation>请在“Python 2 调试器”页面配置 Python 2 解释器。</translation>
+ <source>Please configure the Python environments on the 'Python2 Debugger' page and the 'Python3 Debugger' page.</source>
+ <translation type="unfinished">请在“Python 2 调试器”页面配置 Python 2 解释器。</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="141"/>
+ <source>Currently selected environments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="193"/>
+ <source>Press to update the display of the currently selected environments</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="196"/>
+ <source>Refresh</source>
+ <translation type="unfinished">刷新</translation>
</message>
</context>
<context>
@@ -62473,7 +62596,7 @@
<translation>No.</translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2044"/>
+ <location filename="../QScintilla/Shell.py" line="2045"/>
<source>Drop Error</source>
<translation>降落误差</translation>
</message>
@@ -62504,7 +62627,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2044"/>
+ <location filename="../QScintilla/Shell.py" line="2045"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"><p><b>{0}</b> 不是一个文件。</p></translation>
</message>
@@ -84636,22 +84759,22 @@
<context>
<name>WebBrowserVirusTotalPage</name>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="78"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="76"/>
<source>Checking validity of the service key...</source>
<translation type="unfinished">正在检查服务密钥的有效性…</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="96"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="94"/>
<source>The service key is valid.</source>
<translation type="unfinished">服务密钥有效。</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="100"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="98"/>
<source><font color="#FF0000">The service key is not valid.</font></source>
<translation type="unfinished"><font color="#FF0000">服务密钥无效。</font></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="104"/>
+ <location filename="../Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py" line="102"/>
<source><font color="#FF0000"><b>Error:</b> {0}</font></source>
<translation type="unfinished"><font color="#FF0000"><b>错误：</b>{0}</font></translation>
</message>
