--- a/i18n/eric6_empty.ts Sat Jun 30 14:01:25 2018 +0200 +++ b/i18n/eric6_empty.ts Sat Jun 30 14:09:32 2018 +0200 @@ -6864,7 +6864,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="134"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="133"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -6885,6 +6885,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"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="37"/> + <source>Python2 Virtual Environment</source> + <translation type="unfinished"></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"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython2Page.ui" line="174"/> + <source>Redirect stdin/stdout/stderr</source> + <translation type="unfinished"></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"></translation> + </message> +</context> +<context> <name>DebuggerPython3Page</name> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="17"/> @@ -6897,72 +7000,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="53"/> + <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="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 type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="82"/> - <source>Select the custom selected debug client</source> + <source>Select the standard debug client</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="85"/> - <source>Custom</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> + <source>Standard</source> + <translation type="unfinished"></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 type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.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/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="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"></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"></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> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="42"/> + <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.py" line="44"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="47"/> <source>Python Files (*.py *.py3)</source> <translation type="unfinished"></translation> </message> @@ -6971,94 +7069,29 @@ <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"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="37"/> - <source>Python2 Virtual Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="53"/> - <source>Debug Client Type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="72"/> - <source>Select the standard debug client</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="75"/> - <source>Standard</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="82"/> - <source>Select the custom selected debug client</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="85"/> - <source>Custom</source> - <translation type="unfinished"></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 type="unfinished"></translation> - </message> - <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> - </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"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="120"/> - <source>Redirect stdin/stdout/stderr</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="127"/> - <source>Select to not set the debug client encoding</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="130"/> - <source>Don't set the encoding of the debug client</source> - <translation type="unfinished"></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 type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="44"/> - <source>Python Files (*.py *.py2)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="43"/> - <source>Select the virtual environment to be used</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>DeepLEngine</name> @@ -25802,22 +25835,22 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -44210,12 +44243,12 @@ <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation> </message> @@ -55191,23 +55224,38 @@ <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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="112"/> + <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="161"/> <source>Python 3:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/PythonPage.ui" line="125"/> - <source>Python 2 Interpreter</source> + <source>Python Environments</source> <translation type="unfinished"></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> + <source>Please configure the Python environments on the 'Python2 Debugger' page and the 'Python3 Debugger' page.</source> + <translation type="unfinished"></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> @@ -61122,12 +61170,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2044"/> + <location filename="../QScintilla/Shell.py" line="2045"/> <source>Drop Error</source> <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"></translation> </message> @@ -82695,22 +82743,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"></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"></translation> </message>