--- a/i18n/eric6_en.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_en.ts Thu Feb 04 18:40:04 2016 +0100 @@ -7732,22 +7732,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="466"/> + <location filename="../E5Gui/E5PathPicker.py" line="500"/> <source>Choose a file to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="468"/> + <location filename="../E5Gui/E5PathPicker.py" line="502"/> <source>Choose files to open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="472"/> + <location filename="../E5Gui/E5PathPicker.py" line="506"/> <source>Choose a file to save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="474"/> + <location filename="../E5Gui/E5PathPicker.py" line="508"/> <source>Choose a directory</source> <translation type="unfinished"></translation> </message> @@ -16779,32 +16779,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="822"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> <source>Are you sure you want to close the window?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Helpviewer/HelpTabWidget.py" line="822"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -16815,17 +16815,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation type="unfinished"></translation> </message> @@ -16845,37 +16845,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source>eric6 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="604"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="612"/> <source><p>Printing is not available due to a bug in PyQt5. Please upgrade.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source><p>Printing is not available due to a bug in PyQt5.Please upgrade.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="459"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="467"/> <source>Do you really want to close this page?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="459"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="467"/> <source>You have modified this page and when closing it you would lose the modification. Do you really want to close this page?</source> <translation type="unfinished"></translation> @@ -45448,22 +45448,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="85"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="90"/> <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="129"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="134"/> <source>This gives an example of the complete tool name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation type="unfinished"></translation> </message> @@ -45479,46 +45479,51 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="66"/> - <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="95"/> + <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="100"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="102"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="107"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="121"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="147"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="148"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/> <source>Indent Width:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="155"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="160"/> <source>Select the indent width (default: 4)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="192"/> <source>Generate imports relative to '.'</source> <translation type="unfinished"></translation> </message>