--- a/eric6/i18n/eric6_en.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_en.ts Tue May 19 18:03:54 2020 +0200 @@ -2894,12 +2894,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><p>The device volume <b>{0}</b> could not be found. Is the device in 'bootloader' mode and mounted?</p> <p>Alternatively select the "Manual Select" entry and enter the path to the device below.</p></source> <translation type="unfinished"></translation> </message> @@ -58301,22 +58301,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="91"/> <source>Qt Tools</source> <translation type="unfinished"></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> <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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/> <source>designer</source> <translation type="unfinished"></translation> </message> @@ -58326,67 +58326,57 @@ <translation type="unfinished"></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><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are -<ul> -<li>QT4TRANSLATIONSDIR for Qt4</li> -<li>QT5TRANSLATIONSDIR for Qt5</li> -<li>QTTRANSLATIONSDIR for any Qt variant</li> -</ul></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> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="227"/> <source>Indent Width:</source> <translation type="unfinished"></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 type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="327"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="328"/> <source>Generate imports relative to '.'</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> @@ -58396,7 +58386,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> @@ -58406,35 +58396,40 @@ <translation type="unfinished"></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><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name>