--- a/i18n/eric5_en.ts Sun Sep 22 19:47:04 2013 +0200 +++ b/i18n/eric5_en.ts Mon Sep 23 19:32:25 2013 +0200 @@ -31565,105 +31565,160 @@ <context> <name>Pep257Checker</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="114"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="121"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="116"/> - <source>public function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="118"/> - <source>private function/method may be missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="121"/> - <source>public class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="123"/> - <source>private class may be missing a docstring</source> + <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="125"/> - <source>docstring not surrounded by """</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="127"/> - <source>docstring containing \ not surrounded by r"""</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="129"/> - <source>docstring containing unicode character not surrounded by u"""</source> + <source>private function/method may be missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="128"/> + <source>public class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="130"/> + <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="132"/> - <source>one-liner docstring on multiple lines</source> + <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="134"/> - <source>docstring has wrong indentation</source> + <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="136"/> + <source>docstring containing unicode character not surrounded by u"""</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="139"/> + <source>one-liner docstring on multiple lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="141"/> + <source>docstring has wrong indentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="177"/> <source>docstring summary does not end with a period</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="138"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="142"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="145"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="149"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="152"/> <source>docstring does not mention the return value type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="148"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="155"/> <source>function/method docstring is separated by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="151"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="158"/> <source>class docstring is not preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="154"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="161"/> <source>class docstring is not followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="157"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="197"/> <source>docstring summary is not followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="160"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="167"/> <source>last paragraph of docstring is not followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="296"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="380"/> <source>no message for this code defined</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="171"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="173"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="175"/> + <source>one-liner docstring not on three lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="179"/> + <source>docstring does not contain a @return line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="181"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="184"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="187"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="190"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="193"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="195"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep257Checker.py" line="200"/> + <source>last paragraph of docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8CheckerPlugin</name> @@ -31744,47 +31799,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="296"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="327"/> <source>Select to repeat each message type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="299"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="330"/> <source>Repeat messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="353"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="405"/> <source>File/Line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="358"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="410"/> <source>Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="363"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="415"/> <source>Message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="96"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="99"/> <source>Show</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="98"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="101"/> <source>Press to show all files containing an issue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="380"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="389"/> <source>Error: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="513"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="524"/> <source>No issues found.</source> <translation type="unfinished"></translation> </message> @@ -31824,12 +31879,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="91"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="94"/> <source>Statistics...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="93"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="96"/> <source>Press to show some statistics for the last run</source> <translation type="unfinished"></translation> </message> @@ -31849,17 +31904,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="309"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="340"/> <source>Select to fix some issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="312"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="343"/> <source>Fix issues automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="839"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="858"/> <source>Fix: {0}</source> <translation type="unfinished"></translation> </message> @@ -31874,12 +31929,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="269"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="300"/> <source>Select to allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="272"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="303"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> @@ -31931,7 +31986,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="337"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="389"/> <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 @@ -31939,10 +31994,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="371"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="423"/> <source>Shows the progress of the style check check</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="267"/> + <source>Docstring Type:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="276"/> + <source>Select the rule set for docstrings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="91"/> + <source>PEP-257</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="92"/> + <source>Eric</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> @@ -32229,12 +32304,12 @@ <context> <name>Pep8Py2Checker</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Checker.py" line="50"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Checker.py" line="54"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Checker.py" line="120"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Checker.py" line="126"/> <source>Python2 interpreter did not finish within 15s.</source> <translation type="unfinished"></translation> </message>