--- a/i18n/eric5_en.ts Wed Aug 28 19:53:35 2013 +0200 +++ b/i18n/eric5_en.ts Sat Aug 31 15:21:28 2013 +0200 @@ -31613,27 +31613,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="115"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="204"/> <source>...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="222"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="283"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="225"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="286"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="290"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="324"/> <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="306"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="311"/> + <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="316"/> + <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="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> <source>Shows the progress of the PEP 8 check action</source> <translation type="unfinished"></translation> </message> @@ -31671,47 +31671,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="356"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="420"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="453"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="112"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="122"/> <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="136"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="146"/> <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="83"/> - <source>Press to load the default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="86"/> - <source>Load Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="93"/> - <source>Press to store the current values as defaults</source> + <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="96"/> + <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>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="129"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="139"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> @@ -31726,110 +31726,130 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="167"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="201"/> <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="153"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="163"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="170"/> <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="235"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="238"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="740"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="177"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="211"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="220"/> <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="262"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="256"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="265"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="259"/> <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>Fix Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="187"/> + <source>Don't Fix Issues:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="194"/> + <source>Enter message codes of issues not to be fixed automatically</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <source>Fix PEP 8 issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="130"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="152"/> <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="250"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="383"/> <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="633"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="961"/> <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="646"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="974"/> <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="665"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="993"/> <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="679"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="1007"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="483"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="811"/> <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="458"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="786"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="395"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="715"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="429"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="757"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n blank line inserted.</numerusform> @@ -31837,7 +31857,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="431"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="759"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n superfluous line removed</numerusform> @@ -31845,53 +31865,88 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="324"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="644"/> <source>Missing whitespace added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="678"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="252"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="385"/> <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="255"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="388"/> <source>Fix for {0} failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="297"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="617"/> <source>Extraneous whitespace cannot be removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="697"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="515"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="843"/> <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="857"/> + <source>Redundant backslash in brackets removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="913"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="947"/> + <source>Comparison to None/True/False corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="411"/> + <source>Indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="413"/> + <source>Indentation of closing bracket corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="442"/> + <source>Missing indentation of continuation line corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="471"/> + <source>Closing bracket aligned to opening bracket.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="498"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="529"/> - <source>Redundant backslash in brackets removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="585"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="619"/> - <source>Comparison to None/True/False corrected.</source> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="575"/> + <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> </context>