Mercurial Repositories > eric / file diff

--- 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>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; 不是一个文件。&lt;/p&gt;</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 &quot;{0}&quot;
 {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 &quot;{0}&quot;
 {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 &quot;{1}&quot; 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 &quot;{0}&quot; 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>&lt;b&gt;Global Environment&lt;/b&gt;
+&lt;p&gt;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.&lt;/p&gt;</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>