--- a/eric6/i18n/eric6_en.ts Fri Jun 14 18:46:44 2019 +0200
+++ b/eric6/i18n/eric6_en.ts Wed Jun 26 19:41:11 2019 +0200
@@ -3218,27 +3218,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="758"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="777"/>
<source>Press to start the code style check run</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="768"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="787"/>
<source>Press to fix the selected issues</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="791"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="810"/>
<source>Press to load the default values</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="801"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="820"/>
<source>Press to store the current values as defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="811"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="830"/>
<source>Press to reset the default values</source>
<translation type="unfinished"></translation>
</message>
@@ -3338,7 +3338,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="832"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="851"/>
<source><b>Result List</b>
<p>This list shows the results of the code style check. Double clicking
an entry will open this entry in an editor window and position the cursor at
@@ -3346,17 +3346,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="848"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="867"/>
<source>File/Line</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="853"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="872"/>
<source>Code</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="858"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="877"/>
<source>Message</source>
<translation type="unfinished"></translation>
</message>
@@ -3391,7 +3391,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="603"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="612"/>
<source>Error: {0}</source>
<translation type="unfinished"></translation>
</message>
@@ -3401,17 +3401,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="744"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="753"/>
<source>No issues found.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="879"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="898"/>
<source>Shows the progress of the code style check</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="888"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="907"/>
<source>%v/%m Files</source>
<translation type="unfinished"></translation>
</message>
@@ -3426,17 +3426,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="696"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="705"/>
<source>{0} (ignored)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="588"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="597"/>
<source>Preparing files...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="673"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="692"/>
<source>Enter the maximum allowed code complexity (McCabe: 10)</source>
<translation type="unfinished"></translation>
</message>
@@ -3446,7 +3446,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="630"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="639"/>
<source>Transferring data...</source>
<translation type="unfinished"></translation>
</message>
@@ -3521,37 +3521,37 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="647"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="666"/>
<source>Code Complexity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="761"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="780"/>
<source>&Start</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="771"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="790"/>
<source>&Fix Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="794"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="813"/>
<source>&Load Defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="804"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="823"/>
<source>St&ore Defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="814"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="833"/>
<source>&Reset Defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="747"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="756"/>
<source>No files found (check your ignore list).</source>
<translation type="unfinished"></translation>
</message>
@@ -3581,27 +3581,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="666"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="685"/>
<source>Max. McCabe Complexity:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="689"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="708"/>
<source>Max. Line Complexity:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="696"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="715"/>
<source>Enter the maximum complexity (number of nodes) for a line of code</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="712"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="731"/>
<source>Max. Line Complexity Score:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="719"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="738"/>
<source>Enter the maximum allowed median for line complexity</source>
<translation type="unfinished"></translation>
</message>
@@ -3635,6 +3635,21 @@
<source>Max. Documentation Line Length:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="647"/>
+ <source>Commented Code</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="653"/>
+ <source>Select to search for commented code more aggressively. This may increase the number of false positives.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="656"/>
+ <source>Search aggressively</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CodeStyleCheckerPlugin</name>
@@ -3700,142 +3715,142 @@
<context>
<name>CodeStyleFixer</name>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="675"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="678"/>
<source>Triple single quotes converted to triple double quotes.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="678"/>
- <source>Introductory quotes corrected to be {0}"""</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="681"/>
- <source>Single line docstring put on one line.</source>
+ <source>Introductory quotes corrected to be {0}"""</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="684"/>
+ <source>Single line docstring put on one line.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="687"/>
<source>Period added to summary line.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="711"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="714"/>
<source>Blank line before function/method docstring removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="690"/>
- <source>Blank line inserted before class docstring.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="693"/>
- <source>Blank line inserted after class docstring.</source>
+ <source>Blank line inserted before class docstring.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="696"/>
- <source>Blank line inserted after docstring summary.</source>
+ <source>Blank line inserted after class docstring.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="699"/>
- <source>Blank line inserted after last paragraph of docstring.</source>
+ <source>Blank line inserted after docstring summary.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="702"/>
- <source>Leading quotes put on separate line.</source>
+ <source>Blank line inserted after last paragraph of docstring.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="705"/>
- <source>Trailing quotes put on separate line.</source>
+ <source>Leading quotes put on separate line.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="708"/>
+ <source>Trailing quotes put on separate line.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="711"/>
<source>Blank line before class docstring removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="714"/>
- <source>Blank line after class docstring removed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="717"/>
- <source>Blank line after function/method docstring removed.</source>
+ <source>Blank line after class docstring removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="720"/>
- <source>Blank line after last paragraph 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="723"/>
- <source>Tab converted to 4 spaces.</source>
+ <source>Blank line after last paragraph removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="726"/>
- <source>Indentation adjusted to be a multiple of four.</source>
+ <source>Tab converted to 4 spaces.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="729"/>
- <source>Indentation of continuation line corrected.</source>
+ <source>Indentation adjusted to be a multiple of four.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="732"/>
- <source>Indentation of closing bracket corrected.</source>
+ <source>Indentation of continuation line corrected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="735"/>
- <source>Missing 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="738"/>
- <source>Closing bracket aligned to opening bracket.</source>
+ <source>Missing indentation of continuation line corrected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="741"/>
- <source>Indentation level changed.</source>
+ <source>Closing bracket aligned to opening bracket.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="744"/>
- <source>Indentation level of hanging indentation changed.</source>
+ <source>Indentation level changed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="747"/>
+ <source>Indentation level of hanging indentation changed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="750"/>
<source>Visual indentation corrected.</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="765"/>
+ <source>Extraneous whitespace removed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="762"/>
- <source>Extraneous whitespace removed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="759"/>
<source>Missing whitespace added.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="765"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="768"/>
<source>Whitespace around comment sign corrected.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="769"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="772"/>
<source>%n blank line(s) inserted.</source>
<translation>
<numerusform>%n blank line inserted.</numerusform>
@@ -3843,7 +3858,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="772"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="775"/>
<source>%n superfluous lines removed</source>
<translation>
<numerusform>%n superfluous line removed</numerusform>
@@ -3851,77 +3866,77 @@
</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="776"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="779"/>
<source>Superfluous blank lines removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="779"/>
- <source>Superfluous blank lines after function decorator removed.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="782"/>
- <source>Imports were put on separate lines.</source>
+ <source>Superfluous blank lines after function decorator removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="785"/>
- <source>Long lines have been shortened.</source>
+ <source>Imports were put on separate lines.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="788"/>
+ <source>Long lines have been shortened.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="791"/>
<source>Redundant backslash in brackets removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="794"/>
- <source>Compound statement corrected.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="797"/>
- <source>Comparison to None/True/False corrected.</source>
+ <source>Compound statement corrected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="800"/>
- <source>'{0}' argument added.</source>
+ <source>Comparison to None/True/False corrected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="803"/>
- <source>'{0}' argument removed.</source>
+ <source>'{0}' argument added.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="806"/>
- <source>Whitespace stripped from end of line.</source>
+ <source>'{0}' argument removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="809"/>
- <source>newline added to end of file.</source>
+ <source>Whitespace stripped from end of line.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="812"/>
- <source>Superfluous trailing blank lines removed from end of file.</source>
+ <source>newline added to end of file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="815"/>
+ <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="818"/>
<source>'<>' replaced by '!='.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="819"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="822"/>
<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="908"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="911"/>
<source> no message defined for code '{0}'</source>
<translation type="unfinished"></translation>
</message>
@@ -4447,27 +4462,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="506"/>
+ <location filename="../CondaInterface/Conda.py" line="512"/>
<source>Uninstall Packages</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="506"/>
+ <location filename="../CondaInterface/Conda.py" line="512"/>
<source>Do you really want to uninstall these packages and their dependencies?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="705"/>
+ <location filename="../CondaInterface/Conda.py" line="711"/>
<source>conda exited with an error ({0}).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="713"/>
+ <location filename="../CondaInterface/Conda.py" line="719"/>
<source>conda did not finish within 30 seconds.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CondaInterface/Conda.py" line="716"/>
+ <location filename="../CondaInterface/Conda.py" line="722"/>
<source>conda could not be started.</source>
<translation type="unfinished"></translation>
</message>
@@ -18627,172 +18642,172 @@
<context>
<name>Git</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="208"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="211"/>
<source>The git process finished with the exit code {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1553"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1556"/>
<source>The git process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="215"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="218"/>
<source>Could not start the git executable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="243"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="243"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="246"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="271"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="274"/>
<source>Creating Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="286"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="289"/>
<source>Adding files to Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="297"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="300"/>
<source>Initial commit to Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="327"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="330"/>
<source>Cloning project from a Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/>
<source>Commit Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="419"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="475"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="478"/>
<source>Committing changes to Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="529"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="532"/>
<source>Synchronizing with the Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="579"/>
<source>Adding files/directories to the Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="650"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="653"/>
<source>Removing files/directories from the Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="707"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="710"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="830"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="833"/>
<source>Unstage files/directories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="881"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/>
<source>Revert changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="872"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="875"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="881"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="884"/>
<source>Do you really want to revert all changes of the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="887"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="890"/>
<source>Reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="939"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="942"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="964"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="967"/>
<source>Master branch head</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1195"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/>
<source>Git Command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1281"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1284"/>
<source><tr><td><b>Commit</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1288"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1292"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/>
- <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1296"/>
- <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
+ <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1299"/>
- <source><tr><td><b>Date</b></td><td>{0}</td></tr></source>
+ <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1302"/>
- <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
+ <source><tr><td><b>Date</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1305"/>
- <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source>
+ <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1308"/>
+ <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1311"/>
<source><tr><td><b>Subject</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1315"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1318"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Git V.</b></td><td>{0}</td></tr>
@@ -18802,442 +18817,442 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1380"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/>
<source>Create {0} file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1380"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1439"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/>
<source>Git Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1424"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/>
<source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1439"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/>
<source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2612"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2615"/>
<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/vcsGit/git.py" line="1622"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1625"/>
<source>Git Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1622"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1625"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1671"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1674"/>
<source>Fetching from a remote Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1709"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1712"/>
<source>Pulling from a remote Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1750"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1753"/>
<source>Pushing to a remote Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1778"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1781"/>
<source>Committing failed merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1805"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1808"/>
<source>Aborting uncommitted/failed merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1955"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1958"/>
<source>Tagging in the Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2181"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2184"/>
<source>Branching in the Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2221"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2224"/>
<source>Delete Remote Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2242"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2245"/>
<source>Current Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2242"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2245"/>
<source><p>The current branch is <b>{0}</b>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2306"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2309"/>
<source>Create Bundle</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2271"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2274"/>
<source>Git Bundle Files (*.bundle)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2288"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2291"/>
<source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2336"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2339"/>
<source>Verify Bundle</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2465"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2468"/>
<source>Git Bundle Files (*.bundle);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2366"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2369"/>
<source>List Bundle Heads</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2465"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2468"/>
<source>Apply Bundle</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2488"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2491"/>
<source>Applying a bundle file (fetch)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2515"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2518"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2716"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/>
<source>Git Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2612"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2615"/>
<source>Process Generation Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2656"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2659"/>
<source>Create Bisect Replay File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2622"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2625"/>
<source>Git Bisect Replay Files (*.replay)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2639"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2642"/>
<source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2656"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2659"/>
<source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2677"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2680"/>
<source>Edit Bisect Replay File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2704"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2707"/>
<source>Git Bisect Replay Files (*.replay);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2704"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2707"/>
<source>Bisect Replay</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3052"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3055"/>
<source>Show Remote Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2931"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2934"/>
<source>Rename Remote Repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2931"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2934"/>
<source>Enter new name for remote repository:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3076"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3079"/>
<source>Show Shortlog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3134"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3137"/>
<source>Cherry-pick</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3164"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3167"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3189"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3192"/>
<source>Copy Changesets (Quit)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3218"/>
<source>Copy Changesets (Cancel)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3294"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3297"/>
<source>Saving stash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3493"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3496"/>
<source>Show Stash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3493"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3496"/>
<source>Select a stash (empty for latest stash):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3405"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3408"/>
<source>Restore Stash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3419"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3422"/>
<source>Restoring stash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3453"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3456"/>
<source>Create Branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3443"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3446"/>
<source>Enter a branch name to restore a stash to:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3468"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3471"/>
<source>Creating branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3502"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3505"/>
<source>Delete Stash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3502"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3505"/>
<source>Do you really want to delete the stash <b>{0}</b>?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3516"/>
<source>Deleting stash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/>
<source>Delete All Stashes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3536"/>
<source>Do you really want to delete all stashes?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3541"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3544"/>
<source>Deleting all stashes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3613"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3616"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3639"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/>
<source>Verifying the integrity of the Git repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3667"/>
<source>Performing Repository Housekeeping</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3707"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3710"/>
<source><tr><td><b>Statistics</b></td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3708"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3711"/>
<source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3712"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3715"/>
<source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3716"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3719"/>
<source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3720"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3723"/>
<source><tr><td>Number of packs: </td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3724"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/>
<source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3731"/>
<source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3735"/>
<source><tr><td>Garbage files: </td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3739"/>
<source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3742"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/>
<source><p><b>No statistics available.</b></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3807"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3810"/>
<source>Creating Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="498"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="501"/>
<source><p>Do you really want to switch to <b>{0}</b>?</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1838"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1841"/>
<source>Applying patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1870"/>
- <source>Check patch files</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1873"/>
+ <source>Check patch files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/>
<source>Apply patch files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3850"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3853"/>
<source>Add Submodule</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3918"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3921"/>
<source>List Submodules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3918"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3921"/>
<source>No submodules defined for the project.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3933"/>
- <source>All</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3936"/>
+ <source>All</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3939"/>
<source>Submodule Path</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3936"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3939"/>
<source>Select a submodule path:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3988"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3991"/>
<source>Initialize Submodules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4025"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4028"/>
<source>Unregister Submodules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4105"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4108"/>
<source>Update Submodules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4139"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4142"/>
<source>Synchronize Submodules</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4197"/>
+ <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4200"/>
<source>Submodules Summary</source>
<translation type="unfinished"></translation>
</message>
@@ -30773,447 +30788,447 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1771"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/>
<source>The hg process did not finish within 30s.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/>
<source>Create project repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="286"/>
<source>The project repository could not be created.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="315"/>
<source>Creating Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="329"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/>
<source>Initial commit to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="374"/>
<source>Cloning project from a Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="628"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/>
<source>Synchronizing with the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="678"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="747"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="808"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/>
<source>Renaming {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/>
<source>Reverting changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1048"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/>
<source>Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1348"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/>
<source>Mercurial command</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1532"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/>
<source>Copying {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1923"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/>
<source>Pulling from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1981"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/>
<source>Pushing to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/>
<source>Creating branch in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/>
<source>Showing current branch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2339"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2364"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/>
<source>Showing the combined configuration settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2388"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/>
<source>Showing aliases for remote repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/>
<source>Recovering from interrupted transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/>
<source>Identifying project directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
<source>Create .hgignore file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
<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="2574"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/>
<source>Create changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2531"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2548"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/>
<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="2595"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/>
<source>Preview changegroup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2655"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/>
<source>Apply changegroups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/>
<source>Shall the working directory be updated?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2674"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/>
<source>Mercurial Bisect ({0})</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<source>Removing files from the Mercurial repository only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/>
<source>Backing out changeset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2769"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
<source>No revision given. Aborting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2816"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2809"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/>
<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="542"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3521"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3376"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/>
<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="3521"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/>
<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="2884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2936"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2983"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3039"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3088"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/>
<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="3227"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/>
<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="3298"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/>
<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="3298"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3267"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/>
<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="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
<source>Commit Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
<source>Revert changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="982"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/>
<source>Do you really want to revert all changes of the project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3143"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
<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="1774"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/>
<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="941"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/>
<source>Tagging in the Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/>
<source>Current branch tip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3639"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
<source>Delete Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3661"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3747"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
<source>Pull Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3841"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3853"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
<source>Push Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3885"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3897"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
<source>Re-Merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1085"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/>
<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="1094"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/>
<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="1099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/>
<source>Re-Merging</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/>
- <source>Marking as 'unresolved'</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/>
+ <source>Marking as 'unresolved'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
<source>Marking as 'resolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
<source>Delete All Backups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/>
<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>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/>
<source>Canceling uncommitted merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/>
<source>Copy Changesets (Stop)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/>
<source>Copy Changesets (Abort)</source>
<translation type="unfinished"></translation>
</message>
@@ -33800,12 +33815,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2230"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2231"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished"></translation>
</message>
@@ -33830,7 +33845,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2302"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2303"/>
<source>Switch</source>
<translation type="unfinished"></translation>
</message>
@@ -33895,12 +33910,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
<source>Find Commit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2714"/>
<source>'{0}' was not found.</source>
<translation type="unfinished"></translation>
</message>
@@ -33925,7 +33940,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2433"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2434"/>
<source>Pull Changes</source>
<translation type="unfinished"></translation>
</message>
@@ -33955,12 +33970,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2398"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2399"/>
<source>Fetch Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2479"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2480"/>
<source>Strip Changesets</source>
<translation type="unfinished"></translation>
</message>
@@ -33995,27 +34010,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
<source>Define Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2324"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2325"/>
<source>Enter bookmark name for changeset "{0}":</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
<source>Move Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2348"/>
<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="2288"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2289"/>
<source>Select bookmark to switch to (leave empty to use revision):</source>
<translation type="unfinished"></translation>
</message>
@@ -34076,7 +34091,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2571"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2572"/>
<source>Apply Changegroup</source>
<translation type="unfinished"></translation>
</message>
@@ -34126,52 +34141,52 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1704"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/>
<source>Pull Selected Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1706"/>
<source>Fetch Selected Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2758"/>
<source>Differences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2767"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
<source>Differences to Parent {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2784"/>
<source>Diff to Parent {0}{1}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2808"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2809"/>
<source>There is no difference.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
<source>Save Diff</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2918"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2919"/>
<source>Patch Files (*.diff)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2935"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2936"/>
<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="2951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation type="unfinished"></translation>
</message>
@@ -34181,7 +34196,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2756"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2757"/>
<source>Generating differences ...</source>
<translation type="unfinished"></translation>
</message>
@@ -47455,7 +47470,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="670"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="673"/>
<source>{0}: {1}</source>
<translation type="unfinished"></translation>
</message>
@@ -47654,6 +47669,11 @@
<source>do not call setattr with a constant attribute value</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/translations.py" line="670"/>
+ <source>commented code lines should be removed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MouseClickDialog</name>
@@ -88454,46 +88474,46 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1414"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/>
<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="2054"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
<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="2064"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/>
<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="1434"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/>
<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="2046"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/>
<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="2049"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/>
<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="2069"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/>
<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="2073"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/>
<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>
@@ -88501,12 +88521,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/>
<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="1468"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -88517,13 +88537,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2036"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/>
<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="2041"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation type="unfinished"></translation>
