--- a/i18n/eric6_empty.ts Sun Feb 12 17:42:42 2017 +0100 +++ b/i18n/eric6_empty.ts Sun Feb 12 18:06:07 2017 +0100 @@ -390,7 +390,7 @@ <context> <name>AddBookmarkDialog</name> <message> - <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/> + <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/> <source>Add Bookmark</source> <translation type="unfinished"></translation> </message> @@ -1681,7 +1681,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/> + <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> @@ -2409,12 +2409,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="109"/> <source>From</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/CallTraceViewer.py" line="54"/> + <location filename="../Debugger/CallTraceViewer.ui" line="114"/> <source>To</source> <translation type="unfinished"></translation> </message> @@ -2517,7 +2517,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="513"/> + <location filename="../Cooperation/ChatWidget.ui" line="230"/> <source>Clear</source> <translation type="unfinished"></translation> </message> @@ -2862,7 +2862,7 @@ <context> <name>ClickToFlashWhitelistDialog</name> <message> - <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/> + <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/> <source>ClickToFlash Whitelist</source> <translation type="unfinished"></translation> </message> @@ -3480,231 +3480,231 @@ <context> <name>CodeStyleFixer</name> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="494"/> + <source>Triple single quotes converted to triple double quotes.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="497"/> - <source>Triple single quotes converted to triple double quotes.</source> + <source>Introductory quotes corrected to be {0}"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="500"/> - <source>Introductory quotes corrected to be {0}"""</source> + <source>Single line docstring put on one line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="503"/> - <source>Single line docstring put on one line.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="506"/> <source>Period added to summary line.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="509"/> + <source>Blank line inserted before class docstring.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="512"/> - <source>Blank line inserted before class docstring.</source> + <source>Blank line inserted after class docstring.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="515"/> - <source>Blank line inserted after class docstring.</source> + <source>Blank line inserted after docstring summary.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="518"/> - <source>Blank line inserted after docstring summary.</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="521"/> - <source>Blank line inserted after last paragraph of docstring.</source> + <source>Leading quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="524"/> - <source>Leading quotes put on separate line.</source> + <source>Trailing quotes put on separate line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="527"/> - <source>Trailing quotes put on separate line.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="530"/> <source>Blank line before class docstring removed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="533"/> + <source>Blank line after class docstring removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="536"/> - <source>Blank line after class docstring removed.</source> + <source>Blank line after function/method docstring removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="539"/> - <source>Blank line after function/method docstring removed.</source> + <source>Blank line after last paragraph removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="542"/> - <source>Blank line after last paragraph removed.</source> + <source>Tab converted to 4 spaces.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="545"/> - <source>Tab converted to 4 spaces.</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="548"/> - <source>Indentation adjusted to be a multiple of four.</source> + <source>Indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="551"/> - <source>Indentation of continuation line corrected.</source> + <source>Indentation of closing bracket corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="554"/> - <source>Indentation of closing bracket corrected.</source> + <source>Missing indentation of continuation line corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="557"/> - <source>Missing indentation of continuation line corrected.</source> + <source>Closing bracket aligned to opening bracket.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="560"/> - <source>Closing bracket aligned to opening bracket.</source> + <source>Indentation level changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="563"/> - <source>Indentation level changed.</source> + <source>Indentation level of hanging indentation changed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="566"/> - <source>Indentation level of hanging indentation changed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="569"/> <source>Visual indentation corrected.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> + <source>Extraneous whitespace removed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="578"/> + <source>Missing whitespace added.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="584"/> - <source>Extraneous whitespace removed.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="581"/> - <source>Missing whitespace added.</source> + <source>Whitespace around comment sign corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="587"/> - <source>Whitespace around comment sign corrected.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="590"/> <source>One blank line inserted.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="591"/> <source>%n blank line(s) inserted.</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message numerus="yes"> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="597"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="594"/> <source>%n superfluous lines removed</source> <translation type="unfinished"> <numerusform></numerusform> </translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="598"/> + <source>Superfluous blank lines removed.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="601"/> - <source>Superfluous blank lines removed.</source> + <source>Superfluous blank lines after function decorator removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="604"/> - <source>Superfluous blank lines after function decorator removed.</source> + <source>Imports were put on separate lines.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="607"/> - <source>Imports were put on separate lines.</source> + <source>Long lines have been shortened.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="610"/> - <source>Long lines have been shortened.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="613"/> <source>Redundant backslash in brackets removed.</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="616"/> + <source>Compound statement corrected.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="619"/> - <source>Compound statement corrected.</source> + <source>Comparison to None/True/False corrected.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="622"/> - <source>Comparison to None/True/False corrected.</source> + <source>'{0}' argument added.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="625"/> - <source>'{0}' argument added.</source> + <source>'{0}' argument removed.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="628"/> - <source>'{0}' argument removed.</source> + <source>Whitespace stripped from end of line.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="631"/> - <source>Whitespace stripped from end of line.</source> + <source>newline added to end of file.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="634"/> - <source>newline added to end of file.</source> + <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="637"/> - <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="640"/> <source>'<>' replaced by '!='.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="644"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="641"/> <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="713"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="710"/> <source> no message defined for code '{0}'</source> <translation type="unfinished"></translation> </message> @@ -4771,7 +4771,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/> + <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/> <source><no cookie selected></source> <translation type="unfinished"></translation> </message> @@ -6942,197 +6942,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="263"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="260"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="262"/> + <source>public function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="265"/> - <source>public function/method is missing a docstring</source> + <source>private function/method may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="268"/> - <source>private function/method may be missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="271"/> <source>public class is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="273"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="270"/> <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="275"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="272"/> <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="274"/> + <source>docstring containing \ not surrounded by r"""</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="277"/> - <source>docstring containing \ not surrounded by r"""</source> + <source>docstring containing unicode character not surrounded by u"""</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="280"/> - <source>docstring containing unicode character not surrounded by u"""</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="283"/> <source>one-liner docstring on multiple lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="285"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="282"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="287"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="284"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="328"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> <source>docstring summary does not end with a period</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="291"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="288"/> <source>docstring summary is not in imperative mood (Does instead of Do)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="292"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="295"/> - <source>docstring summary looks like a function's/method's signature</source> + <source>docstring does not mention the return value type</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="298"/> - <source>docstring does not mention the return value type</source> + <source>function/method docstring is separated by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="301"/> - <source>function/method docstring is separated by a blank line</source> + <source>class docstring is not preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="304"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="307"/> <source>class docstring is not followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="310"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="314"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="319"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="327"/> + <source>docstring summary does not start with '{0}'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="329"/> + <source>docstring does not contain a @return line but function/method returns something</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="333"/> + <source>docstring contains a @return line but function/method doesn't return anything</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="337"/> + <source>docstring does not contain enough @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> + <source>docstring contains too many @param/@keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> + <source>keyword only arguments must be documented with @keyparam lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> + <source>order of @param/@keyparam lines does not match the function/method signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="351"/> + <source>class docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="353"/> + <source>function/method docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> + <source>function/method docstring is followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="362"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="313"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="317"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="320"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="322"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="325"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="330"/> - <source>docstring summary does not start with '{0}'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="332"/> - <source>docstring does not contain a @return line but function/method returns something</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="336"/> - <source>docstring contains a @return line but function/method doesn't return anything</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="340"/> - <source>docstring does not contain enough @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="343"/> - <source>docstring contains too many @param/@keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="346"/> - <source>keyword only arguments must be documented with @keyparam lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="349"/> - <source>order of @param/@keyparam lines does not match the function/method signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="352"/> - <source>class docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="354"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="356"/> - <source>function/method docstring is preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="359"/> - <source>function/method docstring is followed by a blank line</source> + <source>last paragraph of docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="365"/> - <source>last paragraph of docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="368"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="372"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="369"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="377"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="374"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -7314,7 +7314,7 @@ <context> <name>DownloadManager</name> <message> - <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/> + <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/> <source>Downloads</source> <translation type="unfinished"></translation> </message> @@ -7763,92 +7763,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/> <source>Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/> <source>Discard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/> <source>No to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/> <source>Save all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/> + <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/> <source>Yes to all</source> <translation type="unfinished"></translation> </message> @@ -9848,7 +9848,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/> <source>Add from installed APIs</source> <translation type="unfinished"></translation> </message> @@ -9858,7 +9858,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/> <source>Add from Plugin APIs</source> <translation type="unfinished"></translation> </message> @@ -9868,7 +9868,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> <source>Compile APIs</source> <translation type="unfinished"></translation> </message> @@ -11009,7 +11009,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/> <source>Font</source> <translation type="unfinished"></translation> </message> @@ -11019,7 +11019,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/> <source>Fill to end of line</source> <translation type="unfinished"></translation> </message> @@ -12615,7 +12615,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/> <source>Disabled</source> <translation type="unfinished"></translation> </message> @@ -13269,7 +13269,7 @@ <context> <name>EmailDialog</name> <message> - <location filename="../UI/EmailDialog.py" line="346"/> + <location filename="../UI/EmailDialog.ui" line="13"/> <source>Send bug report</source> <translation type="unfinished"></translation> </message> @@ -14687,12 +14687,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/> <source>Host</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/> <source>Permission</source> <translation type="unfinished"></translation> </message> @@ -14707,7 +14707,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/> + <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/> <source>Geolocation</source> <translation type="unfinished"></translation> </message> @@ -14939,7 +14939,7 @@ <context> <name>Fetch</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="71"/> <source>Fetching from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15827,7 +15827,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/> <source><no flash cookie selected></source> <translation type="unfinished"></translation> </message> @@ -15837,7 +15837,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/> <source>Origin:</source> <translation type="unfinished"></translation> </message> @@ -15872,7 +15872,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/> + <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/> <source>Remove Cookie</source> <translation type="unfinished"></translation> </message> @@ -16213,7 +16213,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="141"/> <source>Sign Revision</source> <translation type="unfinished"></translation> </message> @@ -16297,7 +16297,7 @@ <context> <name>GreaseMonkeyAddScriptDialog</name> <message> - <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/> + <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/> <source>GreaseMonkey Script Installation</source> <translation type="unfinished"></translation> </message> @@ -21442,7 +21442,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -21532,347 +21532,347 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1063"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1109"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1114"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1139"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1365"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1968"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2022"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2037"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2183"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Cancelling uncommitted merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2252"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2451"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2604"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2578"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2655"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2734"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2759"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2796"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2850"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2793"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2830"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2870"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2945"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2992"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3055"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3092"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3256"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3308"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3532"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3387"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3495"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3532"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3614"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3651"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3673"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3673"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3684"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3717"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3759"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3854"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3854"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3866"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3898"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3898"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3873"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3910"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3170"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3170"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> @@ -21880,7 +21880,7 @@ <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> @@ -23055,7 +23055,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/> <source>Resolved</source> <translation type="unfinished"></translation> </message> @@ -23065,7 +23065,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/> <source>Unresolved</source> <translation type="unfinished"></translation> </message> @@ -23642,7 +23642,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -24014,7 +24014,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/> <source>Edit Plan</source> <translation type="unfinished"></translation> </message> @@ -24155,541 +24155,642 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="22"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="45"/> <source>Select the mode (find or filter)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="65"/> <source>From:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="72"/> <source>Enter the start date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="82"/> <source>To:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="66"/> - <source>Enter the end date</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="89"/> + <source>Enter the end date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="112"/> <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="96"/> - <source>Select the branch to filter on</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="119"/> + <source>Select the branch to filter on</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="142"/> <source>Select the field to filter on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="149"/> <source>Enter the regular expression to filter on or search for</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="156"/> <source>Press to find the previous occurrence</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="163"/> <source>Press to find the next occurrence</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/> <source>Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="176"/> - <source>Branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/> - <source>Revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="186"/> - <source>Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> - <source>Author</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="196"/> - <source>Date</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="103"/> - <source>Message</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="206"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="211"/> + <source>Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="216"/> + <source>Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="221"/> + <source>Author</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="226"/> + <source>Date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="231"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="236"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="403"/> <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="413"/> <source>Copy from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="282"/> <source>&Next</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="316"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="289"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="308"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="311"/> <source>Stop on Copy/Move</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="378"/> - <source>Press to generate a diff to the first parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="381"/> - <source>Diff to Parent &1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> - <source>Press to generate a diff to the second parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="391"/> - <source>Diff to Parent &2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="398"/> - <source>Press to compare two revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="401"/> - <source>&Compare Revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="444"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> - <source>Show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="421"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="22"/> <source>Select action from menu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="462"/> - <source>Errors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="468"/> - <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="484"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="506"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="509"/> - <source>&Send</source> + <source>Errors</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="512"/> + <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="528"/> + <source>Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="550"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="553"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="556"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="563"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="570"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="529"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="573"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="532"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="576"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="89"/> <source>Mercurial Log (Incoming)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="91"/> <source>Mercurial Log (Outgoing)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="88"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="102"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> - <source>Press to refresh the list of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> - <source>Find</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/> - <source>Filter</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="104"/> + <source>Press to refresh the list of changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/> + <source>Find</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="113"/> + <source>Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="153"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="173"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="199"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/> <source>Draft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/> <source>Public</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="206"/> <source>Secret</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="215"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2074"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/> <source>Copy the selected changesets to the current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/> - <source>Change the phase of the selected revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="227"/> - <source><b>Change Phase</b> -<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/> - <source>Tag</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/> - <source>Tag the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1951"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="240"/> - <source>Switch the working directory to the selected revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2049"/> - <source>Pull Changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="261"/> - <source>Pull changes from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="263"/> - <source>Pull Large Files</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="265"/> - <source>Pull large files for selected revisions</source> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="267"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="274"/> - <source>Push Selected Changes</source> + <source>Tag</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="277"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2126"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="282"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2257"/> + <source>Pull Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="303"/> + <source>Pull changes from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="305"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="307"/> + <source>Pull large files for selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> + <source>Push Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Push changes of the selected changeset and its ancestors to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="280"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="322"/> <source>Push All Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="325"/> <source>Push all changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="747"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="874"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="877"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="880"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1105"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1105"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1198"/> <source>{0} (large file)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2390"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>Find Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2529"/> <source>'{0}' was not found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2221"/> <source>Fetch Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2300"/> <source>Strip Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="311"/> <source>Fetch changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="291"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="368"/> <source>Strip changesets from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="287"/> <source>Define Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="290"/> <source>Bookmark the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="292"/> <source>Move Bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="295"/> <source>Move bookmark to the selected revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147"/> <source>Define Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1972"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2147"/> <source>Enter bookmark name for changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2169"/> <source>Move Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2169"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2112"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> - <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="246"/> <source>Press to move up in the log list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="256"/> <source>Press to move down in the log list</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="156"/> <source><tr><td><b>Latest Tag</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="137"/> + <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr>{4}<tr><td><b>Message</b></td><td>{5}</td></tr></table></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="147"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="150"/> + <source><tr><td><b>Children</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="259"/> + <source>Merge with Changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="262"/> + <source>Merge the working directory with the selected changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="330"/> + <source>Create Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="333"/> + <source>Create a changegroup file containing the selected changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="335"/> + <source><b>Create Changegroup</b> +<p>This creates a changegroup file containing the selected revisions. If no revisions are selected, all changesets will be bundled. If one revision is selected, it will be interpreted as the base revision. Otherwise the lowest revision will be used as the base revision and all other revision will be bundled. If the dialog is showing outgoing changesets, all selected changesets will be bundled.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2390"/> + <source>Apply Changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="347"/> + <source>Apply the currently viewed changegroup file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="352"/> + <source>Sign Revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="355"/> + <source>Add a signature for the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="357"/> + <source>Verify Signatures</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="360"/> + <source>Verify all signatures there may be for the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="373"/> + <source>Select All Entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="375"/> + <source>Deselect All Entries</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1449"/> + <source>Side-by-Side Diff to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1460"/> + <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1559"/> + <source>Pull Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1560"/> + <source>Fetch Selected Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="424"/> + <source>Differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2582"/> + <source>Differences to Parent {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2598"/> + <source>Diff to Parent {0}{1}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2621"/> + <source>There is no difference.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2764"/> + <source>Save Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2731"/> + <source>Patch Files (*.diff)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2748"/> + <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2764"/> + <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> + <source><a href="save:me">Save</a></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgMergeDialog</name> @@ -27909,7 +28010,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -27920,317 +28021,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="39"/> <source>&Filter on Status:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="49"/> <source>Select the status of entries to be shown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="96"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="101"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="106"/> <source>Path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="116"/> <source>Commit the selected changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="119"/> <source>&Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="133"/> <source>Add the selected entries to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="136"/> <source>&Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="143"/> <source>Show differences of the selected entries to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="137"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="146"/> <source>&Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="144"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="153"/> <source>Show differences of the selected entry to the repository in a side-by-side manner</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="156"/> <source>Side-b&y-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="154"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="163"/> <source>Revert the selected entries to the last revision in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="166"/> <source>Re&vert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="173"/> <source>Forget about the selected missing entries</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="167"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="176"/> <source>For&get</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="174"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="183"/> <source>Restore the selected missing entries from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="177"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="186"/> <source>&Restore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="212"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="251"/> <source>Errors</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="261"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="270"/> <source>Input</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="292"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="286"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="295"/> <source>&Send</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="298"/> <source>Alt+S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="296"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="305"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="303"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="312"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="315"/> <source>&Password Mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="318"/> <source>Alt+P</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="59"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> <source>Press to refresh the status display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="110"/> - <source>Commit changes to repository...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="116"/> <source>Select all for commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="118"/> <source>Deselect all from commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="161"/> - <source>Add as Large File</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="164"/> + <source>Add as Large File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="167"/> <source>Add as Normal File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="129"/> - <source>Show differences</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="132"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="135"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="136"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="139"/> - <source>Forget missing</source> + <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="142"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="778"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="190"/> - <source>added</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/> <source>modified</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="197"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="198"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="199"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="194"/> - <source>removed</source> + <source>normal</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="195"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="191"/> - <source>normal</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="192"/> <source>ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="310"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="714"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="778"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="836"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="842"/> <source>Revert</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="880"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="887"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="881"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="887"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> @@ -29429,7 +29530,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/> + <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/> <source>&Remove</source> <translation type="unfinished"></translation> </message> @@ -35207,12 +35308,12 @@ <context> <name>McCabeChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="426"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="423"/> <source>'{0}' is too complex ({1})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="428"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="425"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -35573,92 +35674,92 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/> <source>Apply</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/> <source>Ignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/> <source>Save all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/> <source>Discard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/> <source>Yes to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/> <source>Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/> <source>Ok</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/> <source>No</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/> <source>No to all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/> <source>Retry</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/> <source>Restore defaults</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/> <source>Yes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/> + <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/> <source>Close</source> <translation type="unfinished"></translation> </message> @@ -36354,107 +36455,107 @@ <context> <name>MiscellaneousChecker</name> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="429"/> + <source>coding magic comment not found</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="432"/> - <source>coding magic comment not found</source> + <source>unknown encoding ({0}) found in coding magic comment</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="435"/> - <source>unknown encoding ({0}) found in coding magic comment</source> + <source>copyright notice not present</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="438"/> - <source>copyright notice not present</source> + <source>copyright notice contains invalid author</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="441"/> - <source>copyright notice contains invalid author</source> + <source>blind except: statement</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="444"/> - <source>blind except: statement</source> + <source>found {0} formatter</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="447"/> - <source>found {0} formatter</source> + <source>format string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="450"/> - <source>format string does contain unindexed parameters</source> + <source>docstring does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="453"/> - <source>docstring does contain unindexed parameters</source> + <source>other string does contain unindexed parameters</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="456"/> - <source>other string does contain unindexed parameters</source> + <source>format call uses too large index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="459"/> - <source>format call uses too large index ({0})</source> + <source>format call uses missing keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="462"/> - <source>format call uses missing keyword ({0})</source> + <source>format call uses keyword arguments but no named entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="465"/> - <source>format call uses keyword arguments but no named entries</source> + <source>format call uses variable arguments but no numbered entries</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="468"/> - <source>format call uses variable arguments but no numbered entries</source> + <source>format call uses implicit and explicit indexes together</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="471"/> - <source>format call uses implicit and explicit indexes together</source> + <source>format call provides unused index ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="474"/> - <source>format call provides unused index ({0})</source> + <source>format call provides unused keyword ({0})</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="477"/> - <source>format call provides unused keyword ({0})</source> + <source>expected these __future__ imports: {0}; but only got: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="480"/> - <source>expected these __future__ imports: {0}; but only got: {1}</source> + <source>expected these __future__ imports: {0}; but got none</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="483"/> - <source>expected these __future__ imports: {0}; but got none</source> + <source>print statement found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="486"/> - <source>print statement found</source> + <source>one element tuple found</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="489"/> - <source>one element tuple found</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="492"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> @@ -36847,72 +36948,72 @@ <context> <name>NamingStyleChecker</name> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="378"/> + <source>class names should use CapWords convention</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="381"/> - <source>class names should use CapWords convention</source> + <source>function name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="384"/> - <source>function name should be lowercase</source> + <source>argument name should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="387"/> - <source>argument name should be lowercase</source> + <source>first argument of a class method should be named 'cls'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="390"/> - <source>first argument of a class method should be named 'cls'</source> + <source>first argument of a method should be named 'self'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="393"/> - <source>first argument of a method should be named 'self'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="396"/> <source>first argument of a static method should not be named 'self' or 'cls</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="397"/> + <source>module names should be lowercase</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="400"/> - <source>module names should be lowercase</source> + <source>package names should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="403"/> - <source>package names should be lowercase</source> + <source>constant imported as non constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="406"/> - <source>constant imported as non constant</source> + <source>lowercase imported as non lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="409"/> - <source>lowercase imported as non lowercase</source> + <source>camelcase imported as lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="412"/> - <source>camelcase imported as lowercase</source> + <source>camelcase imported as constant</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="415"/> - <source>camelcase imported as constant</source> + <source>variable in function should be lowercase</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="418"/> - <source>variable in function should be lowercase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="421"/> <source>names 'l', 'O' and 'I' should be avoided</source> <translation type="unfinished"></translation> </message> @@ -37343,7 +37444,7 @@ <context> <name>NoCacheHostsDialog</name> <message> - <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/> + <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/> <source>Not Cached Hosts</source> <translation type="unfinished"></translation> </message> @@ -37451,7 +37552,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/> + <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/> <source>Visual Selection</source> <translation type="unfinished"></translation> </message> @@ -38121,7 +38222,7 @@ <context> <name>PasswordsDialog</name> <message> - <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/> + <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/> <source>Saved Passwords</source> <translation type="unfinished"></translation> </message> @@ -39802,1115 +39903,1115 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="735"/> <source>Read project file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="715"/> + <location filename="../Project/Project.py" line="735"/> <source><p>The project file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="835"/> <source>Save project file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="815"/> + <location filename="../Project/Project.py" line="835"/> <source><p>The project file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="871"/> <source>Read user project properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="851"/> + <location filename="../Project/Project.py" line="871"/> <source><p>The user specific project properties file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="895"/> <source>Save user project properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="875"/> + <location filename="../Project/Project.py" line="895"/> <source><p>The user specific project properties file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="953"/> <source>Read project session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1155"/> + <location filename="../Project/Project.py" line="1175"/> <source>Please save the project first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="933"/> + <location filename="../Project/Project.py" line="953"/> <source><p>The project session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="989"/> <source>Save project session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="969"/> + <location filename="../Project/Project.py" line="989"/> <source><p>The project session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="1018"/> <source>Delete project session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="998"/> + <location filename="../Project/Project.py" line="1018"/> <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1032"/> - <source>Read tasks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="1032"/> - <source><p>The tasks file <b>{0}</b> could not be read.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="1052"/> - <source>Save tasks</source> + <source>Read tasks</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="1052"/> + <source><p>The tasks file <b>{0}</b> could not be read.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1072"/> + <source>Save tasks</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="1072"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1129"/> <source>Read debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1109"/> + <location filename="../Project/Project.py" line="1129"/> <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1163"/> <source>Save debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1143"/> + <location filename="../Project/Project.py" line="1163"/> <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1189"/> <source>Delete debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1169"/> + <location filename="../Project/Project.py" line="1189"/> <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1277"/> + <location filename="../Project/Project.py" line="1297"/> <source>Add Language</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1277"/> + <location filename="../Project/Project.py" line="1297"/> <source>You have to specify a translation pattern first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1399"/> + <location filename="../Project/Project.py" line="1419"/> <source>Delete translation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1399"/> + <location filename="../Project/Project.py" line="1419"/> <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1550"/> + <location filename="../Project/Project.py" line="1570"/> <source>Add file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1612"/> + <location filename="../Project/Project.py" line="1632"/> <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1538"/> + <location filename="../Project/Project.py" line="1558"/> <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1667"/> + <location filename="../Project/Project.py" line="1687"/> <source>The target directory must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1678"/> + <location filename="../Project/Project.py" line="1698"/> <source>Add directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1581"/> + <location filename="../Project/Project.py" line="1601"/> <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1594"/> + <location filename="../Project/Project.py" line="1614"/> <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1678"/> + <location filename="../Project/Project.py" line="1698"/> <source>The source directory must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1802"/> + <location filename="../Project/Project.py" line="1822"/> <source>Rename file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1826"/> + <location filename="../Project/Project.py" line="1846"/> <source>Rename File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2857"/> + <location filename="../Project/Project.py" line="2877"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="1826"/> + <location filename="../Project/Project.py" line="1846"/> <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2062"/> + <location filename="../Project/Project.py" line="2082"/> <source>Delete file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2062"/> + <location filename="../Project/Project.py" line="2082"/> <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2091"/> + <location filename="../Project/Project.py" line="2111"/> <source>Delete directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2091"/> + <location filename="../Project/Project.py" line="2111"/> <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2173"/> + <location filename="../Project/Project.py" line="2193"/> <source>Create project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2173"/> + <location filename="../Project/Project.py" line="2193"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2673"/> + <location filename="../Project/Project.py" line="2693"/> <source>Create project management directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2673"/> + <location filename="../Project/Project.py" line="2693"/> <source><p>The project directory <b>{0}</b> is not writable.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2240"/> + <location filename="../Project/Project.py" line="2260"/> <source>Create main script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2240"/> + <location filename="../Project/Project.py" line="2260"/> <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2703"/> + <location filename="../Project/Project.py" line="2723"/> <source>New Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2253"/> + <location filename="../Project/Project.py" line="2273"/> <source>Add existing files to the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2703"/> + <location filename="../Project/Project.py" line="2723"/> <source>Select Version Control System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2372"/> + <location filename="../Project/Project.py" line="2392"/> <source>Would you like to edit the VCS command options?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3521"/> + <location filename="../Project/Project.py" line="3541"/> <source>New project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2320"/> + <location filename="../Project/Project.py" line="2340"/> <source>Shall the project file be added to the repository?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2351"/> + <location filename="../Project/Project.py" line="2371"/> <source>None</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2344"/> + <location filename="../Project/Project.py" line="2364"/> <source>Select version control system for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2450"/> + <location filename="../Project/Project.py" line="2470"/> <source>Translation Pattern</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2450"/> + <location filename="../Project/Project.py" line="2470"/> <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3535"/> + <location filename="../Project/Project.py" line="3555"/> <source>Open project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="2842"/> + <location filename="../Project/Project.py" line="2862"/> <source>Project Files (*.e4p)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Project/Project.py" line="3592"/> + <source>Save project as</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2877"/> + <source>Save File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2913"/> + <source>Close Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="2913"/> + <source>The current project has unsaved changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3078"/> + <source>Syntax errors detected</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Project/Project.py" line="3078"/> + <source>The project contains %n file(s) with syntax errors.</source> + <translation type="unfinished"> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../Project/Project.py" line="3541"/> + <source>&New...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3546"/> + <source>Generate a new project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3547"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3555"/> + <source>&Open...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3560"/> + <source>Open an existing project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3561"/> + <source><b>Open...</b><p>This opens an existing project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3568"/> + <source>Close project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3568"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Project/Project.py" line="3572"/> - <source>Save project as</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2857"/> - <source>Save File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2893"/> - <source>Close Project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="2893"/> - <source>The current project has unsaved changes.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3058"/> - <source>Syntax errors detected</source> - <translation type="unfinished"></translation> - </message> - <message numerus="yes"> - <location filename="../Project/Project.py" line="3058"/> - <source>The project contains %n file(s) with syntax errors.</source> - <translation type="unfinished"> - <numerusform></numerusform> - </translation> - </message> - <message> - <location filename="../Project/Project.py" line="3521"/> - <source>&New...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3526"/> - <source>Generate a new project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3527"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3535"/> - <source>&Open...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3540"/> - <source>Open an existing project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3541"/> - <source><b>Open...</b><p>This opens an existing project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3548"/> - <source>Close project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3548"/> - <source>&Close</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3552"/> <source>Close the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3553"/> + <location filename="../Project/Project.py" line="3573"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3560"/> + <location filename="../Project/Project.py" line="3580"/> <source>Save project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3751"/> + <location filename="../Project/Project.py" line="3771"/> <source>&Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3564"/> + <location filename="../Project/Project.py" line="3584"/> <source>Save the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3565"/> + <location filename="../Project/Project.py" line="3585"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3572"/> - <source>Save &as...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3576"/> - <source>Save the current project to a new file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3578"/> - <source><b>Save as</b><p>This saves the current project to a new file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3587"/> - <source>Add files to project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3587"/> - <source>Add &files...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3592"/> + <source>Save &as...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3596"/> + <source>Save the current project to a new file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3598"/> + <source><b>Save as</b><p>This saves the current project to a new file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3607"/> + <source>Add files to project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3607"/> + <source>Add &files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3612"/> <source>Add files to the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3594"/> + <location filename="../Project/Project.py" line="3614"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3603"/> + <location filename="../Project/Project.py" line="3623"/> <source>Add directory to project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3603"/> - <source>Add directory...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3608"/> - <source>Add a directory to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3610"/> - <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3618"/> - <source>Add translation to project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3618"/> - <source>Add &translation...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3623"/> + <source>Add directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3628"/> + <source>Add a directory to the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3630"/> + <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3638"/> + <source>Add translation to project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3638"/> + <source>Add &translation...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3643"/> <source>Add a translation to the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3625"/> + <location filename="../Project/Project.py" line="3645"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3633"/> - <source>Search new files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3633"/> - <source>Searc&h new files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3637"/> - <source>Search new files in the project directory.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3639"/> - <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3647"/> - <source>Search Project File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3647"/> - <source>Search Project File...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3647"/> - <source>Alt+Ctrl+P</source> - <comment>Project|Search Project File</comment> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3653"/> - <source>Search for a file in the project list of files.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3655"/> - <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3662"/> - <source>Project properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3662"/> - <source>&Properties...</source> + <source>Search new files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3653"/> + <source>Searc&h new files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3657"/> + <source>Search new files in the project directory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3659"/> + <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3667"/> + <source>Search Project File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3667"/> + <source>Search Project File...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3667"/> - <source>Show the project properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3668"/> - <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> + <source>Alt+Ctrl+P</source> + <comment>Project|Search Project File</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3673"/> + <source>Search for a file in the project list of files.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3675"/> - <source>User project properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3675"/> - <source>&User Properties...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3680"/> - <source>Show the user specific project properties</source> + <source><b>Search Project File</b><p>This searches for a file in the project list of files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3682"/> + <source>Project properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3682"/> + <source>&Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3687"/> + <source>Show the project properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3688"/> + <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3695"/> + <source>User project properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3695"/> + <source>&User Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3700"/> + <source>Show the user specific project properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3702"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3690"/> + <location filename="../Project/Project.py" line="3710"/> <source>Filetype Associations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3690"/> + <location filename="../Project/Project.py" line="3710"/> <source>Filetype Associations...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3694"/> - <source>Show the project filetype associations</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3696"/> - <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3708"/> - <source>Lexer Associations</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3708"/> - <source>Lexer Associations...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3712"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3714"/> + <source>Show the project filetype associations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3716"/> + <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3728"/> + <source>Lexer Associations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3728"/> + <source>Lexer Associations...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3732"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3734"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3726"/> + <location filename="../Project/Project.py" line="3746"/> <source>Debugger Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3726"/> + <location filename="../Project/Project.py" line="3746"/> <source>Debugger &Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3730"/> + <location filename="../Project/Project.py" line="3750"/> <source>Show the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3731"/> - <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3739"/> - <source>Load</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3739"/> - <source>&Load</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3743"/> - <source>Load the debugger properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3744"/> - <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3751"/> - <source>Save</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3755"/> - <source>Save the debugger properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3756"/> - <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3763"/> - <source>Delete</source> + <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3759"/> + <source>Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3759"/> + <source>&Load</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3763"/> - <source>&Delete</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3767"/> - <source>Delete the debugger properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3768"/> - <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3776"/> - <source>Reset</source> + <source>Load the debugger properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3764"/> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3771"/> + <source>Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3775"/> + <source>Save the debugger properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3776"/> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3783"/> + <source>Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3783"/> + <source>&Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3787"/> + <source>Delete the debugger properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3788"/> + <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3796"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3796"/> <source>&Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3780"/> + <location filename="../Project/Project.py" line="3800"/> <source>Reset the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3781"/> + <location filename="../Project/Project.py" line="3801"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3790"/> + <location filename="../Project/Project.py" line="3810"/> <source>Load session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3794"/> + <location filename="../Project/Project.py" line="3814"/> <source>Load the projects session file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3795"/> + <location filename="../Project/Project.py" line="3815"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3808"/> + <location filename="../Project/Project.py" line="3828"/> <source>Save session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3812"/> + <location filename="../Project/Project.py" line="3832"/> <source>Save the projects session file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3813"/> + <location filename="../Project/Project.py" line="3833"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3826"/> - <source>Delete session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3830"/> - <source>Delete the projects session file.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3831"/> - <source><b>Delete session</b><p>This deletes the projects session file</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3840"/> - <source>Code Metrics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3840"/> - <source>&Code Metrics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3844"/> - <source>Show some code metrics for the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3846"/> - <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Python Code Coverage</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3854"/> - <source>Code Co&verage...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3858"/> - <source>Show code coverage information for the project.</source> + <source>Delete session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3850"/> + <source>Delete the projects session file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3851"/> + <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3860"/> - <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4646"/> - <source>Profile Data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3868"/> - <source>&Profile Data...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3872"/> - <source>Show profiling data for the project.</source> + <source>Code Metrics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3860"/> + <source>&Code Metrics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3864"/> + <source>Show some code metrics for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3866"/> + <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3874"/> + <source>Python Code Coverage</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3874"/> + <source>Code Co&verage...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3878"/> + <source>Show code coverage information for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3880"/> + <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4666"/> + <source>Profile Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3888"/> + <source>&Profile Data...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3892"/> + <source>Show profiling data for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3894"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4700"/> + <location filename="../Project/Project.py" line="4720"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3883"/> - <source>&Application Diagram...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3887"/> - <source>Show a diagram of the project.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3889"/> - <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3897"/> - <source>Load Diagram</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3897"/> - <source>&Load Diagram...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3901"/> - <source>Load a diagram from file.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Project/Project.py" line="3903"/> - <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4885"/> - <source>Create Package List</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3912"/> - <source>Create &Package List</source> + <source>&Application Diagram...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3907"/> + <source>Show a diagram of the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3909"/> + <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3917"/> + <source>Load Diagram</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Project/Project.py" line="3917"/> + <source>&Load Diagram...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3921"/> + <source>Load a diagram from file.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3923"/> + <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4905"/> + <source>Create Package List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3932"/> + <source>Create &Package List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3937"/> <source>Create an initial PKGLIST file for an eric6 plugin.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3919"/> + <location filename="../Project/Project.py" line="3939"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric6 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5143"/> + <location filename="../Project/Project.py" line="5163"/> <source>Create Plugin Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3982"/> + <location filename="../Project/Project.py" line="4002"/> <source>&Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3983"/> + <location filename="../Project/Project.py" line="4003"/> <source>Open &Recent Projects</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3984"/> + <location filename="../Project/Project.py" line="4004"/> <source>&Version Control</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3988"/> + <location filename="../Project/Project.py" line="4008"/> <source>Chec&k</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3990"/> + <location filename="../Project/Project.py" line="4010"/> <source>Sho&w</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3991"/> + <location filename="../Project/Project.py" line="4011"/> <source>&Diagrams</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3992"/> + <location filename="../Project/Project.py" line="4012"/> <source>Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3993"/> + <location filename="../Project/Project.py" line="4013"/> <source>Source &Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3995"/> + <location filename="../Project/Project.py" line="4015"/> <source>Debugger</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3996"/> + <location filename="../Project/Project.py" line="4016"/> <source>Pac&kagers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4104"/> + <location filename="../Project/Project.py" line="4124"/> <source>Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4170"/> + <location filename="../Project/Project.py" line="4190"/> <source>&Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4329"/> <source>Search New Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4329"/> <source>There were no new files found to be added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4455"/> + <location filename="../Project/Project.py" line="4475"/> <source>Version Control System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4443"/> + <location filename="../Project/Project.py" line="4463"/> <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4455"/> + <location filename="../Project/Project.py" line="4475"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4573"/> + <location filename="../Project/Project.py" line="4593"/> <source>Coverage Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4623"/> + <location filename="../Project/Project.py" line="4643"/> <source>There is no main script defined for the current project. Aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4596"/> + <location filename="../Project/Project.py" line="4616"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4596"/> + <location filename="../Project/Project.py" line="4616"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4646"/> + <location filename="../Project/Project.py" line="4666"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4700"/> + <location filename="../Project/Project.py" line="4720"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4845"/> + <location filename="../Project/Project.py" line="4865"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4885"/> + <location filename="../Project/Project.py" line="4905"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4904"/> + <location filename="../Project/Project.py" line="4924"/> <source>The project does not have a main script defined. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4992"/> + <location filename="../Project/Project.py" line="5012"/> <source><p>The eric6 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5027"/> + <location filename="../Project/Project.py" line="5047"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5101"/> + <location filename="../Project/Project.py" line="5121"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5143"/> + <location filename="../Project/Project.py" line="5163"/> <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4939"/> + <location filename="../Project/Project.py" line="4959"/> <source>Create Plugin Archives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3928"/> + <location filename="../Project/Project.py" line="3948"/> <source>Create Plugin &Archives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3933"/> + <location filename="../Project/Project.py" line="3953"/> <source>Create eric6 plugin archive files.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3935"/> + <location filename="../Project/Project.py" line="3955"/> <source><b>Create Plugin Archives</b><p>This creates eric6 plugin archive files using the list of files given in a PKGLIST* file. The archive name is built from the main script name if not designated in the package list file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3945"/> + <location filename="../Project/Project.py" line="3965"/> <source>Create Plugin Archives (Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3945"/> + <location filename="../Project/Project.py" line="3965"/> <source>Create Plugin Archives (&Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3950"/> + <location filename="../Project/Project.py" line="3970"/> <source>Create eric6 plugin archive files (snapshot releases).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3952"/> + <location filename="../Project/Project.py" line="3972"/> <source><b>Create Plugin Archives (Snapshot)</b><p>This creates eric6 plugin archive files using the list of files given in the PKGLIST* file. The archive name is built from the main script name if not designated in the package list file. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4918"/> + <location filename="../Project/Project.py" line="4938"/> <source>Select package lists:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>Creating plugin archives...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>Abort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4935"/> + <location filename="../Project/Project.py" line="4955"/> <source>%v/%m Archives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4952"/> + <location filename="../Project/Project.py" line="4972"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5046"/> + <location filename="../Project/Project.py" line="5066"/> <source><p>The eric6 plugin archive files were created with some errors.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="5049"/> + <location filename="../Project/Project.py" line="5069"/> <source><p>The eric6 plugin archive files were created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4928"/> + <location filename="../Project/Project.py" line="4948"/> <source><p>No package list files (PKGLIST*) available or selected. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -42870,7 +42971,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="349"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="172"/> <source>Coverage</source> <translation type="unfinished"></translation> </message> @@ -42901,7 +43002,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../DataViews/PyCoverageDialog.py" line="345"/> + <location filename="../DataViews/PyCoverageDialog.ui" line="192"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -42956,7 +43057,7 @@ <context> <name>PyProfileDialog</name> <message> - <location filename="../DataViews/PyProfileDialog.py" line="233"/> + <location filename="../DataViews/PyProfileDialog.ui" line="20"/> <source>Profile Results</source> <translation type="unfinished"></translation> </message> @@ -47518,7 +47619,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/> <source>Remove Filters</source> <translation type="unfinished"></translation> </message> @@ -47528,7 +47629,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/> + <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/> <source>Remove Attributes</source> <translation type="unfinished"></translation> </message> @@ -49014,7 +49115,7 @@ <context> <name>SendRefererWhitelistDialog</name> <message> - <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/> + <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/> <source>Send Referer Whitelist</source> <translation type="unfinished"></translation> </message> @@ -50003,7 +50104,7 @@ <context> <name>SnapWidget</name> <message> - <location filename="../Snapshot/SnapWidget.py" line="531"/> + <location filename="../Snapshot/SnapWidget.ui" line="20"/> <source>eric6 Snapshot</source> <translation type="unfinished"></translation> </message> @@ -52773,7 +52874,7 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/> <source>Subversion Diff</source> <translation type="unfinished"></translation> </message> @@ -53075,17 +53176,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="658"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="165"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -53396,7 +53497,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -53489,7 +53590,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation type="unfinished"></translation> </message> @@ -54685,7 +54786,7 @@ <context> <name>SvnStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/> <source>Subversion Status</source> <translation type="unfinished"></translation> </message> @@ -54706,7 +54807,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/> <source>Commit</source> <translation type="unfinished"></translation> </message> @@ -60142,7 +60243,7 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="403"/> + <location filename="../PyUnit/UnittestDialog.ui" line="14"/> <source>Unittest</source> <translation type="unfinished"></translation> </message> @@ -60620,62 +60721,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="535"/> + <location filename="../UI/UserInterface.py" line="540"/> <source>Initializing Actions...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="537"/> + <location filename="../UI/UserInterface.py" line="542"/> <source>Initializing Menus...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="539"/> + <location filename="../UI/UserInterface.py" line="544"/> <source>Initializing Toolbars...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="541"/> + <location filename="../UI/UserInterface.py" line="546"/> <source>Initializing Statusbar...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="568"/> + <location filename="../UI/UserInterface.py" line="573"/> <source>Initializing Single Application Server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="577"/> + <location filename="../UI/UserInterface.py" line="582"/> <source>Activating Plugins...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="579"/> + <location filename="../UI/UserInterface.py" line="584"/> <source>Generating Plugins Toolbars...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="587"/> - <source>Restoring Toolbarmanager...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="592"/> + <source>Restoring Toolbarmanager...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="597"/> <source>Setting View Profile...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="596"/> + <location filename="../UI/UserInterface.py" line="601"/> <source>Reading Tasks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="600"/> + <location filename="../UI/UserInterface.py" line="605"/> <source>Reading Templates...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="604"/> + <location filename="../UI/UserInterface.py" line="609"/> <source>Starting Debugger...</source> <translation type="unfinished"></translation> </message> @@ -68664,23 +68765,28 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="1493"/> - <source>Failed loading page</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserView.py" line="1494"/> - <source>Something went wrong while loading this page.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../WebBrowser/WebBrowserView.py" line="1497"/> + <location filename="../WebBrowser/WebBrowserView.py" line="1512"/> <source>Try reloading the page or closing some tabs to make more memory available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../WebBrowser/WebBrowserView.py" line="1502"/> - <source>Reload Page</source> + <location filename="../WebBrowser/WebBrowserView.py" line="1501"/> + <source>Render Process terminated abnormally</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserView.py" line="1504"/> + <source>The render process crashed while loading this page.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserView.py" line="1507"/> + <source>The render process was killed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../WebBrowser/WebBrowserView.py" line="1509"/> + <source>The render process terminated while loading this page.</source> <translation type="unfinished"></translation> </message> </context> @@ -70935,35 +71041,35 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1432"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2116"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2121"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1452"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1490"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -70974,35 +71080,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2093"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2103"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2111"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -71094,7 +71200,7 @@ </message> <message> <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="66"/> - <source>{0} may be undefined, or defined from star imports: {1}</source> + <source>{0!r} may be undefined, or defined from star imports: {1}</source> <translation type="unfinished"></translation> </message> <message> @@ -71486,62 +71592,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="222"/> - <source>multiple statements on one line (async def)</source> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="225"/> + <source>comparison to {0} should be {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="228"/> - <source>comparison to {0} should be {1}</source> + <source>test for membership should be 'not in'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="231"/> - <source>test for membership should be 'not in'</source> + <source>test for object identity should be 'is not'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="234"/> - <source>test for object identity should be 'is not'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="237"/> <source>do not compare types, use 'isinstance()'</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <source>do not assign a lambda expression, use a def</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="243"/> - <source>do not assign a lambda expression, use a def</source> + <source>ambiguous variable name '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="246"/> - <source>ambiguous variable name '{0}'</source> + <source>ambiguous class definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="249"/> - <source>ambiguous class definition '{0}'</source> + <source>ambiguous function definition '{0}'</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="252"/> - <source>ambiguous function definition '{0}'</source> + <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="255"/> - <source>{0}: {1}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="258"/> <source>{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="240"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="237"/> <source>do not use bare except</source> <translation type="unfinished"></translation> </message>