--- a/i18n/eric5_en.ts Wed Sep 04 19:34:40 2013 +0200 +++ b/i18n/eric5_en.ts Wed Sep 04 19:36:57 2013 +0200 @@ -31593,47 +31593,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="34"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="37"/> <source>Exclude Files:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="41"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="44"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="60"/> - <source>Press to start the PEP 8 check run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="63"/> + <source>Press to start the PEP 8 check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="66"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="128"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="217"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="337"/> <source><b>Result List</b> <p>This list shows the results of the PEP 8 check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -31641,22 +31641,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="353"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="345"/> - <source>Code</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="350"/> - <source>Message</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> + <source>Code</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="363"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="371"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -31681,37 +31681,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="135"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="159"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to load the default values</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <source>Press to load the default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="99"/> <source>Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="103"/> - <source>Press to store the current values as defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="106"/> + <source>Press to store the current values as defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="109"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="152"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -31726,130 +31726,140 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="214"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="176"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="183"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="309"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="312"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="762"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="224"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="233"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="269"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="272"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="70"/> - <source>Press to fix the selected issues</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="73"/> + <source>Press to fix the selected issues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="76"/> <source>Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="200"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="207"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="116"/> + <source>Press to reset the default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="119"/> + <source>Reset Defaults</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="157"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="157"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="453"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1079"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1092"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1111"/> <source>Superfluous trailing blank lines removed from end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1125"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="891"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="866"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="795"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="837"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n blank line inserted.</numerusform> @@ -31857,7 +31867,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="839"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n superfluous line removed</numerusform> @@ -31865,90 +31875,95 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="724"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="758"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="455"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="459"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="696"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="777"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="923"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="975"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1031"/> <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1065"/> <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="482"/> <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="484"/> <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="514"/> <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="546"/> <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="574"/> <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="605"/> <source>Indentation level of hanging indentation changed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="653"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> + <source>Long lines have been shortened.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Py2Checker</name>