Mercurial Repositories > eric / changeset
changeset
VirtualenvAddEditDialog: change the Anaconda flag to read 'Conda' and added a WhatsThis help string to the 'Globa' option to explain it a bit better.
Sun, 04 Nov 2018 11:46:35 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 04 Nov 2018 11:46:35 +0100
- changeset 6579
- f0bbf95a0f26
- parent 6578
- 2fb729cca297
- child 6580
- 082d58e2415e
VirtualenvAddEditDialog: change the Anaconda flag to read 'Conda' and added a WhatsThis help string to the 'Globa' option to explain it a bit better.
| VirtualEnv/VirtualenvAddEditDialog.ui | file | annotate | diff | comparison | revisions | |
| i18n/eric6_cs.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.qm | file | annotate | diff | comparison | revisions | |
| i18n/eric6_de.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_empty.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_en.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_es.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_fr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_it.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_pt.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_ru.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_tr.ts | file | annotate | diff | comparison | revisions | |
| i18n/eric6_zh_CN.ts | file | annotate | diff | comparison | revisions |
--- a/VirtualEnv/VirtualenvAddEditDialog.ui Sat Nov 03 20:04:41 2018 +0100 +++ b/VirtualEnv/VirtualenvAddEditDialog.ui Sun Nov 04 11:46:35 2018 +0100 @@ -105,6 +105,10 @@ <property name="toolTip"> <string>Select to denote a global environment (i.e. no virtual environment directory to be given)</string> </property> + <property name="whatsThis"> + <string><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></string> + </property> <property name="text"> <string>Global Environment</string> </property> @@ -113,10 +117,10 @@ <item> <widget class="QCheckBox" name="anacondaCheckBox"> <property name="toolTip"> - <string>Select, if this is an Anaconda environment</string> + <string>Select, if this is an Conda environment</string> </property> <property name="text"> - <string>Anaconda Environment</string> + <string>Conda Environment</string> </property> </widget> </item>
--- a/i18n/eric6_cs.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_cs.ts Sun Nov 04 11:46:35 2018 +0100 @@ -63205,7 +63205,7 @@ <translation>Č.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> @@ -63266,12 +63266,12 @@ <translation>{0} na {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> @@ -63282,7 +63282,7 @@ <translation type="obsolete">Shell jazyk "{0}" není podporován.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> @@ -63292,7 +63292,7 @@ <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -63300,26 +63300,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -63335,7 +63335,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Projekt</translation> </message> @@ -82902,7 +82902,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -82912,17 +82912,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -82936,6 +82926,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_de.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_de.ts Sun Nov 04 11:46:35 2018 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1973,8 +1972,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="170"/> - <source>Open in New Tab Ctrl+LMB</source> - <translation>In neuem Register öffnen Strg+LMK</translation> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksMenu.py" line="174"/> @@ -2052,8 +2051,8 @@ </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="91"/> - <source>Open in New Tab Ctrl+LMB</source> - <translation>In neuem Register öffnen Strg+LMK</translation> + <source>Open in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/Bookmarks/BookmarksToolBar.py" line="95"/> @@ -25088,8 +25087,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1223"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1314"/> @@ -61905,7 +61904,7 @@ <translation>Zurücksetzen und Löschen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -61915,7 +61914,7 @@ <translation>Nr.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -61935,12 +61934,12 @@ <translation>Passiver Debugmodus</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> @@ -61992,7 +61991,7 @@ <translation>Suchen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -62003,14 +62002,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation>Unspezifischer Syntaxfehler. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> @@ -62019,14 +62018,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation>Syntaxfehler "{1}" in Datei {0}, Zeile {2}, Zeichen {3}. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation>Signal "{0}" in der Datei {1} in Zeile {2} erzeugt. @@ -62043,7 +62042,7 @@ <translation><b>Das Shell-Fenster</b><p>Dies ist ein Interpreter Ihres Systems. Es ist derjenige, der benutzt wird, um das zu untersuchende Programm auszuführen. Dies bedeutet, dass Sie jedes Pythonkommando ausführen können, auch während Ihr Programm läuft.</p><p>Benutzen Sie die Cursortasten während der Eingabe von Befehlen. Es existiert auch eine Chronik-Funktion, die mit den Cursortasten Hoch und Runter unter Halten der Strg-Taste bedient wird. Dies kann über die Shell Seite des Konfigurationsdialoges auf Cursortasten Hoch und Runter alleine umgeschaltet werden. Eine inkrementelle Suche wird gestartet, indem diese Tasten nach Eingabe von Text gedrückt werden.</p><p>Die Shell hat einige spezielle Kommandos. „reset“ beendet den Interpreter und startet einen neuen. „clear“ löscht die Anzeige des Shell-Fensters. „start“ wird benutzt, um die Sprache der Shell umzuschalten, und muss von einer unterstützten Sprache gefolgt werden. Unterstützte Sprachen werden durch „languages“ aufgelistet. Diese Befehle (Ausnahme „languages“) sind auch über das Kontextmenu verfügbar.</p><p>Nachdem Text eingegeben wurde, kann durch Drücken der Tab-Taste eine Liste möglicher Kommandozeilenvervollständigungen angezeigt werden. Der gewünschte Eintrag kann aus dieser Liste ausgewählt werden. Ist nur ein Eintrag vorhanden, so wird dieser automatisch eingefügt.</p><p>Im passiven Debugmodus ist die Shell nur dann verfügbar, wenn das zu debuggende Skript mit der IDE verbunden ist. Dies wird durch einen anderen Prompt und eine Anzeige im Fensterkopf dargestellt.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation>Projekt</translation> </message> @@ -81293,7 +81292,7 @@ <translation>Auswählen, um eine globale Umgebung anzudeuten (d.h. es wird keine Verzeichnis für die virtuelle Umgebung angegeben)</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation>Globale Umgebung</translation> </message> @@ -81303,17 +81302,7 @@ <translation>Wähle die Pythonvariante</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation>Auswählen, wenn dies eine Anaconda Umgebung ist</translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation>Anaconda Umgebung</translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation>PATH Präfix:</translation> </message> @@ -81327,6 +81316,23 @@ <source>Python Variant:</source> <translation>Python-Variante:</translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation><b>Globale Umgebung</b> +<p>Die Aktivierung dieses Flags bedeutet, dass die Umgebung global definiert wurde, d.h. nicht spezifisch für einen Nutzer. Normalerweise können solche Umgebungen nicht durch einen Standardnutzer gelöscht werden. Der entsprechende Knopf im Dialog zur Verwaltung virtueller Umgebungen wird daher für solche Einträge deaktiviert.</p></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation>Auswählen, wenn dies eine Conda Umgebung ist</translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation>Conda Umgebung</translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name> @@ -83725,8 +83731,8 @@ </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="644"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../WebBrowser/WebBrowserView.py" line="650"/>
--- a/i18n/eric6_empty.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_empty.ts Sun Nov 04 11:46:35 2018 +0100 @@ -61486,7 +61486,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -61494,47 +61494,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> @@ -61549,7 +61549,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished"></translation> </message> @@ -80653,7 +80653,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -80663,17 +80663,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -80687,6 +80677,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_en.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_en.ts Sun Nov 04 11:46:35 2018 +0100 @@ -61530,22 +61530,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> @@ -61555,7 +61555,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -61563,26 +61563,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -61598,7 +61598,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished"></translation> </message> @@ -80703,7 +80703,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -80713,17 +80713,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -80737,6 +80727,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_es.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_es.ts Sun Nov 04 11:46:35 2018 +0100 @@ -61855,7 +61855,7 @@ <translation>No.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> @@ -61907,12 +61907,12 @@ <translation>{0} en {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> @@ -61924,7 +61924,7 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> @@ -61934,7 +61934,7 @@ <translation>Buscar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -61945,14 +61945,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation>Error de sintaxis sin especificar. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> @@ -61961,14 +61961,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation>Error de sintaxis "{1}" en archivo {0} en la línea {2}, carácter {3}. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation>Señal "{0}" generada en el archivo {1} y línea {2}. @@ -61985,7 +61985,7 @@ <translation><b>La Ventana de Shell</b><p>Es solamente un intérprete corriendo en una ventana. El intérprete es el que se ha usado para correr el programa en depuración. Esto significa que se puede ejecutar cualquier comando mientras el programa en depuración está corriendo.</p><p>Se pueden utilizar las teclas de cursor mientras se introducen comandos. Hay también un historial de comandos que se pueden invocar de nuevo utilizando las teclas de cursor arriba y abajo mientras se mantiene pulsada simultáneamente la tecla de Ctrl. Al pulsar la tecla de arriba o abajo despues de haber introducido algún texto se hará una búsqueda incremental.</p><p>La shell tiene algunos comandos especiales. 'reset' elimina la shell y comienza una nueva. 'clear' limpia la ventana de shell. 'start' se usa para cambiar el lenguaje de shell y se debe continuar con un lenguaje soportado. Los lenguajes soportados se listan con el comando 'languages'. 'quit' se usa para salir de la aplicación.Estos comandos (excepto 'languages') están disponibles también a través del menú de la ventana.</p><p>Pulsando la tecla Tab después de introducir algún texto mostrará una lista de posibles completados. La entrada relevante se puede seleccionar de esta lista. Si solamente hay disponible una entrada, ésta se insertará automáticamente.</p><p>En modo de depuración pasiva la shell está disponible únicamente a partir de que el programa a depurar ha conectado con la IDE y hasta que ha terminado. Esto se indica con un prompt distinto y con un indicador en el título de la ventana.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Proyecto</translation> </message> @@ -81219,7 +81219,7 @@ <translation>Seleccionar para denotar un entorno global (por ejemplo, sin proporcionar directorio de entorno virtual)</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation>Entorno Global</translation> </message> @@ -81229,17 +81229,7 @@ <translation>Seleccionar la variante de Python</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -81253,6 +81243,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_fr.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_fr.ts Sun Nov 04 11:46:35 2018 +0100 @@ -62878,7 +62878,7 @@ <translation>Effacer et réinitialiser</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -62949,17 +62949,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> @@ -62969,7 +62969,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -62977,26 +62977,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -63012,7 +63012,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Projet</translation> </message> @@ -82612,7 +82612,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -82622,17 +82622,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -82646,6 +82636,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_it.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_it.ts Sun Nov 04 11:46:35 2018 +0100 @@ -62105,7 +62105,7 @@ <translation>Resetta e pulisci</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Drop Error</translation> </message> @@ -62172,12 +62172,12 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> @@ -62189,7 +62189,7 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> @@ -62199,7 +62199,7 @@ <translation>Trova</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -62207,26 +62207,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62242,7 +62242,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Progetto</translation> </message> @@ -81483,7 +81483,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -81493,17 +81493,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -81517,6 +81507,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_pt.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_pt.ts Sun Nov 04 11:46:35 2018 +0100 @@ -63531,22 +63531,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"><p><b>{0}</b> não é um ficheiro.</p></translation> </message> @@ -63556,7 +63556,7 @@ <translation>Encontrar</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -63564,26 +63564,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -63599,7 +63599,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Projeto</translation> </message> @@ -83062,7 +83062,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -83072,17 +83072,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -83096,6 +83086,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_ru.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_ru.ts Sun Nov 04 11:46:35 2018 +0100 @@ -62085,12 +62085,12 @@ <translation>{0} on {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> @@ -62102,12 +62102,12 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -62117,7 +62117,7 @@ <translation>Найти</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -62128,14 +62128,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation>Неизвестная синтакcическая ошибка. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> @@ -62144,14 +62144,14 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation>Синтаксическая ошибка "{1}" в файле {0} в строке {2}, символ {3}. </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation>Сигнал "{0}" сгенерирован в файле {1} в строке {2}. @@ -62168,7 +62168,7 @@ <translation><b>Окно оболочки</b><p>Это простой интерпретатор, запущенный в окне. Интерпретатор просто используется для запуска отлаживаемой программы. Это означает, что вы можете выполнить любую команду во время работы отлаживаемой программы.</p><p>Вы можете использовать клавиши управления курсором при вводе команд. Так же существует история команд, которые можно вызвать с помощью клавиш управления курсора 'вверх' и 'вниз', удерживая нажатой клавишу Ctrl. В диалоге настройки оболочки на странице 'Оболочка' можно переключится в режим использования просто клавиш 'вверх' и 'вниз'. Нажатие этих клавиш после ввода какого-либо текста вызовет инкрементный поиск. </p><p>Оболочка имеет специальные команды. Команда 'reset' убивает текущую оболочку и открывает новую. Команда 'clear' очищает окно оболочки. Команда 'start' используется для переключения языка оболочки и должна сопровождаться поддерживаемым языком. Поддерживаемые языки отображаются с помощью команды 'languages'. Команда 'quit' используется для выхода из приложения. Эти команды (исключая 'languages') также доступны в оконных меню.</p><p>Нажатие клавиши 'Tab' после того, как был введен какой-либо текст, вызывает отображение списка возможных дополнений. Необходимая запись может быть выбрана из данного списка. Если доступна только одна запись, то она будет вставлена автоматически.</p><p>В режиме пассивной отладки оболочка доступна только после того, как отлаживаемая программа была подключена к IDE и до ее завершения. Это указывается посредством другой подсказки и индикацией в заголовке окна.</p></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Проект</translation> </message> @@ -81475,7 +81475,7 @@ <translation>Разрешить обозначать глобальное окружение (т.е. не указывать директорию виртуального окружения)</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation>Глобальное окружение</translation> </message> @@ -81485,17 +81485,7 @@ <translation>Выберите версию Python'а</translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -81509,6 +81499,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_tr.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_tr.ts Sun Nov 04 11:46:35 2018 +0100 @@ -62921,12 +62921,12 @@ <translation>{0} üzerin {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation>Stdçıktı:{0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation>stdhata: {0}</translation> </message> @@ -62938,12 +62938,12 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> @@ -62953,7 +62953,7 @@ <translation type="unfinished">Bul</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -62961,26 +62961,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -62996,7 +62996,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">Proje</translation> </message> @@ -82499,7 +82499,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -82509,17 +82509,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -82533,6 +82523,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
--- a/i18n/eric6_zh_CN.ts Sat Nov 03 20:04:41 2018 +0100 +++ b/i18n/eric6_zh_CN.ts Sun Nov 04 11:46:35 2018 +0100 @@ -61796,7 +61796,7 @@ <translation>No.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source>Drop Error</source> <translation>降落误差</translation> </message> @@ -61811,17 +61811,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="997"/> + <location filename="../QScintilla/Shell.py" line="1000"/> <source>StdOut: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1005"/> + <location filename="../QScintilla/Shell.py" line="1008"/> <source>StdErr: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2081"/> + <location filename="../QScintilla/Shell.py" line="2084"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"><p><b>{0}</b> 不是一个文件。</p></translation> </message> @@ -61831,7 +61831,7 @@ <translation type="unfinished">查找</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="866"/> + <location filename="../QScintilla/Shell.py" line="869"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -61839,26 +61839,26 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="899"/> + <location filename="../QScintilla/Shell.py" line="902"/> <source>Unspecified syntax error. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="876"/> + <location filename="../QScintilla/Shell.py" line="879"/> <source>Exception "{0}" {1} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="901"/> + <location filename="../QScintilla/Shell.py" line="904"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="924"/> + <location filename="../QScintilla/Shell.py" line="927"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> @@ -61874,7 +61874,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1945"/> + <location filename="../QScintilla/Shell.py" line="1948"/> <source>Project</source> <translation type="unfinished">项目</translation> </message> @@ -81090,7 +81090,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="113"/> <source>Global Environment</source> <translation type="unfinished"></translation> </message> @@ -81100,17 +81100,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="116"/> - <source>Select, if this is an Anaconda environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="119"/> - <source>Anaconda Environment</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="141"/> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="145"/> <source>PATH Prefix:</source> <translation type="unfinished"></translation> </message> @@ -81124,6 +81114,22 @@ <source>Python Variant:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="109"/> + <source><b>Global Environment</b> +<p>Setting this indicates, that the environment is defined globally, i.e. not user specific. Usually such environments cannot be deleted by a standard user. The respective button of the Virtual Environment Manager dialog will be disabled for these entries.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="120"/> + <source>Select, if this is an Conda environment</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../VirtualEnv/VirtualenvAddEditDialog.ui" line="123"/> + <source>Conda Environment</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>VirtualenvConfigurationDialog</name>
