Mercurial Repositories > eric / changeset
changeset
Removed the capability to configure the Qt translations directory via environment variables.
Tue, 19 May 2020 18:03:54 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 19 May 2020 18:03:54 +0200
- changeset 7598
- 6bb50f2a1df2
- parent 7597
- 9dac5ef0126d
- child 7599
- d6efb1e15a5b
Removed the capability to configure the Qt translations directory via environment variables.
--- a/eric6/Preferences/ConfigurationPages/QtPage.ui Mon May 18 17:39:01 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/QtPage.ui Tue May 19 18:03:54 2020 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>642</width> - <height>772</height> + <height>929</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_6"> @@ -69,12 +69,7 @@ <item> <widget class="QLabel" name="textLabel1_2_4"> <property name="text"> - <string><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></string> + <string><b>Note:</b> Leave this entry empty to use the path compiled into the Qt library.</string> </property> <property name="wordWrap"> <bool>true</bool>
--- a/eric6/Preferences/__init__.py Mon May 18 17:39:01 2020 +0200 +++ b/eric6/Preferences/__init__.py Tue May 19 18:03:54 2020 +0200 @@ -2969,10 +2969,6 @@ "Qt/Qt5TranslationsDir", prefClass.qtDefaults["Qt5TranslationsDir"]) if s == "": - s = os.getenv("QTTRANSLATIONSDIR", "") - if s == "": - s = os.getenv("QT5TRANSLATIONSDIR", "") - if s == "": s = QLibraryInfo.location(QLibraryInfo.TranslationsPath) if s == "" and Globals.isWindowsPlatform(): transPath = os.path.join(Globals.getPyQt5ModulesDirectory(),
--- a/eric6/i18n/eric6_cs.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_cs.ts Tue May 19 18:03:54 2020 +0200 @@ -2960,12 +2960,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> @@ -61771,17 +61771,17 @@ <translation><b>Konfigurovat Qt</b></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 nástroje</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>Příklad kompletního jména nástroje</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> @@ -61791,7 +61791,7 @@ <translation><font color="#FF0000"><b>Poznámka:</b> Tato nastavení budou aktivována až po novém spuštění aplikace.</font></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>Spustitelný nástroj je složen z prefixu, jména nástroje a postfixu. Pro win je extenze připojena automaticky.</translation> </message> @@ -61801,67 +61801,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> @@ -61871,7 +61861,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> @@ -61881,35 +61871,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><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>
--- a/eric6/i18n/eric6_de.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_de.ts Tue May 19 18:03:54 2020 +0200 @@ -2927,12 +2927,12 @@ <translation>CircuitPython Firmwaredateien (*.uf2);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation>Wähle den Pfad zum Gerät</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><p>Der Datenträger des Gerätes <b>{0}</b> konnte nicht gefunden werden. Ist das Gerät im'Bootloader' Modus und eingehängt?</p><p>Wähle alternativ den Eintrag "Manuelle Auswahl" und gib unten den Pfad zum Gerät ein.</p></translation> </message> @@ -58694,17 +58694,17 @@ <translation><b>Qt-Einstellungen</b></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-Werkzeuge</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>Dies gibt ein Beispiel für den vollständigen Werkzeugnamen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/> <source>designer</source> <translation>designer</translation> </message> @@ -58714,7 +58714,7 @@ <translation><font color="#FF0000"><b>Hinweis:</b> Diese Einstellung wird erst beim nächsten Programmstart aktiv.</font></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>Der Werkzeugname wird aus dem Präfix, dem Werkzeugnamen und dem Anhängsel gebildet. Bei Windows wird die Erweiterung automatisch angehängt.</translation> </message> @@ -58724,72 +58724,57 @@ <translation>Qt-Übersetzungenverzeichnis</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>Gib den Pfad des Qt-Übersetzungenverzeichnisses ein.</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><b>Hinweis:</b> Lassen Sie diesen Eintrag leer, um eine Umgebungsvariable oder den in die Qt Bibliothek eincompilierten Pfad zu verwenden. Unterstützte Umgebungsvariablen sind -<ul> -<li>QT4TRANSLATIONSDIR für Qt4</li> -<li>QT5TRANSLATIONSDIR für Qt5</li> -<li>QTTRANSLATIONSDIR für eine beliebige Qt Variante</li> -</ul></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="136"/> <source>Qt-Prefix:</source> <translation>Qt-Präfix:</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>Gib das Präfix für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="150"/> <source>Qt-Postfix:</source> <translation>Qt-Anhängsel:</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>Gib das Anhängsel für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="227"/> <source>Indent Width:</source> <translation>Einrückungstiefe:</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>Wähle die Einrücktiefe (Standard: 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 '.'</source> <translation>Erzeuge Imports relativ zu '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="297"/> <source>Tools Directory:</source> <translation>Verzeichnis:</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>Gib den Pfad des Verzeichnisses mit den Qt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</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>Gib den Pfad des Verzeichnisses mit den PyQt-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> @@ -58799,7 +58784,7 @@ <translation>Beispiel: {0}designer{1}</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>Gib den Pfad des Verzeichnisses mit den PySide2-Werkzeugen ein, falls sie nicht automatisch gefunden werden.</translation> </message> @@ -58809,35 +58794,40 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="188"/> <source>PyQt</source> <translation>PyQt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>pyuic Options</source> <translation>pyuic Optionen</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>Auswählen, um zusätzlichen Code zum Testen und Anzeigen des Formulars zu erzeugen</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>Zusätzlichen Testcode erzeugen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="289"/> <source>PySide2</source> <translation>PySide2</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>pyside2-uic Optionen</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><b>Hinweis:</b> Lassen Sie diesen Eintrag leer, um den in die Qt Bibliothek eincompilierten Pfad zu verwenden.</translation> + </message> </context> <context> <name>Queues</name>
--- a/eric6/i18n/eric6_empty.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_empty.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> @@ -58263,87 +58263,77 @@ <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="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="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="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="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="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> <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="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> @@ -58353,7 +58343,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> @@ -58363,35 +58353,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>
--- 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>
--- a/eric6/i18n/eric6_es.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_es.ts Tue May 19 18:03:54 2020 +0200 @@ -2924,12 +2924,12 @@ <translation>Archivos de Firmware CircuitPython (*.uf2);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation>Seleccionar Ruta al Dispositivo</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><p>El volumen de dispositivo <b>{0}</b> no se puede encontrar. ¿Está dicho dispositivo en modo 'cargador de arranque' y montado?</p> <p>Alternativamente, seleccionar la opción "Selección Manuale introducir la ruta al dispositivo más abajo.</p></translation> </message> @@ -58665,17 +58665,17 @@ <translation><b>Configurar Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="91"/> <source>Qt Tools</source> <translation>Herramientas 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>Proporciona un ejemplo del nombre completo de la herramienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/> <source>designer</source> <translation>designer</translation> </message> @@ -58685,7 +58685,7 @@ <translation><font color="#FF0000"><b>Nota:</b> Estas opciones de configuración serán activadas la siguiente vez que se inicie la aplicación.</font></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>El ejecutable de la herramienta se compone del prefijo, el nombre de la herramienta y el postfijo. Para win, la extensión se añade automáticamente.</translation> </message> @@ -58695,7 +58695,7 @@ <translation>Directorio de Traducciones de 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>Introeucir la ruta del directorio de traducciones de Qt.</translation> </message> @@ -58707,7 +58707,7 @@ <li>QT5TRANSLATIONSDIR for Qt5</li> <li>QTTRANSLATIONSDIR for any Qt variant</li> </ul></source> - <translation><b>Nota:</b> Dejar vací esta entrada para utilizar una variable de entorno o la ruta compilada dentro de la biblioteca Qt. Las variables de entorno soportadas son + <translation type="obsolete"><b>Nota:</b> Dejar vací esta entrada para utilizar una variable de entorno o la ruta compilada dentro de la biblioteca Qt. Las variables de entorno soportadas son <ul> <li>QT4TRANSLATIONSDIR para Qt4</li> <li>QT5TRANSLATIONSDIR para Qt5</li> @@ -58715,52 +58715,52 @@ </ul></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="136"/> <source>Qt-Prefix:</source> <translation>Prefijo de Qt:</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>Introducir el prefijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="150"/> <source>Qt-Postfix:</source> <translation>Postfijo de Qt:</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>Introducir el postfijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="227"/> <source>Indent Width:</source> <translation>Ancho de indentación:</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>Seleccionar el ancho de indentación (valor por defecto: 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 '.'</source> <translation>Generar imports relativos a '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="297"/> <source>Tools Directory:</source> <translation>Directorio de las Herramientas:</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>Introducir la ruta del directorio de las herramientas Qt, si no se encuentran automáticamente.</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>Introducir la ruta del directorio de las herramientas PyQt, si no se encuentran automáticamente.</translation> </message> @@ -58770,7 +58770,7 @@ <translation>Muestra: {0}designer{1}</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>Introducir la ruta del directorio de las herramientas PySide2, si no se encuentran automáticamente.</translation> </message> @@ -58780,35 +58780,40 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="188"/> <source>PyQt</source> <translation>PyQt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>pyuic Options</source> <translation>Opciones de pyuic</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>Seleccionar para generar el código extra para probar y mostrar el formulario</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>Gemerar Código Extra de Prueba</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="289"/> <source>PySide2</source> <translation>PySide2</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>Opciones de pyside2-uic</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>
--- a/eric6/i18n/eric6_fr.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_fr.ts Tue May 19 18:03:54 2020 +0200 @@ -2973,12 +2973,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> @@ -60934,17 +60934,17 @@ <translation><b>Configuration de Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="91"/> <source>Qt Tools</source> <translation>Outils 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>Ceci donne un exemple d'un nom complet d'outil Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/> <source>designer</source> <translation>designer</translation> </message> @@ -60954,7 +60954,7 @@ <translation><font color="#FF0000"><b>Note:</b> Cette propriété sera activée au prochain démarrage de l'application.</font></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> @@ -60964,67 +60964,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> @@ -61034,7 +61024,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> @@ -61044,35 +61034,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><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>
--- a/eric6/i18n/eric6_it.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_it.ts Tue May 19 18:03:54 2020 +0200 @@ -2983,12 +2983,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> @@ -63431,17 +63431,17 @@ <translation><b>Configura Qt</b></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 Tools</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>Fa un esempio del nome completo del tool</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/> <source>designer</source> <translation>designer</translation> </message> @@ -63451,7 +63451,7 @@ <translation><font color="#FF0000"><b>Nota:</b> Queste impostazioni saranno attivate al prossimo avvio dell'applicazione.</font></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>L'eseguibile del tool e' composto dal predisso, il nome del tool e il suffizzo. Per win, l'estensione è aggiunta automaticamente.</translation> </message> @@ -63461,67 +63461,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> @@ -63531,7 +63521,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> @@ -63541,35 +63531,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><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>
--- a/eric6/i18n/eric6_pt.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_pt.ts Tue May 19 18:03:54 2020 +0200 @@ -2981,12 +2981,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> @@ -62684,22 +62684,22 @@ <translation><font color="#FF0000"><b>Nota:</b> Estas definições estarão activadas a próxima vez que arranque a aplicação.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="91"/> <source>Qt Tools</source> <translation>Ferramentas Qt</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> @@ -62709,67 +62709,57 @@ <translation>Diretório de Traduções de 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><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>Prefixo de Qt:</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>Sufixo de Qt:</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> @@ -62779,7 +62769,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> @@ -62789,35 +62779,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><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>
--- a/eric6/i18n/eric6_ru.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_ru.ts Tue May 19 18:03:54 2020 +0200 @@ -2926,12 +2926,12 @@ <translation>Файлы прошивки CircuitPython (*.uf2);;Все файлы (*)</translation> </message> <message> - <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="97"/> + <location filename="../MicroPython/CircuitPythonFirmwareSelectionDialog.py" line="123"/> <source>Select Path to Device</source> <translation>Выберите путь к устройству</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><p>Не удается найти том устройства <b>{0}</b>. Находится ли устройство в режиме 'bootloader' и подмонтировано ли?</p><p>В качестве альтернативы, выберите пункт "Manual Select" и ниже введите путь к устройству.</p></translation> </message> @@ -58838,22 +58838,22 @@ <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></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="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>Имя исполняемого файла программы состоит из префикса, имени программы и постфикса. Для windows же расширение добавляется автоматически.</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>designer</translation> </message> @@ -58863,7 +58863,7 @@ <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>Задайте путь к директории переводов Qt.</translation> </message> @@ -58875,7 +58875,7 @@ <li>QT5TRANSLATIONSDIR for Qt5</li> <li>QTTRANSLATIONSDIR for any Qt variant</li> </ul></source> - <translation><b>Примечание:</b> Оставьте эту строку пустой, чтобы использовать переменную среды окружения или путь в библиотеку Qt. Поддерживаются переменные сред окружения + <translation type="obsolete"><b>Примечание:</b> Оставьте эту строку пустой, чтобы использовать переменную среды окружения или путь в библиотеку Qt. Поддерживаются переменные сред окружения <ul> <li>QT4TRANSLATIONSDIR для Qt4</li> <li>QT5TRANSLATIONSDIR для Qt5</li> @@ -58883,52 +58883,52 @@ </ul></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="136"/> <source>Qt-Prefix:</source> <translation>Qt-префикс:</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>Задайте префикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="150"/> <source>Qt-Postfix:</source> <translation>Qt-постфикс:</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>Задайте постфикс для инструментов Qt</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 '.'</source> <translation>Генерировать импорт относительно '.'</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="297"/> <source>Tools Directory:</source> <translation>Директория инструментов:</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>Задайте путь к директории инструментов Qt, если они не найдены.</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>Задайте путь к директории инструментов PyQT, если они не найдены.</translation> </message> @@ -58938,7 +58938,7 @@ <translation>Например: {0}designer{1}</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>Задайте путь к директории инструментов PySide2, если они не найдены.</translation> </message> @@ -58948,35 +58948,40 @@ <translation>Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="188"/> <source>PyQt</source> <translation>PyQt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="220"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="221"/> <source>pyuic Options</source> <translation>Опции pyuic</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>Разрешить генерировать дополнительный код для тестирования и отображения формы</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>Генерировать дополнительный тестовый код</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="288"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="289"/> <source>PySide2</source> <translation>PySide2</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>Опции pyside2-uic</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>
--- a/eric6/i18n/eric6_tr.ts Mon May 18 17:39:01 2020 +0200 +++ b/eric6/i18n/eric6_tr.ts Tue May 19 18:03:54 2020 +0200 @@ -2960,12 +2960,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> @@ -61870,22 +61870,22 @@ <translation><font color="#FF0000"><b>Not:</b> Bu ayarlamalar uygulamanın bir sonraki çalıştırılmasında aktif hale geçecektir.</font></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 Araçları</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>çalışabilen araçların kendiliğinden oluşan ön eki. başarı için, kendiliğinden eklenir.</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>Bu tüm araç isimlerinin bir örneğini verir</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="172"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="173"/> <source>designer</source> <translation>dizayncı</translation> </message> @@ -61895,67 +61895,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> @@ -61965,7 +61955,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> @@ -61975,35 +61965,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><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>
--- 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><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> @@ -62610,17 +62610,17 @@ <translation><b>配置 Qt</b></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><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></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><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> @@ -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 '.'</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><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>
