--- a/i18n/eric6_en.ts Fri Oct 03 16:39:04 2014 +0200 +++ b/i18n/eric6_en.ts Fri Oct 03 16:44:17 2014 +0200 @@ -1380,37 +1380,37 @@ <context> <name>BackgroundService</name> <message> - <location filename="../Utilities/BackgroundService.py" line="118"/> + <location filename="../Utilities/BackgroundService.py" line="119"/> <source>{0} not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="165"/> + <location filename="../Utilities/BackgroundService.py" line="166"/> <source>Restart background client?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="190"/> + <location filename="../Utilities/BackgroundService.py" line="191"/> <source>An error in Erics background client stopped the service.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="357"/> + <location filename="../Utilities/BackgroundService.py" line="358"/> <source>Erics background client disconnected because of an unknown reason.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="363"/> + <location filename="../Utilities/BackgroundService.py" line="364"/> <source>Background client disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="363"/> + <location filename="../Utilities/BackgroundService.py" line="364"/> <source>The background client for <b>{0}</b> disconnect because of an unknown reason.<br>Should it be restarted?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Utilities/BackgroundService.py" line="165"/> + <location filename="../Utilities/BackgroundService.py" line="166"/> <source><p>The background client for <b>{0}</b> has stopped due to an exception. It's used by various plug-ins like the different checkers.</p><p>Select<ul><li><b>'Yes'</b> to restart the client, but abort the last job</li><li><b>'Retry'</b> to restart the client and the last job</li><li><b>'No'</b> to leave the client off.</li></ul></p><p>Note: The client can be restarted by opening and accepting the preferences dialog or reloading/changing the project.</p></source> <translation type="unfinished"></translation> </message> @@ -32637,32 +32637,32 @@ <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="293"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="299"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="294"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="300"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="295"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="307"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="313"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="310"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="208"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="214"/> <source>Not categorized</source> <translation type="unfinished"></translation> </message> @@ -35083,27 +35083,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1168"/> + <location filename="../Preferences/__init__.py" line="1170"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1196"/> + <location filename="../Preferences/__init__.py" line="1198"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1196"/> + <location filename="../Preferences/__init__.py" line="1198"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1298"/> + <location filename="../Preferences/__init__.py" line="1300"/> <source>Select Python{0} Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1298"/> + <location filename="../Preferences/__init__.py" line="1300"/> <source>Select the Python{0} interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -36825,287 +36825,287 @@ <context> <name>ProjectFormsBrowser</name> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="942"/> + <location filename="../Project/ProjectFormsBrowser.py" line="949"/> <source>Forms</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="77"/> + <location filename="../Project/ProjectFormsBrowser.py" line="79"/> <source><b>Project Forms Browser</b><p>This allows to easily see all forms contained in the current project. Several actions can be executed via the context menu.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="96"/> - <source>Dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/ProjectFormsBrowser.py" line="97"/> - <source>Widget</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/ProjectFormsBrowser.py" line="98"/> - <source>Main Window</source> + <source>Dialog</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="99"/> - <source>Dialog with Buttonbox (Bottom)</source> + <source>Widget</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="100"/> - <source>Dialog with Buttonbox (Right)</source> + <source>Main Window</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="101"/> - <source>Dialog with Buttons (Bottom)</source> + <source>Dialog with Buttonbox (Bottom)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="102"/> - <source>Dialog with Buttons (Bottom-Center)</source> + <source>Dialog with Buttonbox (Right)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="103"/> + <source>Dialog with Buttons (Bottom)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="104"/> + <source>Dialog with Buttons (Bottom-Center)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="105"/> <source>Dialog with Buttons (Right)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="152"/> + <location filename="../Project/ProjectFormsBrowser.py" line="154"/> <source>Compile form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="330"/> + <location filename="../Project/ProjectFormsBrowser.py" line="332"/> <source>Compile all forms</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="163"/> + <location filename="../Project/ProjectFormsBrowser.py" line="165"/> <source>Generate Dialog Code...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="241"/> - <source>Open in Qt-Designer</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/ProjectFormsBrowser.py" line="243"/> + <source>Open in Qt-Designer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="245"/> <source>Open in Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="147"/> + <location filename="../Project/ProjectFormsBrowser.py" line="149"/> <source>Preview form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="246"/> + <location filename="../Project/ProjectFormsBrowser.py" line="248"/> <source>Preview translations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="260"/> + <location filename="../Project/ProjectFormsBrowser.py" line="262"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="178"/> + <location filename="../Project/ProjectFormsBrowser.py" line="180"/> <source>Rename file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="291"/> + <location filename="../Project/ProjectFormsBrowser.py" line="293"/> <source>Remove from project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="294"/> + <location filename="../Project/ProjectFormsBrowser.py" line="296"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="303"/> + <location filename="../Project/ProjectFormsBrowser.py" line="305"/> <source>New form...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="336"/> - <source>Add forms...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/ProjectFormsBrowser.py" line="338"/> + <source>Add forms...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="340"/> <source>Add forms directory...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="312"/> + <location filename="../Project/ProjectFormsBrowser.py" line="314"/> <source>Copy Path to Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="341"/> - <source>Expand all directories</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/ProjectFormsBrowser.py" line="343"/> + <source>Expand all directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="345"/> <source>Collapse all directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="346"/> + <location filename="../Project/ProjectFormsBrowser.py" line="348"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="250"/> + <location filename="../Project/ProjectFormsBrowser.py" line="252"/> <source>Compile forms</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="597"/> + <location filename="../Project/ProjectFormsBrowser.py" line="599"/> <source>New Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="552"/> + <location filename="../Project/ProjectFormsBrowser.py" line="554"/> <source>Select a form type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="566"/> + <location filename="../Project/ProjectFormsBrowser.py" line="568"/> <source>Qt User-Interface Files (*.ui);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="585"/> + <location filename="../Project/ProjectFormsBrowser.py" line="587"/> <source>The file already exists! Overwrite it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="597"/> + <location filename="../Project/ProjectFormsBrowser.py" line="599"/> <source><p>The new form file <b>{0}</b> could not be created.<br>Problem: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="624"/> + <location filename="../Project/ProjectFormsBrowser.py" line="626"/> <source>Delete forms</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="624"/> + <location filename="../Project/ProjectFormsBrowser.py" line="626"/> <source>Do you really want to delete these forms from the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="729"/> + <location filename="../Project/ProjectFormsBrowser.py" line="731"/> <source>Form Compilation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="701"/> + <location filename="../Project/ProjectFormsBrowser.py" line="703"/> <source>The compilation of the form file was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="716"/> + <location filename="../Project/ProjectFormsBrowser.py" line="718"/> <source><p>The compilation of the form file failed.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="729"/> + <location filename="../Project/ProjectFormsBrowser.py" line="731"/> <source>The compilation of the form file failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="808"/> + <location filename="../Project/ProjectFormsBrowser.py" line="815"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="808"/> + <location filename="../Project/ProjectFormsBrowser.py" line="815"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="900"/> + <location filename="../Project/ProjectFormsBrowser.py" line="907"/> <source>Compiling forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="900"/> + <location filename="../Project/ProjectFormsBrowser.py" line="907"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="938"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>Determining changed forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="967"/> + <location filename="../Project/ProjectFormsBrowser.py" line="974"/> <source>Compiling changed forms...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="105"/> - <source>QWizard</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/ProjectFormsBrowser.py" line="106"/> - <source>QWizardPage</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/ProjectFormsBrowser.py" line="107"/> - <source>QDockWidget</source> + <source>QWizard</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="108"/> - <source>QFrame</source> + <source>QWizardPage</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="109"/> - <source>QGroupBox</source> + <source>QDockWidget</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="110"/> - <source>QScrollArea</source> + <source>QFrame</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="111"/> - <source>QMdiArea</source> + <source>QGroupBox</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="112"/> - <source>QTabWidget</source> + <source>QScrollArea</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="113"/> - <source>QToolBox</source> + <source>QMdiArea</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/ProjectFormsBrowser.py" line="114"/> + <source>QTabWidget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="115"/> + <source>QToolBox</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectFormsBrowser.py" line="116"/> <source>QStackedWidget</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/ProjectFormsBrowser.py" line="938"/> + <location filename="../Project/ProjectFormsBrowser.py" line="945"/> <source>%v/%m Forms</source> <translation type="unfinished"></translation> </message> @@ -42618,7 +42618,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="60"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="66"/> <source>Select Qt4 Translations Directory</source> <translation type="unfinished"></translation> </message> @@ -42662,6 +42662,26 @@ <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="140"/> + <source>pyuic / pyside-uic Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="146"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="153"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="185"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -57660,7 +57680,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1245"/> + <location filename="../Utilities/__init__.py" line="1326"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation type="unfinished"></translation> </message>