Thu, 06 Feb 2020 19:19:19 +0100
Updated translations.
--- a/eric6/i18n/eric6_cs.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_cs.ts Thu Feb 06 19:19:19 2020 +0100 @@ -30182,72 +30182,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> @@ -30277,7 +30277,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> @@ -30312,62 +30312,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> @@ -30402,22 +30402,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> @@ -32616,40 +32616,50 @@ <translation type="unfinished">Zadejte nepovinného uživatele pro zápis změn (commit)</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> @@ -63827,7 +63837,7 @@ <translation>Č.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> @@ -63883,17 +63893,17 @@ <translation>{0} na {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1024"/> + <location filename="../QScintilla/Shell.py" line="1030"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1032"/> + <location filename="../QScintilla/Shell.py" line="1038"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</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><p><b>{0}</b> není soubor.</p></translation> </message> @@ -63936,7 +63946,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">Projekt</translation> </message> @@ -63966,14 +63976,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> @@ -85935,12 +85945,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> @@ -89249,12 +89259,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">Generování hlavního okna...</translation> </message> @@ -89405,7 +89415,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> @@ -89514,6 +89524,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>
--- a/eric6/i18n/eric6_de.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_de.ts Thu Feb 06 19:19:19 2020 +0100 @@ -27960,72 +27960,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</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>Mercurial-Befehlsserver</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><p>Der Mercurial-Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></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><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></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>Patch importieren</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>Patches exportieren</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>Phase ändern</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>Änderungssätze kopieren</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>Änderungssätze kopieren (Fortsetzung)</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>Unterrepository hinzufügen</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><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></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><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></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><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></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>Unterrepositorys löschen</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><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -28055,7 +28055,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</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>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -28085,62 +28085,62 @@ <translation>Spitze des aktuellen Zweigs</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>Mercurial-Lesezeichen</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>Lesezeichen löschen</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>Wähle das zu löschende Lesezeichen aus:</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>Mercurial-Lesezeichen löschen</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>Mercurial-Lesezeichen umbenennen</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>Mercurial-Lesezeichen verschieben</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>Lesezeichen herunterladen</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>Wähle das herunterzuladende Lesezeichen:</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>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</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>Lesezeichen hochladen</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>Wähle das hochzuladende Lesezeichen:</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>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> @@ -28175,22 +28175,22 @@ <translation>Markiere als 'aufgelöst'</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>Alle Backups löschen</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><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></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>Änderungssätze kopieren (Stopp)</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>Änderungssätze kopieren (Abbruch)</translation> </message> @@ -30212,40 +30212,50 @@ <translation>Gib den optionalen Nutzer der Änderung ein</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># Löschungen:</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>Gib die Anzahl an führenden Verzeichnissen, die gelöscht werden sollen, ein (Standard 1)</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>Patchdatei:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="178"/> - <source>Enter the name of the patch file</source> - <translation>Gib den namen einer Patchdatei ein</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="185"/> - <source>Select to enforce the import</source> - <translation>Auswählen, um den Import zu erzwingen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="188"/> + <source>Enter the name of the patch file</source> + <translation>Gib den namen einer Patchdatei ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="195"/> + <source>Select to enforce the import</source> + <translation>Auswählen, um den Import zu erzwingen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="198"/> <source>Enforce Import</source> <translation>Erzwinge Import</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>Patchdateien (*.diff *.patch);;Alle Dateien (*)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="119"/> + <source>Enable to commit with the secret phase</source> + <translation>Aktivieren, um mit 'Secret' Phase einzupflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Commit with Secret Phase</source> + <translation>Einpflegen mit Secret Phase</translation> + </message> </context> <context> <name>HgLogBrowserDialog</name> @@ -61055,7 +61065,7 @@ <translation>Einfügen</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Drop Fehler</translation> </message> @@ -61065,7 +61075,7 @@ <translation>Nr.</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><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -61085,12 +61095,12 @@ <translation>Passiver Debugmodus</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1024"/> + <location filename="../QScintilla/Shell.py" line="1030"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1032"/> + <location filename="../QScintilla/Shell.py" line="1038"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> @@ -61183,7 +61193,7 @@ Funktion: {3}({4})</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2005"/> + <location filename="../QScintilla/Shell.py" line="2015"/> <source>Project</source> <translation>Projekt</translation> </message> @@ -61213,7 +61223,7 @@ <translation>Aktiver Name</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1825"/> + <location filename="../QScintilla/Shell.py" line="1835"/> <source>Available Virtual Environments: {0} </source> @@ -61222,7 +61232,7 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1866"/> + <location filename="../QScintilla/Shell.py" line="1876"/> <source>Current Virtual Environment: '{0}' </source> <translation>Aktuelle virtuelle Umgebung: '{0}' @@ -83116,12 +83126,12 @@ <translation> s</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="171"/> <source>Suspicuous URL detected</source> <translation>Fragwürdige URL entdeckt</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><p>Die URL <b>{0}</b> wurde in der Safe Browsing Datenbank gefunden.</p>{1}</translation> </message> @@ -86390,12 +86400,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="387"/> + <location filename="../eric6.py" line="390"/> <source>Starting...</source> <translation>Starte...</translation> </message> <message> - <location filename="../eric6.py" line="392"/> + <location filename="../eric6.py" line="395"/> <source>Generating Main Window...</source> <translation>Erzeuge das Hauptfenster...</translation> </message> @@ -86555,7 +86565,7 @@ <translation>Syntaxfehler in Doctest entdeckt.</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>keine Nachricht für '{0}' definiert</translation> </message> @@ -86664,6 +86674,81 @@ <source>use ==/!= to compare str, bytes, and int literals</source> <translation>Verwende ==/!= zum Vergleich von str, bytes und int Literalen</translation> </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="120"/> + <source>f-string is missing placeholders</source> + <translation>F-Zeichenkette hat keine Platzhalter</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="123"/> + <source>'...'.format(...) has unused arguments at position(s): {0}</source> + <translation>'...'.format(...) hat ungenutzte Argumente an Position(en): {0}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="126"/> + <source>'...'.format(...) has unused named argument(s): {0}</source> + <translation>'...'.format(...) hat ungenutzte benannte Argumente an Position(en): {0}</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>'...'.format(...) hat kein(e) Argument(e) für Platzhalter: {0}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="132"/> + <source>'...'.format(...) mixes automatic and manual numbering</source> + <translation>'...'.format(...) mischt automatische und manuelle Nummerierung</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="135"/> + <source>'...'.format(...) has invalid format string: {0}</source> + <translation>'...'.format(...) hat einen ungültigen Formatstring: {0}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="138"/> + <source>'...' % ... has invalid format string: {0}</source> + <translation>'...' % ... hat einen ungültigen Formatstring: {0}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="141"/> + <source>'...' % ... has mixed positional and named placeholders</source> + <translation>'...' % ... hat gemischte positionierte und benannte Platzhalter</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="144"/> + <source>'...' % ... has unsupported format character {0!r}</source> + <translation>'...' % ... hat nicht unterstützte Formatzeichen {0!r}</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>'...' % ... hat {0!d} Platzhalter aber {1!d} Ersetzung(en)</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="150"/> + <source>'...' % ... has unused named argument(s): {0}</source> + <translation>'...' % ... hat ungenutzte benannte Argumente: {0}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="153"/> + <source>'...' % ... is missing argument(s) for placeholder(s): {0}</source> + <translation>'...' % ... hat kein(e) Argument(e) für Platzhalter: {0}</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="156"/> + <source>'...' % ... expected mapping but got sequence</source> + <translation>'...' % ... erwartete ein Mapping bekam aber eine Sequenz</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="159"/> + <source>'...' % ... expected sequence but got mapping</source> + <translation>'...' % ... erwartete eine Sequenz bekam aber ein Mapping</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="162"/> + <source>'...' % ... `*` specifier requires sequence</source> + <translation>'...' % ... '*' Angabe erfordert eine Sequenz</translation> + </message> </context> <context> <name>pycodestyle</name>
--- a/eric6/i18n/eric6_empty.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_empty.ts Thu Feb 06 19:19:19 2020 +0100 @@ -27874,157 +27874,157 @@ <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="2995"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/> <source>Create Unversioned Archive</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> <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="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> <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> @@ -30022,40 +30022,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> @@ -60668,27 +60678,27 @@ <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> <message> - <location filename="../QScintilla/Shell.py" line="2005"/> + <location filename="../QScintilla/Shell.py" line="2015"/> <source>Project</source> <translation type="unfinished"></translation> </message> @@ -60718,14 +60728,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> @@ -82439,12 +82449,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> @@ -85690,12 +85700,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> @@ -85921,7 +85931,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> @@ -85955,6 +85965,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>
--- 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>
--- a/eric6/i18n/eric6_es.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_es.ts Thu Feb 06 19:19:19 2020 +0100 @@ -27962,72 +27962,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</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>Servidor de Comandos de Mercurial</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><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></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><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></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>Importar Patch</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>Exportar Patches</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>Cambiar Fase</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>Copiar Changesets</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>Copiar Changesets (Continuar)</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>Añadir Sub-repositorio</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><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></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><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></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><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></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>Eliminar Sub-repositorios</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><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> @@ -28057,7 +28057,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</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>Crear Archivo Sin Versionar</translation> </message> @@ -28087,62 +28087,62 @@ <translation>Tip branch actual</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>Marcador de Mercurial</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>Borrar Marcador</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>Seleccionar el marcador a borrar:</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>Borrar Marcador de Mercurial</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>Renombrar Marcador de Mercurial</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>Mover Marcador de Mercurial</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>Pull de Marcador</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>Seleccinar el marcador sobre el que hacer pull:</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>Haciendo pull de marcador desde un repositorio Mercurial remoto</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>Push de Marcador</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>Seleccinar el marcador sobre el que hacer push:</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>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -28177,22 +28177,22 @@ <translation>Marcando como 'resolved'</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>Borrar todas las Copias de Seguridad</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><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></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>Copiar Changesets (Stop)</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>Copiar Changesets (Abortar)</translation> </message> @@ -30214,40 +30214,50 @@ <translation>Introduzca opcionalmente usuario para el commit</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>Número de Strip:</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>Introducir número de directorios al principio para quitar (por defecto 1)</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>Archivo Patch:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="178"/> - <source>Enter the name of the patch file</source> - <translation>Introducir el nombre de archivo patch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="185"/> - <source>Select to enforce the import</source> - <translation>Seleccionar para hacer cumplir el import</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="188"/> + <source>Enter the name of the patch file</source> + <translation>Introducir el nombre de archivo patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="195"/> + <source>Select to enforce the import</source> + <translation>Seleccionar para hacer cumplir el import</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="198"/> <source>Enforce Import</source> <translation>Hacer Cumplir el Import</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>Archivos de Patch (*.diff *.patch);;Todos los Archivos (*)</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> @@ -61047,7 +61057,7 @@ <translation>No.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Error al soltar</translation> </message> @@ -61099,17 +61109,17 @@ <translation>{0} en {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1024"/> + <location filename="../QScintilla/Shell.py" line="1030"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1032"/> + <location filename="../QScintilla/Shell.py" line="1038"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</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><p><b>{0}</b> no es un archivo.</p></translation> </message> @@ -61160,7 +61170,7 @@ Función: {3}({4})</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2005"/> + <location filename="../QScintilla/Shell.py" line="2015"/> <source>Project</source> <translation>Proyecto</translation> </message> @@ -61190,7 +61200,7 @@ <translation>Nombre Activo</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1825"/> + <location filename="../QScintilla/Shell.py" line="1835"/> <source>Available Virtual Environments: {0} </source> @@ -61199,7 +61209,7 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1866"/> + <location filename="../QScintilla/Shell.py" line="1876"/> <source>Current Virtual Environment: '{0}' </source> <translation>Entorno Virtual Actual: '{0}' @@ -83076,12 +83086,12 @@ <translation> s</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="171"/> <source>Suspicuous URL detected</source> <translation>Detectada URL sospechosa</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><p>La URL <b>{0}</b> se ha encontrado en la base de datos de Navegación Segura.</p>{1}</translation> </message> @@ -86349,12 +86359,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="387"/> + <location filename="../eric6.py" line="390"/> <source>Starting...</source> <translation>Comenzando...</translation> </message> <message> - <location filename="../eric6.py" line="392"/> + <location filename="../eric6.py" line="395"/> <source>Generating Main Window...</source> <translation>Generando Ventana Principal...</translation> </message> @@ -86505,7 +86515,7 @@ <translation>La variable local {0!r} está asignada pero nunca es utilizada.</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>sin mensaje definido para el código '{0}'</translation> </message> @@ -86629,6 +86639,81 @@ <source>use ==/!= to compare str, bytes, and int literals</source> <translation>usar ==/!= para comparar str, bytes, y literales int</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>
--- a/eric6/i18n/eric6_fr.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_fr.ts Thu Feb 06 19:19:19 2020 +0100 @@ -29422,72 +29422,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> @@ -29517,7 +29517,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> @@ -29552,62 +29552,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">Signet Mercurial</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">Supprimer le signet</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">Selectionner le signet à supprimer:</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">Supprimer le signet Mercurial</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">Renommer le signet Mercurial</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">Déplacer le signet Mercurial</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">Récuperer le signet</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">Sélectionner le signet à récuperer:</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">Récupérant le signet d'un dépôt Mercurial distant</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">Envoyer signet</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">Sélectionner le signet à envoyer:</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">À envoyer le signet à un dépôt Mercurial distant</translation> </message> @@ -29642,22 +29642,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> @@ -31867,40 +31867,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> @@ -62980,7 +62990,7 @@ <translation>Effacer</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -63046,17 +63056,17 @@ <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><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> @@ -63099,7 +63109,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">Projet</translation> </message> @@ -63129,14 +63139,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> @@ -85084,12 +85094,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> @@ -88412,12 +88422,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">Création de la fenêtre principale...</translation> </message> @@ -88574,7 +88584,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> @@ -88683,6 +88693,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>
--- a/eric6/i18n/eric6_it.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_it.ts Thu Feb 06 19:19:19 2020 +0100 @@ -31446,72 +31446,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">Rimuovi sotto-archivi</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> @@ -31541,7 +31541,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> @@ -31576,62 +31576,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">Segnalibro Mercurial</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">Cancella segnalibro</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">Seleziona il segnalibro da cancellare:</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">Cancella Segnalibro Mercurial</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">Rinomina Segnalibro Mercurial</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">Sposta Segnalibro Mercurial</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">Estrai Segnalibro</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">Seleziona il segnalibro da estrarre:</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">Etrae segnalibro da un repository Mercurial remoto</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">Inserisce Segnalibro</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">Seleziona il segnalibro da inserire:</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">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -31666,22 +31666,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> @@ -33979,40 +33979,50 @@ <translation type="unfinished">Inserisci utente per la commit opzionale</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> @@ -65427,7 +65437,7 @@ <translation>Pulisci</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Drop Error</translation> </message> @@ -65494,17 +65504,17 @@ <translation></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1024"/> + <location filename="../QScintilla/Shell.py" line="1030"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1032"/> + <location filename="../QScintilla/Shell.py" line="1038"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</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><p><b>{0}</b> non è un file.</p></translation> </message> @@ -65547,7 +65557,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">Progetto</translation> </message> @@ -65577,14 +65587,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> @@ -87590,12 +87600,12 @@ <translation type="unfinished"> s</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> @@ -90933,12 +90943,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="387"/> + <location filename="../eric6.py" line="390"/> <source>Starting...</source> <translation type="unfinished">Inizio...</translation> </message> <message> - <location filename="../eric6.py" line="392"/> + <location filename="../eric6.py" line="395"/> <source>Generating Main Window...</source> <translation type="unfinished">Generazione Main Window...</translation> </message> @@ -91101,7 +91111,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> @@ -91210,6 +91220,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>
--- a/eric6/i18n/eric6_pt.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_pt.ts Thu Feb 06 19:19:19 2020 +0100 @@ -31016,72 +31016,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>Mudar Fase</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">Copiar Conjuntos de Alterações</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>Retirar Sub Repositórios</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> @@ -31111,7 +31111,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> @@ -31176,82 +31176,82 @@ <translation>Criado o novo ramo <{0}>.</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>Marcador de Mercurial</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>Apagar Marcador</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>Selecionar o marcador a apagar:</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>Apagar o Marcador de Mercurial</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>Renomear o Marcador de Mercurial</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>Mover o Marcador de Mercurial</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>Puxar Marcador</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>Selecionar o marcador a puxar:</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>A puxar marcador desde o repositório remoto de Mercurial</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>Empurrar Marcador</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>Selecione o marcador a empurrar:</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>A empurrar marcador a um repositório remoto de Mercurial</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> @@ -33559,40 +33559,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> @@ -64766,22 +64776,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"><p><b>{0}</b> não é um ficheiro.</p></translation> </message> @@ -64824,7 +64834,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">Projeto</translation> </message> @@ -64854,14 +64864,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> @@ -86759,12 +86769,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> @@ -90058,12 +90068,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="387"/> + <location filename="../eric6.py" line="390"/> <source>Starting...</source> <translation>A iniciar...</translation> </message> <message> - <location filename="../eric6.py" line="392"/> + <location filename="../eric6.py" line="395"/> <source>Generating Main Window...</source> <translation>A criar a Janela Principal...</translation> </message> @@ -90232,7 +90242,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>sem mensagem definida para código '{0}'</translation> </message> @@ -90336,6 +90346,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>
--- a/eric6/i18n/eric6_ru.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_ru.ts Thu Feb 06 19:19:19 2020 +0100 @@ -28008,72 +28008,72 @@ <translation>Mercurial: Фиксация изменений в репозитории</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>Mercurial: Сервер команд</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><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></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><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></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>Импорт патча</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>Экспорт патчей</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>Изменить фазу</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>Копировать набор изменений</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>Копировать набор изменений (Continue)</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>Добавить субрепозиторий</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><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></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><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></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><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></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>Удалить субрепозитории</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><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> @@ -28103,7 +28103,7 @@ <translation>Вы действительно хотите вернуть все изменения в проекте?</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>Создать неверсированный архив</translation> </message> @@ -28133,62 +28133,62 @@ <translation>Конечная ревизия текущей ветви</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>Mercurial: Закладка</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>Удалить закладку</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>Выберите закладку для удаления:</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>Mercurial: Удалить закладку</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>Mercurial: Переименовать закладку</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>Mercurial: Переместить закладку</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>Затянуть закладку</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>Выберите закладку для затягивания:</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>Затянуть закладку из удалённого Mercurial репозитория</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>Протолкнуть закладку</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>Выберите закладку для проталкивания:</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>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -28223,22 +28223,22 @@ <translation>Помеченные как 'resolved'</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>Удалить все резервные копии</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><p>Вы действительно хотите удалить все резервные комплекты, сохраненные в 'области резервного копирования'<b>{0}</b>?</p></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>Копировать набор изменений (Stop)</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>Копировать набор изменений (Abort)</translation> </message> @@ -30259,40 +30259,50 @@ <translation>Введите опционально автора фиксации</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>Счетчик удалений:</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>Число ведущих директорий для удаления (по умолчанию 1)</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>Файл патча:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="178"/> - <source>Enter the name of the patch file</source> - <translation>Введите имя файла патча</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="185"/> - <source>Select to enforce the import</source> - <translation>Разрешить применение импорта</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="188"/> + <source>Enter the name of the patch file</source> + <translation>Введите имя файла патча</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="195"/> + <source>Select to enforce the import</source> + <translation>Разрешить применение импорта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="198"/> <source>Enforce Import</source> <translation>Применять импорт</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>Файлы патчей (*.diff *.patch);;Все файлы (*)</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> @@ -61262,22 +61272,22 @@ <translation>{0} on {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1024"/> + <location filename="../QScintilla/Shell.py" line="1030"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1032"/> + <location filename="../QScintilla/Shell.py" line="1038"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</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><p><b>{0}</b> не является файлом</p></translation> </message> @@ -61328,7 +61338,7 @@ Функция: {3}({4})</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2005"/> + <location filename="../QScintilla/Shell.py" line="2015"/> <source>Project</source> <translation>Проект</translation> </message> @@ -61358,7 +61368,7 @@ <translation>Активное виртуальное окружение</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1825"/> + <location filename="../QScintilla/Shell.py" line="1835"/> <source>Available Virtual Environments: {0} </source> @@ -61367,7 +61377,7 @@ </translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1866"/> + <location filename="../QScintilla/Shell.py" line="1876"/> <source>Current Virtual Environment: '{0}' </source> <translation>Текущее виртуальное окружение: '{0}' @@ -83317,12 +83327,12 @@ <translation> сек</translation> </message> <message> - <location filename="../WebBrowser/WebBrowserPage.py" line="170"/> + <location filename="../WebBrowser/WebBrowserPage.py" line="171"/> <source>Suspicuous URL detected</source> <translation>Обнаружен подозрительный URL</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><p>URL <b>{0}</b> был найден в базе Safe Browsing.</p>{1}</translation> </message> @@ -86596,12 +86606,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="387"/> + <location filename="../eric6.py" line="390"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../eric6.py" line="392"/> + <location filename="../eric6.py" line="395"/> <source>Generating Main Window...</source> <translation>Создание главного окна...</translation> </message> @@ -86768,7 +86778,7 @@ <translation>Определены синтаксические ошибки в doctest.</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>нет сообщения, определенного для кода '{0}'</translation> </message> @@ -86877,6 +86887,81 @@ <source>use ==/!= to compare str, bytes, and int literals</source> <translation>используйте == /! = для сравнения str, bytes, и int литералов</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>
--- a/eric6/i18n/eric6_tr.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_tr.ts Thu Feb 06 19:19:19 2020 +0100 @@ -30288,72 +30288,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> @@ -30383,7 +30383,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> @@ -30418,62 +30418,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> @@ -30508,22 +30508,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> @@ -32823,40 +32823,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> @@ -64058,22 +64068,22 @@ <translation>{0} üzerin {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1024"/> + <location filename="../QScintilla/Shell.py" line="1030"/> <source>StdOut: {0}</source> <translation>Stdçıktı:{0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1032"/> + <location filename="../QScintilla/Shell.py" line="1038"/> <source>StdErr: {0}</source> <translation>stdhata: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>Düşme hatası</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><p><b>{0}</b> bir dosya değil.</p></translation> </message> @@ -64116,7 +64126,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">Proje</translation> </message> @@ -64146,14 +64156,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> @@ -86048,12 +86058,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> @@ -89366,12 +89376,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">Anapencere üretiliyor...</translation> </message> @@ -89528,7 +89538,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> @@ -89637,6 +89647,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>
--- a/eric6/i18n/eric6_zh_CN.ts Tue Feb 04 19:43:37 2020 +0100 +++ b/eric6/i18n/eric6_zh_CN.ts Thu Feb 06 19:19:19 2020 +0100 @@ -30816,72 +30816,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> @@ -30911,7 +30911,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> @@ -30946,62 +30946,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> @@ -31036,22 +31036,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> @@ -33291,40 +33291,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> @@ -64673,7 +64683,7 @@ <translation>No.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2147"/> + <location filename="../QScintilla/Shell.py" line="2157"/> <source>Drop Error</source> <translation>降落误差</translation> </message> @@ -64688,17 +64698,17 @@ <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><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"><p><b>{0}</b> 不是一个文件。</p></translation> </message> @@ -64741,7 +64751,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> @@ -64771,14 +64781,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> @@ -86802,12 +86812,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> @@ -90096,12 +90106,12 @@ <context> <name>eric6</name> <message> - <location filename="../eric6.py" line="387"/> + <location filename="../eric6.py" line="390"/> <source>Starting...</source> <translation>正在启动…</translation> </message> <message> - <location filename="../eric6.py" line="392"/> + <location filename="../eric6.py" line="395"/> <source>Generating Main Window...</source> <translation>正在产生主窗口…</translation> </message> @@ -90252,7 +90262,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> @@ -90361,6 +90371,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>