--- 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>
