Mercurial Repositories > eric / file diff

--- a/eric6/i18n/eric6_zh_CN.ts	Mon May 18 17:39:01 2020 +0200
+++ b/eric6/i18n/eric6_zh_CN.ts	Tue May 19 18:03:54 2020 +0200
@@ -2971,12 +2971,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/>
+        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/>
         <source>Select Path to Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/>
+        <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/>
         <source>&lt;p&gt;The device volume &lt;b&gt;{0}&lt;/b&gt; could not be found. Is the device in &apos;bootloader&apos; mode and mounted?&lt;/p&gt; &lt;p&gt;Alternatively select the &quot;Manual Select&quot; entry and enter the path to the device below.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62610,17 +62610,17 @@
         <translation>&lt;b&gt;配置 Qt&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="91"/>
         <source>Qt Tools</source>
         <translation>Qt 工具</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="169"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="170"/>
         <source>This gives an example of the complete tool name</source>
         <translation>这里给出了完整工具名称的一个范例</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/>
         <source>designer</source>
         <translation>设计师</translation>
     </message>
@@ -62630,7 +62630,7 @@
         <translation>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;注意：&lt;/b&gt; 该设置将在下次启动应用程序时生效。&lt;/font&gt;</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="123"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="124"/>
         <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62640,37 +62640,27 @@
         <translation>Qt 翻译文件夹</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="65"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="71"/>
         <source>Enter the path of the Qt translations directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="72"/>
-        <source>&lt;b&gt;Note:&lt;/b&gt; Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are
-&lt;ul&gt;
-&lt;li&gt;QT4TRANSLATIONSDIR for Qt4&lt;/li&gt;
-&lt;li&gt;QT5TRANSLATIONSDIR for Qt5&lt;/li&gt;
-&lt;li&gt;QTTRANSLATIONSDIR for any Qt variant&lt;/li&gt;
-&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="136"/>
         <source>Qt-Prefix:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="143"/>
         <source>Enter the prefix for the Qt tools name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="150"/>
         <source>Qt-Postfix:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="156"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="157"/>
         <source>Enter the postfix for the Qt tools name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62680,32 +62670,32 @@
         <translation type="obsolete">pyuic / pyside-uic 选项</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="227"/>
         <source>Indent Width:</source>
         <translation>缩进宽度：</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="233"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="234"/>
         <source>Select the indent width (default: 4)</source>
         <translation>缩进宽度（默认值：4）</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="328"/>
         <source>Generate imports relative to &apos;.&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="297"/>
         <source>Tools Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="115"/>
         <source>Enter the path of the Qt tools directory, if they are not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="211"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="212"/>
         <source>Enter the path of the PyQt tools directory, if they are not found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62715,7 +62705,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="312"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="313"/>
         <source>Enter the path of the PySide2 tools directory, if they are not found.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -62725,35 +62715,40 @@
         <translation type="unfinished">Qt</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="188"/>
         <source>PyQt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/>
         <source>pyuic Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="272"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="273"/>
         <source>Select to generate extra code to test and display the form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="275"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="276"/>
         <source>Generate Extra Test Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="289"/>
         <source>PySide2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="321"/>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="322"/>
         <source>pyside2-uic Options</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="78"/>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Leave this entry empty to use the path compiled into the Qt library.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Queues</name>