--- a/eric6/i18n/eric6_en.ts Tue Feb 04 19:43:37 2020 +0100
+++ b/eric6/i18n/eric6_en.ts Thu Feb 06 19:19:19 2020 +0100
@@ -27815,72 +27815,72 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/>
<source>Mercurial Command Server</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><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="3395"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/>
<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="2735"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/>
<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="3079"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/>
<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="3151"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/>
<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="3151"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
@@ -27910,7 +27910,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
@@ -27940,62 +27940,62 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
<source>Delete Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/>
<source>Pull Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/>
<source>Push Bookmark</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
@@ -28030,22 +28030,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
<source>Delete All Backups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
<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="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/>
<source>Copy Changesets (Stop)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
<source>Copy Changesets (Abort)</source>
<translation type="unfinished"></translation>
</message>
@@ -30043,40 +30043,50 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="132"/>
<source>Strip Count:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="131"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="141"/>
<source>Enter number of leading directories to strip off (default 1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="172"/>
<source>Patch File:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="178"/>
- <source>Enter the name of the patch file</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="185"/>
- <source>Select to enforce the import</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="188"/>
+ <source>Enter the name of the patch file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="195"/>
+ <source>Select to enforce the import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="198"/>
<source>Enforce Import</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="33"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="36"/>
<source>Patch Files (*.diff *.patch);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="119"/>
+ <source>Enable to commit with the secret phase</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/>
+ <source>Commit with Secret Phase</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgLogBrowserDialog</name>
@@ -60673,22 +60683,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1024"/>
+ <location filename="../QScintilla/Shell.py" line="1030"/>
<source>StdOut: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1032"/>
+ <location filename="../QScintilla/Shell.py" line="1038"/>
<source>StdErr: {0}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2147"/>
+ <location filename="../QScintilla/Shell.py" line="2157"/>
<source>Drop Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2147"/>
+ <location filename="../QScintilla/Shell.py" line="2157"/>
<source><p><b>{0}</b> is not a file.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -60731,7 +60741,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="2005"/>
+ <location filename="../QScintilla/Shell.py" line="2015"/>
<source>Project</source>
<translation type="unfinished"></translation>
</message>
@@ -60761,14 +60771,14 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1825"/>
+ <location filename="../QScintilla/Shell.py" line="1835"/>
<source>Available Virtual Environments:
{0}
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../QScintilla/Shell.py" line="1866"/>
+ <location filename="../QScintilla/Shell.py" line="1876"/>
<source>Current Virtual Environment: '{0}'
</source>
<translation type="unfinished"></translation>
@@ -82485,12 +82495,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/WebBrowserPage.py" line="170"/>
+ <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
<source>Suspicuous URL detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../WebBrowser/WebBrowserPage.py" line="170"/>
+ <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
<source><p>The URL <b>{0}</b> was found in the Safe Browsing database.</p>{1}</source>
<translation type="unfinished"></translation>
</message>
@@ -85739,12 +85749,12 @@
<context>
<name>eric6</name>
<message>
- <location filename="../eric6.py" line="387"/>
+ <location filename="../eric6.py" line="390"/>
<source>Starting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../eric6.py" line="392"/>
+ <location filename="../eric6.py" line="395"/>
<source>Generating Main Window...</source>
<translation type="unfinished"></translation>
</message>
@@ -85895,7 +85905,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="138"/>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="183"/>
<source>no message defined for code '{0}'</source>
<translation type="unfinished"></translation>
</message>
@@ -86004,6 +86014,81 @@
<source>use ==/!= to compare str, bytes, and int literals</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="120"/>
+ <source>f-string is missing placeholders</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="123"/>
+ <source>'...'.format(...) has unused arguments at position(s): {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="126"/>
+ <source>'...'.format(...) has unused named argument(s): {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="129"/>
+ <source>'...'.format(...) is missing argument(s) for placeholder(s): {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="132"/>
+ <source>'...'.format(...) mixes automatic and manual numbering</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="135"/>
+ <source>'...'.format(...) has invalid format string: {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="138"/>
+ <source>'...' % ... has invalid format string: {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="141"/>
+ <source>'...' % ... has mixed positional and named placeholders</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="144"/>
+ <source>'...' % ... has unsupported format character {0!r}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="147"/>
+ <source>'...' % ... has {0!d} placeholder(s) but {1!d} substitution(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="150"/>
+ <source>'...' % ... has unused named argument(s): {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="153"/>
+ <source>'...' % ... is missing argument(s) for placeholder(s): {0}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="156"/>
+ <source>'...' % ... expected mapping but got sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="159"/>
+ <source>'...' % ... expected sequence but got mapping</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="162"/>
+ <source>'...' % ... `*` specifier requires sequence</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>pycodestyle</name>
