--- a/i18n/eric6_en.ts Wed Sep 02 18:46:11 2015 +0200 +++ b/i18n/eric6_en.ts Wed Sep 02 20:16:28 2015 +0200 @@ -2896,162 +2896,162 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="46"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="34"/> <source>Exclude Files:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="53"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="41"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="72"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="60"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="75"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="63"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="82"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="70"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="73"/> <source>Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="105"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="93"/> <source>Press to load the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="108"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="96"/> <source>Load Defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="115"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="103"/> <source>Press to store the current values as defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="118"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> <source>Store Defaults</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="113"/> + <source>Press to reset the default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="116"/> + <source>Reset Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> - <source>Press to reset the default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="128"/> - <source>Reset Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="137"/> <source>Exclude Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="144"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="132"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="214"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="202"/> <source>Press to select the message codes from a list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="158"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="146"/> <source>Included Messages:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="165"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="153"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="167"/> <source>Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="186"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="174"/> <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/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="200"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="188"/> <source>Don't Fix Issues:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="207"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="195"/> <source>Enter message codes of issues not to be fixed automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="221"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="209"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="230"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="218"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="264"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="252"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="273"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="261"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="297"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="285"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="300"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="288"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="324"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="355"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="327"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="358"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="337"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="368"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="340"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="371"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="378"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3059,17 +3059,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="394"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="399"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="435"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -3104,7 +3104,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="464"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="468"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> @@ -3114,40 +3114,50 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="587"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="591"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="425"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="456"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="434"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="465"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="350"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="381"/> <source>Select to show ignored issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="353"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="384"/> <source>Show ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="540"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="544"/> <source>{0} (ignored)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="449"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="453"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="310"/> + <source>Max. Complexity:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="319"/> + <source>Enter the maximum allowed code complexity (McCabe: 10)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>CodeStyleCheckerPlugin</name> @@ -3213,147 +3223,147 @@ <context> <name>CodeStyleFixer</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="375"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> <source>Triple single quotes converted to triple double quotes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> - <source>Introductory quotes corrected to be {0}"""</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>Single line docstring put on one line.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>Period added to summary line.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="411"/> - <source>Blank line before function/method docstring removed.</source> + <source>Introductory quotes corrected to be {0}"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> + <source>Single line docstring put on one line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>Blank line inserted before class docstring.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> - <source>Blank line inserted after class docstring.</source> + <source>Period added to summary line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="417"/> + <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> - <source>Blank line inserted after docstring summary.</source> + <source>Blank line inserted before class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="399"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="402"/> - <source>Leading quotes put on separate line.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="405"/> - <source>Trailing quotes put on separate line.</source> + <source>Blank line inserted after last paragraph of docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="408"/> - <source>Blank line before class docstring removed.</source> + <source>Leading quotes put on separate line.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="411"/> + <source>Trailing quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="414"/> - <source>Blank line after class docstring removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="417"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="420"/> - <source>Blank line after last paragraph removed.</source> + <source>Blank line after class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> - <source>Tab converted to 4 spaces.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> - <source>Indentation of continuation line corrected.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>Indentation of closing bracket corrected.</source> + <source>Indentation adjusted to be a multiple of four.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>Indentation level changed.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>Indentation level of hanging indentation changed.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> + <source>Indentation level changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> + <source>Indentation level of hanging indentation changed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> <source>Extraneous whitespace removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>Missing whitespace added.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> + <source>Missing whitespace added.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="472"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="478"/> <source>%n blank line(s) inserted.</source> <translation> <numerusform>%n blank line inserted.</numerusform> @@ -3361,7 +3371,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="475"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="481"/> <source>%n superfluous lines removed</source> <translation> <numerusform>%n superfluous line removed</numerusform> @@ -3369,77 +3379,77 @@ </translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="479"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="485"/> <source>Superfluous blank lines removed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="482"/> - <source>Superfluous blank lines after function decorator removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="485"/> - <source>Imports were put on separate lines.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="488"/> - <source>Long lines have been shortened.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="491"/> - <source>Redundant backslash in brackets removed.</source> + <source>Imports were put on separate lines.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <source>Long lines have been shortened.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Compound statement corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Comparison to None/True/False corrected.</source> + <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> - <source>'{0}' argument added.</source> + <source>Compound statement corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> - <source>'{0}' argument removed.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> - <source>Whitespace stripped from end of line.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>newline added to end of file.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Superfluous trailing blank lines removed from end of file.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> + <source>newline added to end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="521"/> + <source>Superfluous trailing blank lines removed from end of file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="522"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="528"/> <source>Could not save the file! Skipping it. Reason: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="576"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="582"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -8667,7 +8677,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7201"/> + <location filename="../QScintilla/Editor.py" line="7202"/> <source>Check spelling...</source> <translation type="unfinished"></translation> </message> @@ -9087,252 +9097,252 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5490"/> + <location filename="../QScintilla/Editor.py" line="5491"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5490"/> + <location filename="../QScintilla/Editor.py" line="5491"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5557"/> + <location filename="../QScintilla/Editor.py" line="5558"/> <source>Show Code Coverage Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5550"/> + <location filename="../QScintilla/Editor.py" line="5551"/> <source>All lines have been covered.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5557"/> + <location filename="../QScintilla/Editor.py" line="5558"/> <source>There is no coverage file available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5672"/> + <location filename="../QScintilla/Editor.py" line="5673"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5672"/> + <location filename="../QScintilla/Editor.py" line="5673"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5832"/> + <location filename="../QScintilla/Editor.py" line="5833"/> <source>Syntax Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5832"/> + <location filename="../QScintilla/Editor.py" line="5833"/> <source>No syntax error message available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6147"/> + <location filename="../QScintilla/Editor.py" line="6148"/> <source>Macro Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6147"/> + <location filename="../QScintilla/Editor.py" line="6148"/> <source>Select a macro name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6175"/> + <location filename="../QScintilla/Editor.py" line="6176"/> <source>Load macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6218"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Macro files (*.macro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6198"/> + <location filename="../QScintilla/Editor.py" line="6199"/> <source>Error loading macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6189"/> + <location filename="../QScintilla/Editor.py" line="6190"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6198"/> + <location filename="../QScintilla/Editor.py" line="6199"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6218"/> + <location filename="../QScintilla/Editor.py" line="6219"/> <source>Save macro file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6236"/> <source>Save macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6235"/> + <location filename="../QScintilla/Editor.py" line="6236"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6251"/> + <location filename="../QScintilla/Editor.py" line="6252"/> <source>Error saving macro</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6251"/> + <location filename="../QScintilla/Editor.py" line="6252"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6264"/> + <location filename="../QScintilla/Editor.py" line="6265"/> <source>Start Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6264"/> + <location filename="../QScintilla/Editor.py" line="6265"/> <source>Macro recording is already active. Start new?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6290"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>Macro Recording</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6290"/> + <location filename="../QScintilla/Editor.py" line="6291"/> <source>Enter name of the macro:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6426"/> + <location filename="../QScintilla/Editor.py" line="6427"/> <source>File changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6588"/> + <location filename="../QScintilla/Editor.py" line="6589"/> <source>{0} (ro)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6728"/> + <location filename="../QScintilla/Editor.py" line="6729"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6728"/> + <location filename="../QScintilla/Editor.py" line="6729"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6749"/> + <location filename="../QScintilla/Editor.py" line="6750"/> <source>Resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6751"/> + <location filename="../QScintilla/Editor.py" line="6752"/> <source>Add file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6753"/> + <location filename="../QScintilla/Editor.py" line="6754"/> <source>Add files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6755"/> + <location filename="../QScintilla/Editor.py" line="6756"/> <source>Add aliased file...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6758"/> + <location filename="../QScintilla/Editor.py" line="6759"/> <source>Add localized resource...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6762"/> + <location filename="../QScintilla/Editor.py" line="6763"/> <source>Add resource frame</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6781"/> + <location filename="../QScintilla/Editor.py" line="6782"/> <source>Add file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6797"/> + <location filename="../QScintilla/Editor.py" line="6798"/> <source>Add file resources</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6825"/> + <location filename="../QScintilla/Editor.py" line="6826"/> <source>Add aliased file resource</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6825"/> + <location filename="../QScintilla/Editor.py" line="6826"/> <source>Alias for file <b>{0}</b>:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6889"/> + <location filename="../QScintilla/Editor.py" line="6890"/> <source>Package Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6889"/> + <location filename="../QScintilla/Editor.py" line="6890"/> <source>Include class attributes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6909"/> + <location filename="../QScintilla/Editor.py" line="6910"/> <source>Imports Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6909"/> + <location filename="../QScintilla/Editor.py" line="6910"/> <source>Include imports from external modules?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6923"/> + <location filename="../QScintilla/Editor.py" line="6924"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6923"/> + <location filename="../QScintilla/Editor.py" line="6924"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7204"/> + <location filename="../QScintilla/Editor.py" line="7205"/> <source>Add to dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7206"/> + <location filename="../QScintilla/Editor.py" line="7207"/> <source>Ignore All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6086"/> + <location filename="../QScintilla/Editor.py" line="6087"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6093"/> + <location filename="../QScintilla/Editor.py" line="6094"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6422"/> + <location filename="../QScintilla/Editor.py" line="6423"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -9377,27 +9387,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7618"/> + <location filename="../QScintilla/Editor.py" line="7619"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7618"/> + <location filename="../QScintilla/Editor.py" line="7619"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6023"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6022"/> + <location filename="../QScintilla/Editor.py" line="6023"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6083"/> + <location filename="../QScintilla/Editor.py" line="6084"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -9422,7 +9432,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6416"/> + <location filename="../QScintilla/Editor.py" line="6417"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"></translation> </message> @@ -9457,12 +9467,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7705"/> + <location filename="../QScintilla/Editor.py" line="7706"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7705"/> + <location filename="../QScintilla/Editor.py" line="7706"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -32244,6 +32254,19 @@ </message> </context> <context> + <name>McCabeChecker</name> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="375"/> + <source>'{0}' is too complex ({1})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> + <source>{0}: {1}</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MercurialPage</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="17"/>