--- a/i18n/eric5_en.ts Fri Sep 13 18:49:26 2013 +0200 +++ b/i18n/eric5_en.ts Sat Sep 14 13:29:32 2013 +0200 @@ -11547,52 +11547,52 @@ <context> <name>EditorSyntaxPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="40"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="55"/> <source>Select to enable the online syntax checker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="43"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="58"/> <source><b>Online Syntax Check</b><p>Select this to enable syntax checks while typing. The check is performed, if typing is interrupted for the configured timeout period.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="61"/> + <source>Online Syntax Check</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="70"/> + <source>Timeout Interval:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="77"/> + <source>Enter the timeout for the online syntax checker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="80"/> + <source><b>Timeout Interval</b><p>Enter the timeout interval for the online syntax check. The check is performed, if typing is interrupted for the configured timeout period.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="46"/> - <source>Online Syntax Check</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="55"/> - <source>Timeout Interval:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="62"/> - <source>Enter the timeout for the online syntax checker</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="65"/> - <source><b>Timeout Interval</b><p>Enter the timeout interval for the online syntax check. The check is performed, if typing is interrupted for the configured timeout period.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="109"/> <source>Automatic Syntax Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="40"/> <source>Select, whether source files should be checked automatically for syntax errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="43"/> <source><b>Automatic Syntax Check</b><p>Select to enable the automatic syntax checker. The syntax is checked, when a file is loaded or saved or the programming language of the editor is selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="74"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="89"/> <source> s</source> <translation type="unfinished"></translation> </message> @@ -11602,27 +11602,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="119"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="115"/> <source>PyFlakes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="125"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="121"/> <source>Select to include a PyFlakes check after the syntax check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="128"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="124"/> <source>Include PyFlakes Checks after syntax check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="131"/> <source>Select to suppress star import warnings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="138"/> + <location filename="../Preferences/ConfigurationPages/EditorSyntaxPage.ui" line="134"/> <source>Suppress star import warnings</source> <translation type="unfinished"></translation> </message> @@ -31565,34 +31565,29 @@ <context> <name>Pep8CheckerPlugin</name> <message> - <location filename="../Plugins/PluginPep8Checker.py" line="168"/> - <source>Check PEP 8 Compliance</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/PluginPep8Checker.py" line="168"/> - <source>PEP &8 Compliance...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/PluginPep8Checker.py" line="78"/> + <location filename="../Plugins/PluginPep8Checker.py" line="81"/> <source>Check PEP 8 compliance.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/PluginPep8Checker.py" line="172"/> - <source><b>Check PEP 8 Compliance...</b><p>This checks Python files for compliance to the conventions given in PEP 8.</p></source> + <source>Check Code Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginPep8Checker.py" line="172"/> + <source>&Code Style...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/PluginPep8Checker.py" line="176"/> + <source><b>Check Code Style...</b><p>This checks Python files for compliance to the code style conventions given in various PEPs.</p></source> <translation type="unfinished"></translation> </message> </context> <context> <name>Pep8CodeSelectionDialog</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.ui" line="14"/> - <source>PEP 8 Message Codes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.ui" line="23"/> <source>Select the message codes from the list:</source> <translation type="unfinished"></translation> @@ -31612,22 +31607,15 @@ <source>Message</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8CodeSelectionDialog.ui" line="14"/> + <source>Code Style Message Codes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Dialog</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="14"/> - <source>PEP 8 Check Result</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="17"/> - <source><b>PEP 8 Check Results</b> -<p>This dialog shows the results of the PEP 8 check. Double clicking an -entry will open an editor window and position the cursor at the respective line and position.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="37"/> <source>Exclude Files:</source> <translation type="unfinished"></translation> @@ -31638,11 +31626,6 @@ <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> @@ -31668,14 +31651,6 @@ <translation type="unfinished"></translation> </message> <message> - <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 -the respective line and position.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="353"/> <source>File/Line</source> <translation type="unfinished"></translation> @@ -31691,11 +31666,6 @@ <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> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.py" line="94"/> <source>Show</source> <translation type="unfinished"></translation> @@ -31840,16 +31810,41 @@ <source>Reset Defaults</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="14"/> + <source>Code Style Check Result</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="17"/> + <source><b>Code Style Check Results</b> +<p>This dialog shows the results of the code style check. Double clicking an +entry will open an editor window and position the cursor at the respective line and position.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="63"/> + <source>Press to start the code style check run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="337"/> + <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 +the respective line and position.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Dialog.ui" line="371"/> + <source>Shows the progress of the style check check</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8Fixer</name> <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="161"/> - <source>Fix PEP 8 issues</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="161"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -31999,6 +31994,11 @@ <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8Fixer.py" line="161"/> + <source>Fix Code Style Issues</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Pep8NamingChecker</name> @@ -32073,7 +32073,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8NamingChecker.py" line="110"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8NamingChecker.py" line="133"/> <source>no message for this code defined</source> <translation type="unfinished"></translation> </message> @@ -32094,11 +32094,6 @@ <context> <name>Pep8StatisticsDialog</name> <message> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.ui" line="14"/> - <source>PEP 8 Statistics</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.ui" line="30"/> <source>Count</source> <translation type="unfinished"></translation> @@ -32114,7 +32109,7 @@ <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="62"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="63"/> <source>%n issue(s) found</source> <translation> <numerusform>%n issue found</numerusform> @@ -32122,7 +32117,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="66"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="67"/> <source>%n file(s) checked</source> <translation> <numerusform>%n file checked</numerusform> @@ -32130,7 +32125,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="69"/> <source>%n file(s) with issues found</source> <translation> <numerusform>%n file with issues found</numerusform> @@ -32138,13 +32133,18 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="64"/> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.py" line="65"/> <source>%n issue(s) fixed</source> <translation> <numerusform>%n issue fixed</numerusform> <numerusform>%n issues fixed</numerusform> </translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/Pep8/Pep8StatisticsDialog.ui" line="14"/> + <source>Code Styel Checker Statistics</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PersonalDataDialog</name>