Mercurial Repositories > eric / changeset
changeset
Change the prefference for the Qt translations directory because it still reflected Qt4.
Thu, 04 Feb 2016 18:40:04 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 04 Feb 2016 18:40:04 +0100
- changeset 4714
- 03c5936c79e5
- parent 4712
- a910b5ae47c9
- child 4716
- 6c8fbcd4d66c
Change the prefference for the Qt translations directory because it still reflected Qt4.
--- a/APIs/Python3/eric6.api Wed Feb 03 19:44:28 2016 +0100 +++ b/APIs/Python3/eric6.api Thu Feb 04 18:40:04 2016 +0100 @@ -6823,9 +6823,9 @@ eric6.Preferences.getProjectBrowserFlags?4(key, prefClass=Prefs) eric6.Preferences.getPython?4(key, prefClass=Prefs) eric6.Preferences.getQt4DocDir?4(prefClass=Prefs) -eric6.Preferences.getQt4TranslationsDir?4(prefClass=Prefs) eric6.Preferences.getQt5DocDir?4(prefClass=Prefs) eric6.Preferences.getQt?4(key, prefClass=Prefs) +eric6.Preferences.getQtTranslationsDir?4(prefClass=Prefs) eric6.Preferences.getShell?4(key, prefClass=Prefs) eric6.Preferences.getSystem?4(key, prefClass=Prefs) eric6.Preferences.getTasks?4(key, prefClass=Prefs)
--- a/Documentation/Help/source.qhp Wed Feb 03 19:44:28 2016 +0100 +++ b/Documentation/Help/source.qhp Thu Feb 04 18:40:04 2016 +0100 @@ -5461,6 +5461,7 @@ <keyword name="HelpTabWidget.__loadFinished" id="HelpTabWidget.__loadFinished" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__loadFinished" /> <keyword name="HelpTabWidget.__loadStarted" id="HelpTabWidget.__loadStarted" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__loadStarted" /> <keyword name="HelpTabWidget.__navigationMenuTriggered" id="HelpTabWidget.__navigationMenuTriggered" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__navigationMenuTriggered" /> + <keyword name="HelpTabWidget.__newBrowser" id="HelpTabWidget.__newBrowser" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__newBrowser" /> <keyword name="HelpTabWidget.__pathSelected" id="HelpTabWidget.__pathSelected" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__pathSelected" /> <keyword name="HelpTabWidget.__printPdfRequested" id="HelpTabWidget.__printPdfRequested" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__printPdfRequested" /> <keyword name="HelpTabWidget.__printPreview" id="HelpTabWidget.__printPreview" ref="eric6.Helpviewer.HelpTabWidget.html#HelpTabWidget.__printPreview" /> @@ -13825,10 +13826,10 @@ <keyword name="getPythonVersion" id="getPythonVersion" ref="eric6.Utilities.__init__.html#getPythonVersion" /> <keyword name="getQt" id="getQt" ref="eric6.Preferences.__init__.html#getQt" /> <keyword name="getQt4DocDir" id="getQt4DocDir" ref="eric6.Preferences.__init__.html#getQt4DocDir" /> - <keyword name="getQt4TranslationsDir" id="getQt4TranslationsDir" ref="eric6.Preferences.__init__.html#getQt4TranslationsDir" /> <keyword name="getQt5DocDir" id="getQt5DocDir" ref="eric6.Preferences.__init__.html#getQt5DocDir" /> <keyword name="getQtBinariesPath" id="getQtBinariesPath" ref="eric6.Globals.__init__.html#getQtBinariesPath" /> <keyword name="getQtMacBundle" id="getQtMacBundle" ref="eric6.Utilities.__init__.html#getQtMacBundle" /> + <keyword name="getQtTranslationsDir" id="getQtTranslationsDir" ref="eric6.Preferences.__init__.html#getQtTranslationsDir" /> <keyword name="getRealName" id="getRealName" ref="eric6.Utilities.__init__.html#getRealName" /> <keyword name="getRegistryData" id="getRegistryData" ref="eric6.Debugger.DebuggerInterfaceNone.html#getRegistryData" /> <keyword name="getRegistryData" id="getRegistryData" ref="eric6.Debugger.DebuggerInterfacePython.html#getRegistryData" />
--- a/Documentation/Source/eric6.Helpviewer.HelpTabWidget.html Wed Feb 03 19:44:28 2016 +0100 +++ b/Documentation/Source/eric6.Helpviewer.HelpTabWidget.html Thu Feb 04 18:40:04 2016 +0100 @@ -115,6 +115,9 @@ <td><a href="#HelpTabWidget.__navigationMenuTriggered">__navigationMenuTriggered</a></td> <td>Private slot called to handle the navigation button menu selection.</td> </tr><tr> +<td><a href="#HelpTabWidget.__newBrowser">__newBrowser</a></td> +<td>Private slot to open a new browser tab.</td> +</tr><tr> <td><a href="#HelpTabWidget.__pathSelected">__pathSelected</a></td> <td>Private slot called when a URL is selected from the completer.</td> </tr><tr> @@ -348,7 +351,12 @@ <dd> reference to the selected action (QAction) </dd> -</dl><a NAME="HelpTabWidget.__pathSelected" ID="HelpTabWidget.__pathSelected"></a> +</dl><a NAME="HelpTabWidget.__newBrowser" ID="HelpTabWidget.__newBrowser"></a> +<h4>HelpTabWidget.__newBrowser</h4> +<b>__newBrowser</b>(<i></i>) +<p> + Private slot to open a new browser tab. +</p><a NAME="HelpTabWidget.__pathSelected" ID="HelpTabWidget.__pathSelected"></a> <h4>HelpTabWidget.__pathSelected</h4> <b>__pathSelected</b>(<i>path</i>) <p>
--- a/Documentation/Source/eric6.Preferences.__init__.html Wed Feb 03 19:44:28 2016 +0100 +++ b/Documentation/Source/eric6.Preferences.__init__.html Thu Feb 04 18:40:04 2016 +0100 @@ -139,12 +139,12 @@ <td><a href="#getQt4DocDir">getQt4DocDir</a></td> <td>Module function to retrieve the Qt4DocDir setting.</td> </tr><tr> -<td><a href="#getQt4TranslationsDir">getQt4TranslationsDir</a></td> -<td>Module function to retrieve the Qt4TranslationsDir setting.</td> -</tr><tr> <td><a href="#getQt5DocDir">getQt5DocDir</a></td> <td>Module function to retrieve the Qt5DocDir setting.</td> </tr><tr> +<td><a href="#getQtTranslationsDir">getQtTranslationsDir</a></td> +<td>Module function to retrieve the Qt4TranslationsDir setting (Name kept for backward compatibility).</td> +</tr><tr> <td><a href="#getShell">getShell</a></td> <td>Module function to retrieve the various shell settings.</td> </tr><tr> @@ -1020,24 +1020,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="getQt4TranslationsDir" ID="getQt4TranslationsDir"></a> -<h2>getQt4TranslationsDir</h2> -<b>getQt4TranslationsDir</b>(<i>prefClass=Prefs</i>) -<p> - Module function to retrieve the Qt4TranslationsDir setting. -</p><dl> -<dt><i>prefClass</i></dt> -<dd> -preferences class used as the storage area -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -the requested Qt4TranslationsDir setting (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="getQt5DocDir" ID="getQt5DocDir"></a> <h2>getQt5DocDir</h2> <b>getQt5DocDir</b>(<i>prefClass=Prefs</i>) @@ -1056,6 +1038,25 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="getQtTranslationsDir" ID="getQtTranslationsDir"></a> +<h2>getQtTranslationsDir</h2> +<b>getQtTranslationsDir</b>(<i>prefClass=Prefs</i>) +<p> + Module function to retrieve the Qt4TranslationsDir setting (Name kept for + backward compatibility). +</p><dl> +<dt><i>prefClass</i></dt> +<dd> +preferences class used as the storage area +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the requested Qt4TranslationsDir setting (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="getShell" ID="getShell"></a> <h2>getShell</h2> <b>getShell</b>(<i>key, prefClass=Prefs</i>)
--- a/Preferences/ConfigurationPages/QtPage.ui Wed Feb 03 19:44:28 2016 +0100 +++ b/Preferences/ConfigurationPages/QtPage.ui Thu Feb 04 18:40:04 2016 +0100 @@ -63,7 +63,12 @@ <item> <widget class="QLabel" name="textLabel1_2_4"> <property name="text"> - <string><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</string> + <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> </property> <property name="wordWrap"> <bool>true</bool>
--- a/Preferences/__init__.py Wed Feb 03 19:44:28 2016 +0100 +++ b/Preferences/__init__.py Thu Feb 04 18:40:04 2016 +0100 @@ -29,7 +29,7 @@ import sys from PyQt5.QtCore import QDir, QPoint, QLocale, QSettings, QFileInfo, \ - QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo + QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo, qVersion from PyQt5.QtGui import QColor, QFont, QPalette from PyQt5.QtWidgets import QInputDialog, QApplication from PyQt5.QtNetwork import QNetworkRequest @@ -2571,9 +2571,10 @@ prefClass.settings.setValue("System/" + key, value) -def getQt4TranslationsDir(prefClass=Prefs): +def getQtTranslationsDir(prefClass=Prefs): """ - Module function to retrieve the Qt4TranslationsDir setting. + Module function to retrieve the Qt4TranslationsDir setting (Name kept for + backward compatibility). @param prefClass preferences class used as the storage area @return the requested Qt4TranslationsDir setting (string) @@ -2581,7 +2582,12 @@ s = prefClass.settings.value( "Qt/Qt4TranslationsDir", prefClass.qtDefaults["Qt4TranslationsDir"]) if s == "": - s = os.getenv("QT4TRANSLATIONSDIR", "") + s = os.getenv("QTTRANSLATIONSDIR", "") + if s == "": + if qVersion() < "5.0.0": + s = os.getenv("QT4TRANSLATIONSDIR", "") + else: + s = os.getenv("QT5TRANSLATIONSDIR", "") if s == "": s = QLibraryInfo.location(QLibraryInfo.TranslationsPath) if s == "" and isWindowsPlatform(): @@ -2600,7 +2606,7 @@ @return the requested Qt setting """ if key == "Qt4TranslationsDir": - return getQt4TranslationsDir(prefClass) + return getQtTranslationsDir(prefClass) elif key in ["PyuicIndent"]: return int(prefClass.settings.value( "Qt/" + key, prefClass.qtDefaults[key]))
--- a/Toolbox/Startup.py Wed Feb 03 19:44:28 2016 +0100 +++ b/Toolbox/Startup.py Thu Feb 04 18:40:04 2016 +0100 @@ -233,10 +233,11 @@ initializeResourceSearchPath() QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) - qt4TransDir = Preferences.getQt4TranslationsDir() - if not qt4TransDir: - qt4TransDir = QLibraryInfo.location(QLibraryInfo.TranslationsPath) - loadTranslators(qt4TransDir, app) + qtTransDir = Preferences.getQtTranslationsDir() + if not qtTransDir: + qtTransDir = QLibraryInfo.location(QLibraryInfo.TranslationsPath) + loadTranslators(qtTransDir, app, ("qscintilla",)) + # qscintilla needed for web browser w = mwFactory(argv) if quitOnLastWindowClosed:
--- a/eric6.py Wed Feb 03 19:44:28 2016 +0100 +++ b/eric6.py Thu Feb 04 18:40:04 2016 +0100 @@ -317,14 +317,13 @@ if len(sys.argv) > 1: args = sys.argv[1:] - # TODO: this code is misleading - it applies to Qt5 as well # get the Qt4 translations directory - qt4TransDir = Preferences.getQt4TranslationsDir() - if not qt4TransDir: - qt4TransDir = QLibraryInfo.location(QLibraryInfo.TranslationsPath) + qtTransDir = Preferences.getQtTranslationsDir() + if not qtTransDir: + qtTransDir = QLibraryInfo.location(QLibraryInfo.TranslationsPath) # Load translation files and install them - loc = Startup.loadTranslators(qt4TransDir, app, ("qscintilla",)) + loc = Startup.loadTranslators(qtTransDir, app, ("qscintilla",)) # Initialize SSL stuff from E5Network.E5SslUtilities import initSSL
--- a/i18n/eric6_cs.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_cs.ts Thu Feb 04 18:40:04 2016 +0100 @@ -7988,22 +7988,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> @@ -17236,32 +17236,32 @@ <translation type="unfinished">Vytvořit záložky pro všechny taby</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">Načítám...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation type="unfinished">Načteno</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">Načtení selhalo</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 type="unfinished"> @@ -17271,17 +17271,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation type="unfinished">&Zavřít</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation type="unfinished">&Konec</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> @@ -17301,37 +17301,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">eric5 web prohlížeč {6 ?}</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"><p>Tisk není dostupný kvůli bugu v PyQt4.Please upgrade.</p> {5.?}</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> @@ -46293,17 +46293,17 @@ <translation type="obsolete">Výběr adresáře s Qt4 překlady</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Qt nástroje</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>Příklad kompletního jména nástroje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation></translation> </message> @@ -46313,7 +46313,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="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>Spustitelný nástroj je složen z prefixu, jména nástroje a postfixu. Pro win je extenze připojena automaticky.</translation> </message> @@ -46329,46 +46329,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>
--- a/i18n/eric6_de.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_de.ts Thu Feb 04 18:40:04 2016 +0100 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1853,8 +1852,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -1922,8 +1921,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -7812,22 +7811,22 @@ <translation>Gib Pfadnamen getrennt durch ";" ein</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>Wähle eine zu öffnende Datei aus</translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="468"/> + <location filename="../E5Gui/E5PathPicker.py" line="502"/> <source>Choose files to open</source> <translation>Wähle zu öffnende Dateien aus</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>Wähle eine zu schreibende Datei aus</translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="474"/> + <location filename="../E5Gui/E5PathPicker.py" line="508"/> <source>Choose a directory</source> <translation>Wähle ein Verzeichnis aus</translation> </message> @@ -16296,8 +16295,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1183"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1256"/> @@ -16877,32 +16876,32 @@ <translation>Lesezeichen für alle Tabs</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>Lade...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>Seite geladen</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>Fehler beim Laden</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>Möchten Sie das Fenster wirklich schließen?</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> @@ -16913,17 +16912,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>Schl&ießen</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>B&eenden</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation>A&ktuelles Unterfenster schließen</translation> </message> @@ -16943,37 +16942,37 @@ <translation>Geschlossenen Tabs wiederherstellen</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation>Alle geschlossenen Tabs wiederherstellen</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation>Liste löschen</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source>eric6 Web Browser</source> <translation>eric6-Webbrowser</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><p>Drucken ist wegen eine Fehlers in PyQt5 nicht verfügbar. Bitte aktualisieren.</p></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><p>Drucken ist wegen eine Fehlers in PyQt5 nicht verfügbar. Bitte aktualisieren.</p></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>Soll diese Seite wirklich geschlossen werden?</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>Diese Seite wurde geändert und beim Schließen würde diese Änderung verloren gehen. @@ -45798,17 +45797,17 @@ <translation><b>Qt-Einstellungen</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Qt-Werkzeuge</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>Dies gibt ein Beispiel für den vollständigen Werkzeugnamen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>designer</translation> </message> @@ -45818,7 +45817,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="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>Der Werkzeugname wird aus dem Präfix, dem Werkzeugnamen und dem Anhängsel gebildet. Bei Windows wird die Erweiterung automatisch angehängt.</translation> </message> @@ -45834,46 +45833,56 @@ </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><b>Hinweis:</b> Lassen Sie diesen Eintrag leer, um die Umgebungsvariable QT4TRANSLATIONSDIR oder den in die Qt Bibliothek eincompilierten Pfad zu verwenden.</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><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="100"/> <source>Qt-Prefix:</source> <translation>Qt-Präfix:</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>Gib das Präfix für den Qt-Werkzeugnamen ein</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> <source>Qt-Postfix:</source> <translation>Qt-Anhängsel:</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>Gib das Anhängsel für den Qt-Werkzeugnamen ein</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>pyuic / pyside-uic Optionen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="148"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/> <source>Indent Width:</source> <translation>Einrückungstiefe:</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>Wähle die Einrücktiefe (Standard: 4)</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>Erzeuge Imports relativ zu '.'</translation> </message>
--- 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>
--- a/i18n/eric6_es.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_es.ts Thu Feb 04 18:40:04 2016 +0100 @@ -8028,22 +8028,22 @@ <translation>Introducir Nombres de Ruta separados por ';'</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>Elegir un archivo para abrir</translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="468"/> + <location filename="../E5Gui/E5PathPicker.py" line="502"/> <source>Choose files to open</source> <translation>Elegir archivos a abrir</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>Elegir un archivo para guardar</translation> </message> <message> - <location filename="../E5Gui/E5PathPicker.py" line="474"/> + <location filename="../E5Gui/E5PathPicker.py" line="508"/> <source>Choose a directory</source> <translation>Elegir un directorio</translation> </message> @@ -17303,32 +17303,32 @@ <translation>Todas las Pestañas a Marcadores</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>Cargando...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>Carga terminada</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>Ha fallado la carga</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>¿Realmente desea cerrar la ventana?</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> @@ -17339,17 +17339,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>&Salir</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation>Cerrar Pestaña Actua&l</translation> </message> @@ -17369,37 +17369,37 @@ <translation>Restaurar Pestaña Cerrada</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation>Restaurar Todas las Pestañas Cerradas</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation>Borrar Lista</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source>eric6 Web Browser</source> <translation>Navegador Web de eric6</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><p>Imprimir no esta disponible debido a un bug en PyQt5. Por favor, actualice su versión.</p></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><p>Imprimir no esta disponible debido a un bug en PyQt5. Por favor, actualice su versión.</p></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>¿Realmente desea cerrar esta página?</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>La página ha sido modificada y si se cierra ahora se perderán todos los cambios. @@ -46411,17 +46411,17 @@ <translation><b>Configurar Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Herramientas Qt</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>Proporciona un ejemplo del nombre completo de la herramienta</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>designer</translation> </message> @@ -46436,7 +46436,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="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>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> @@ -46457,46 +46457,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><b>Nota</b>: Dejar en blanco para utilizar la variable de entorno QT4TRANSLATIONSDIR o la ruta compilada en la biblioteca de Qt.</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"><b>Nota</b>: Dejar en blanco para utilizar la variable de entorno QT4TRANSLATIONSDIR o la ruta compilada en la biblioteca de Qt.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="100"/> <source>Qt-Prefix:</source> <translation>Prefijo de Qt:</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>Introducir el prefijo para nombre de las herramientas Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> <source>Qt-Postfix:</source> <translation>Postfijo de Qt:</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>Introducir el postfijo para nombre de las herramientas Qt</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>Opciones de pyuic / pyside-uic</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="148"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/> <source>Indent Width:</source> <translation>Ancho de indentación:</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>Seleccionar el ancho de indentación (valor por defecto: 4)</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>Generar imports relativos a '.'</translation> </message>
--- a/i18n/eric6_fr.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_fr.ts Thu Feb 04 18:40:04 2016 +0100 @@ -8004,22 +8004,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> @@ -17246,32 +17246,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 type="unfinished"> @@ -17280,17 +17280,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation type="unfinished">&Fermer</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation type="unfinished">&Quitter</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> @@ -17310,37 +17310,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"><p>L'impression n'est pas disponible à cause d'un bug de PyQt4. Merci de mettre à jour PyQt.</p> {5.?}</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> @@ -46296,17 +46296,17 @@ <translation><b>Configuration de Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Outils Qt</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>Ceci donne un exemple d'un nom complet d'outil Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>designer</translation> </message> @@ -46316,7 +46316,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="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> @@ -46332,46 +46332,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>
--- a/i18n/eric6_it.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_it.ts Thu Feb 04 18:40:04 2016 +0100 @@ -8081,22 +8081,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> @@ -17374,32 +17374,32 @@ <translation>Aggiungi ai segnalibri tutte le linguette</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>Caricamento...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>Caricamento terminato</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>Caricamento fallito</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>Sei sicuro di voler chiudere la finestra ?</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> @@ -17410,17 +17410,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>&Chiudi</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>&Esci</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation>C&hiudi scheda corrente</translation> </message> @@ -17440,37 +17440,37 @@ <translation>Ricarica scheda chiusa</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation>Ricarica tutte le schede chiuse</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation>Pulisci lista</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">Web Browser di eric5 {6 ?}</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"><p>La stampa non è disponibile a causa di un bug in PyQt4. Si consiglia di aggiornare la versione installata.</p> {5.?}</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"><p>La stampa non è disponibile a causa di un bug in PyQt4. Si consiglia di aggiornare la versione installata.</p> {5.?}</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> @@ -46478,17 +46478,17 @@ <translation><b>Configura Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Qt Tools</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>Fa un esempio del nome completo del tool</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>designer</translation> </message> @@ -46498,7 +46498,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="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>L'eseguibile del tool e' composto dal predisso, il nome del tool e il suffizzo. Per win, l'estensione è aggiunta automaticamente.</translation> </message> @@ -46514,46 +46514,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>
--- a/i18n/eric6_pt.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_pt.ts Thu Feb 04 18:40:04 2016 +0100 @@ -8046,22 +8046,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> @@ -17336,32 +17336,32 @@ <translation>Marcar Todos os Separadores</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>Carregando...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>Acabou de carregar</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>Falhou ao carregar</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>Tem a certeza de que quer fechar a janela?</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> @@ -17372,17 +17372,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>Fe&char</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>Sai&r</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation>F&echar o Separador Atual</translation> </message> @@ -17402,37 +17402,37 @@ <translation>Restaurar o Separador Fechado</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation>Restaurar Todos os Separadores Fechados</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation>Limpar Lista</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source>eric6 Web Browser</source> <translation>Navegador Web de eric6</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><p>Imprimir não está disponível devido a um falho em PyQt5. Por favor atualize.</p></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><p>Imprimir não está disponível devido a um falho em PyQt5.Por favor atualize.</p></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> @@ -46267,22 +46267,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="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Ferramentas Qt</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> @@ -46298,46 +46298,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>Prefixo de Qt:</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>Sufixo de Qt:</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>
--- a/i18n/eric6_ru.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_ru.ts Thu Feb 04 18:40:04 2016 +0100 @@ -8078,22 +8078,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> @@ -17362,32 +17362,32 @@ <translation>Создать закладки для всех открытых страниц</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>Загружаю...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>Загрука не удалась</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>Вы действительно хотите закрыть это окно?</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> @@ -17400,17 +17400,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation>&Закрыть текущую закладку</translation> </message> @@ -17430,37 +17430,37 @@ <translation>Восстановить закрытые вкладки</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation>Восстановить все закрытые вкладки</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation>Очистить список</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source>eric6 Web Browser</source> <translation>WEB просмотрщик встроенный в Eric</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><p>Печать невозможна из-за ошибки в PyQt5. Пожалуйста установите обновление.</p></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><p>Печать невозможна из-за ошибки в PyQt4. Пожалуйста установите обновление.</p></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> @@ -46592,17 +46592,17 @@ <translation><b>Настроить Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Утилиты Qt</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>Предпросмотр полного имени утилиты</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>designer</translation> </message> @@ -46612,7 +46612,7 @@ <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></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>Имя исполняемого файла для утилиты состоит из префикса, имени утилиты и постфикса. В win32 автоматически добавляется расширение.</translation> </message> @@ -46633,46 +46633,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><b>Примечание:</b> Оставьте это поле пустым чтобы использовалось значение переменной окружения QT4TRANSLATIONSDIR или значение сохранённое в Qt библиотеке при компиляции.</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"><b>Примечание:</b> Оставьте это поле пустым чтобы использовалось значение переменной окружения QT4TRANSLATIONSDIR или значение сохранённое в Qt библиотеке при компиляции.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="100"/> <source>Qt-Prefix:</source> <translation>Qt-Префикс:</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>Задайте префикс для инструментов Qt</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> <source>Qt-Postfix:</source> <translation>Qt-постфикс:</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>Задайте постфикс для инструментов Qt</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>pyuic / pyside-uic параметры</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="148"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/> <source>Indent Width:</source> <translation>Ширина отступа:</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>Задайте ширину отступа (по умолчанию: 4)</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>Генерировать импорт относительно '.'</translation> </message>
--- a/i18n/eric6_tr.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_tr.ts Thu Feb 04 18:40:04 2016 +0100 @@ -7994,22 +7994,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> @@ -17219,32 +17219,32 @@ <translation>Tüm Sekmeleri Yerimi yap</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>Yükleniyor...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>Yükleme bitirildi</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>Yüklerken başarısız olundu</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 type="unfinished"> @@ -17253,17 +17253,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>&Kapat</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>&Çıkış</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> @@ -17283,37 +17283,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">Eric5 Web Gözatıcısı {6 ?}</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"><p>PyQt4 te hatyı yazdırmak tam olarak mümkün değil. Lütfen güncelleyiniz.</p> {5.?}</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> @@ -46128,22 +46128,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="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>QT Araçları</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>ç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="129"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="134"/> <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="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>dizayncı</translation> </message> @@ -46164,46 +46164,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>
--- a/i18n/eric6_zh_CN.ts Wed Feb 03 19:44:28 2016 +0100 +++ b/i18n/eric6_zh_CN.ts Thu Feb 04 18:40:04 2016 +0100 @@ -11034,6 +11034,11 @@ <source>Press to show only monospaced fonts</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> + <source>Monospaced Fonts Only</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -17199,32 +17204,32 @@ <translation>将所有选项卡加入书签</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="350"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="357"/> <source>...</source> <translation>…</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="759"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="767"/> <source>Loading...</source> <translation>正在加载…</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="780"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="788"/> <source>Finished loading</source> <translation>加载完成</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="782"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="790"/> <source>Failed to load</source> <translation>加载失败</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>确定要关闭窗口？</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> @@ -17233,17 +17238,17 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="830"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="838"/> <source>&Close</source> <translation>关闭(&C)</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="834"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="842"/> <source>&Quit</source> <translation>退出(&Q)</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="837"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="845"/> <source>C&lose Current Tab</source> <translation>关闭当前选项卡(&C)</translation> </message> @@ -17263,37 +17268,37 @@ <translation>恢复已关闭的选项卡</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="994"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1002"/> <source>Restore All Closed Tabs</source> <translation>恢复所有已关闭的选项卡</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="996"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="1004"/> <source>Clear List</source> <translation>清空列表</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="658"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="666"/> <source>eric6 Web Browser</source> <translation>eric6 网页浏览器</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><p>打印功能因为 PyQt5 中存在的一个错误而无法使用。请进行升级。</p></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><p>打印功能因为 PyQt5 中存在的一个错误而无法使用。请进行升级。</p></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>确定要关闭本页面？</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>您在本页面中进行了编辑，编辑内容将在您关闭页面时丢失。 @@ -46218,17 +46223,17 @@ <translation><b>配置 Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="84"/> <source>Qt Tools</source> <translation>Qt 工具</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>这里给出了完整工具名称的一个范例</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="137"/> <source>designer</source> <translation>设计师</translation> </message> @@ -46243,7 +46248,7 @@ <translation><font color="#FF0000"><b>注意：</b> 该设置将在下次启动应用程序时生效。</font></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> @@ -46259,46 +46264,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>pyuic / pyside-uic 选项</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="148"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/> <source>Indent Width:</source> <translation>缩进宽度：</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>缩进宽度（默认值：4）</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>
