--- a/i18n/eric6_de.ts Sun Nov 06 13:39:36 2016 +0100
+++ b/i18n/eric6_de.ts Sun Nov 06 17:02:45 2016 +0100
@@ -3235,37 +3235,37 @@
<translation>Nachricht</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="77"/>
<source>PEP-257</source>
<translation>PEP-257</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/>
- <source>Eric</source>
- <translation>Eric</translation>
- </message>
- <message>
<location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/>
+ <source>Eric</source>
+ <translation>Eric</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="82"/>
<source>Statistics...</source>
<translation>Statistik...</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="84"/>
<source>Press to show some statistics for the last run</source>
<translation>Drücken, um eine Statistik für den letzten Lauf zu zeigen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="87"/>
<source>Show</source>
<translation>Zeige</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="89"/>
<source>Press to show all files containing an issue</source>
<translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="566"/>
<source>Error: {0}</source>
<translation>Fehler: {0}</translation>
</message>
@@ -3275,7 +3275,7 @@
<translation>Lösung: {0}</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="707"/>
<source>No issues found.</source>
<translation>Keine Probleme gefunden.</translation>
</message>
@@ -3300,12 +3300,12 @@
<translation>Ignorierte anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="659"/>
<source>{0} (ignored)</source>
<translation>{0} (ignoriert)</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="551"/>
<source>Preparing files...</source>
<translation>Bereite Dateien vor...</translation>
</message>
@@ -3320,12 +3320,12 @@
<translation>Gib die maximal erlaubte Codekomplexität ein (McCabe: 10)</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="144"/>
<source>Errors</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="593"/>
<source>Transferring data...</source>
<translation>Übertrage Daten...</translation>
</message>
@@ -3429,6 +3429,11 @@
<source>&Reset Defaults</source>
<translation>Standards lösc&hen</translation>
</message>
+ <message>
+ <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="710"/>
+ <source>No files found (check your ignore list).</source>
+ <translation>Keine Dateien gefunden (überprüfe die Ignorierliste).</translation>
+ </message>
</context>
<context>
<name>CodeStyleCheckerPlugin</name>
@@ -21399,447 +21404,437 @@
<context>
<name>Hg</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="285"/>
- <source>The hg process finished with the exit code {0}</source>
- <translation>Der hg-Prozess endete mit dem Code {0}</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/>
<source>The hg process did not finish within 30s.</source>
<translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="292"/>
- <source>Could not start the hg executable.</source>
- <translation>Das hg Programm konnte nicht gestartet werden.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
<source>Create project repository</source>
<translation>Projektrepository anlegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="320"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="288"/>
<source>The project repository could not be created.</source>
<translation>Das Projektrepository konnte nicht erzeugt werden.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="349"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/>
<source>Creating Mercurial repository</source>
<translation>Lege Mercurial-Repository an</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="333"/>
<source>Initial commit to Mercurial repository</source>
<translation>Erstes Commit für das Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="413"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="381"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Klone das Projekt aus dem Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="663"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="631"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Gleiche mit dem Mercurial-Repository ab</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="681"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Füge Dateien/Verzeichnisse dem Mercurial-Repository hinzu</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="783"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="751"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Lösche Dateien/Verzeichnisse aus dem Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="845"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="813"/>
<source>Renaming {0}</source>
<translation>Benenne {0} um</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1066"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1034"/>
<source>Reverting changes</source>
<translation>Mache Änderungen rückgängig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1111"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1079"/>
<source>Merging</source>
<translation>Zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1413"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/>
<source>Mercurial command</source>
<translation>Mercurial-Befehl</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/>
<source>Copying {0}</source>
<translation>Kopiere {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2034"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2002"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Pull von einem entfernten Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Push in ein entferntes Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2264"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Erzeuge Zweig im Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Verifiziere die Integrität des Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2441"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2409"/>
<source>Showing the combined configuration settings</source>
<translation>Zeige die kombinierten Einstellungen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2465"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2433"/>
<source>Showing aliases for remote repositories</source>
<translation>Zeige Namen für entfernte Repositorys</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2489"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/>
<source>Recovering from interrupted transaction</source>
<translation>Setze abgebrochene Transaktion zurück</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2711"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
<source>Shall the working directory be updated?</source>
<translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2325"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/>
<source>Showing current branch</source>
<translation>Zeige aktuellen Zweig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2642"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2610"/>
<source>Create changegroup</source>
<translation>Änderungsgruppe erzeugen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2723"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2691"/>
<source>Apply changegroups</source>
<translation>Änderungsgruppen anwenden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2709"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Ungültiger Bisect Unterbefehl ({0}).</translation>
</message>
<message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2739"/>
+ <source>Mercurial Bisect ({0})</source>
+ <translation>Mercurial-Bisect ({0})</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2631"/>
+ <source>Preview changegroup</source>
+ <translation>Änderungsgruppe ansehen</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+ <source>Identifying project directory</source>
+ <translation>Projektverzeichnis identifizieren</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+ <source>Create .hgignore file</source>
+ <translation>.hgignore-Datei erstellen</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2519"/>
+ <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
+ <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
+ </message>
+ <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/>
- <source>Mercurial Bisect ({0})</source>
- <translation>Mercurial-Bisect ({0})</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
- <source>Preview changegroup</source>
- <translation>Änderungsgruppe ansehen</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2513"/>
- <source>Identifying project directory</source>
- <translation>Projektverzeichnis identifizieren</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
- <source>Create .hgignore file</source>
- <translation>.hgignore-Datei erstellen</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/>
- <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
- <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2803"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Lösche Dateien nur aus dem Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2567"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial-Änderungsgruppendateien (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2671"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial-Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2857"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2825"/>
<source>Backing out changeset</source>
<translation>Änderungssatz umkehren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2837"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2805"/>
<source>No revision given. Aborting...</source>
<translation>Keine Revision angegeben. Abbruch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2616"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2584"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Die Mercurial-Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2884"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/>
<source>Rollback last transaction</source>
<translation>Letzte Transaktion zurücksetzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2877"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2845"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="576"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/>
<source>Committing changes to Mercurial repository</source>
<translation>Pflege Änderungen in das Mercurial-Repository ein</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
<source>Mercurial Command Server</source>
<translation>Mercurial-Befehlsserver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3394"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3362"/>
<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="3539"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
<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="2952"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2920"/>
<source>Import Patch</source>
<translation>Patch importieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2999"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
<source>Export Patches</source>
<translation>Patches exportieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3046"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
<source>Change Phase</source>
<translation>Phase ändern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3067"/>
<source>Copy Changesets</source>
<translation>Änderungssätze kopieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3125"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3093"/>
<source>Copy Changesets (Continue)</source>
<translation>Änderungssätze kopieren (Fortsetzung)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3263"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3231"/>
<source>Add Sub-repository</source>
<translation>Unterrepository hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3296"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3264"/>
<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="3244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3212"/>
<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="3315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
<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="3315"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3283"/>
<source>Remove Sub-repositories</source>
<translation>Unterrepositorys löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3252"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
<source>Commit Changes</source>
<translation>Änderungen einpflegen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="509"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="477"/>
<source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source>
<translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
<source>Revert changes</source>
<translation>Änderungen rückgängig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1051"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1019"/>
<source>Do you really want to revert all changes to these files or directories?</source>
<translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1060"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1028"/>
<source>Do you really want to revert all changes of the project?</source>
<translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3160"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3128"/>
<source>Create Unversioned Archive</source>
<translation>Erzeuge nicht versioniertes Archiv</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
<source>Mercurial Side-by-Side Difference</source>
<translation>Mercurial Unterschiede nebeneinander anzeigen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1946"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1914"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="978"/>
<source>Tagging in the Mercurial repository</source>
<translation>Marke im Mercurial-Repository setzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2303"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2271"/>
<source>Created new branch <{0}>.</source>
<translation>Neuer Zweig <{0}> wurde angelegt.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1187"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1155"/>
<source>Current branch tip</source>
<translation>Spitze des aktuellen Zweigs</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2263"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2231"/>
<source>Cancelling uncommitted merge</source>
<translation>Breche Zusammenführung ab</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
<source>Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
<source>Delete Bookmark</source>
<translation>Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3667"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
<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="3678"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
<source>Delete Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3706"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
<source>Rename Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen umbenennen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3739"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
<source>Move Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen verschieben</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
<source>Pull Bookmark</source>
<translation>Lesezeichen herunterladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3799"/>
<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="3842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3810"/>
<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="3871"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
<source>Push Bookmark</source>
<translation>Lesezeichen hochladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3871"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3839"/>
<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="3882"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3850"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
<source>Re-Merge</source>
<translation>Neu zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1148"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/>
<source>Do you really want to re-merge these files or directories?</source>
<translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/>
<source>Do you really want to re-merge the project?</source>
<translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/>
<source>Re-Merging</source>
<translation>Neu zusammenführen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2202"/>
<source>Marking as 'unresolved'</source>
<translation>Markiere als 'nicht aufgelöst'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2236"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<source>Marking as 'resolved'</source>
<translation>Markiere als 'aufgelöst'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
<source>Delete All Backups</source>
<translation>Alle Backups löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/>
<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>
@@ -23734,12 +23729,12 @@
<context>
<name>HgHisteditCommitEditor</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
<source>Edit Commit Message</source>
<translation>Änderungsbeschreibung bearbeiten</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py" line="98"/>
<source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></translation>
</message>
@@ -23910,7 +23905,7 @@
<context>
<name>HgHisteditPlanEditor</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
<source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht geladen werden.<br/>Grund: {1}</p></translation>
</message>
@@ -28967,22 +28962,22 @@
<context>
<name>HgUserConfigDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
<source>Delete Host Fingerprint</source>
<translation>Fingerabdruck löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="361"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="448"/>
<source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source>
<translation><p>Soll der Fingerabdruck für den Host <b>{0}</b> wirklich gelöscht werden?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
<source>Edit User Configuration</source>
<translation>Nutzerkonfiguration editieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="504"/>
<source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
<translation>Sie werden alle Änderungen, die in diesem Dialog vorgenommen wurden, verlieren. Sollen die Daten vorher gesichert werden?</translation>
</message>
@@ -29290,20 +29285,43 @@
<translation>Rechnernamen eingeben</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="71"/>
<source>Fingerprint:</source>
<translation>Fingerabdruck:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="78"/>
<source>Enter the host fingerprint</source>
<translation>Gib den Fingerabdruck des Rechners ein</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="81"/>
<source>Enter Fingerprint</source>
<translation>Fingerabdruck eingeben</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/>
+ <source>Hash Type:</source>
+ <translation>Hashtyp:</translation>
+ </message>
+</context>
+<context>
+ <name>HgUtilities</name>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="98"/>
+ <source>The hg process finished with the exit code {0}</source>
+ <translation>Der hg-Prozess endete mit dem Code {0}</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="103"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUtilities.py" line="107"/>
+ <source>Could not start the hg executable.</source>
+ <translation>Das hg Programm konnte nicht gestartet werden.</translation>
+ </message>
</context>
<context>
<name>Histedit</name>
@@ -71022,24 +71040,24 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1480"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1448"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
<tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1500"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
@@ -71048,24 +71066,24 @@
<tr><td><b>Committed um</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2154"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Spitze</b></td><td></td></tr>
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2157"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2177"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -71076,12 +71094,12 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2167"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2135"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1538"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1506"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -71092,14 +71110,14 @@
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
<source><tr><td><b>Head #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Kopf #{0}</b></td><td></td></tr>
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
</source>
<translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
