--- a/i18n/eric6_de.ts Fri Feb 16 20:18:29 2018 +0100
+++ b/i18n/eric6_de.ts Sat Feb 17 14:59:26 2018 +0100
@@ -29408,117 +29408,117 @@
<translation>Push in ein entferntes Mercurial-Repository</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/>
<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="2357"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/>
<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="2382"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/>
<source>Showing the combined configuration settings</source>
<translation>Zeige die kombinierten Einstellungen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2406"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/>
<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="2430"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/>
<source>Recovering from interrupted transaction</source>
<translation>Setze abgebrochene Transaktion zurück</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/>
<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="2238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/>
<source>Showing current branch</source>
<translation>Zeige aktuellen Zweig</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/>
<source>Create changegroup</source>
<translation>Änderungsgruppe erzeugen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/>
<source>Apply changegroups</source>
<translation>Änderungsgruppen anwenden</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Ungültiger Bisect Unterbefehl ({0}).</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial-Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/>
<source>Preview changegroup</source>
<translation>Änderungsgruppe ansehen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/>
<source>Identifying project directory</source>
<translation>Projektverzeichnis identifizieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
<source>Create .hgignore file</source>
<translation>.hgignore-Datei erstellen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
<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="2761"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/>
<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="2556"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial-Änderungsgruppendateien (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
<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="2815"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/>
<source>Backing out changeset</source>
<translation>Änderungssatz umkehren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/>
<source>No revision given. Aborting...</source>
<translation>Keine Revision angegeben. Abbruch...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/>
<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="2842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/>
<source>Rollback last transaction</source>
<translation>Letzte Transaktion zurücksetzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation>
</message>
@@ -29528,72 +29528,72 @@
<translation>Pflege Änderungen in das Mercurial-Repository ein</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/>
<source>Mercurial Command Server</source>
<translation>Mercurial-Befehlsserver</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/>
<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="3497"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/>
<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="2910"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/>
<source>Import Patch</source>
<translation>Patch importieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/>
<source>Export Patches</source>
<translation>Patches exportieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/>
<source>Change Phase</source>
<translation>Phase ändern</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/>
<source>Copy Changesets</source>
<translation>Änderungssätze kopieren</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/>
<source>Copy Changesets (Continue)</source>
<translation>Änderungssätze kopieren (Fortsetzung)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/>
<source>Add Sub-repository</source>
<translation>Unterrepository hinzufügen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/>
<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="3202"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/>
<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="3273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/>
<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="3273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/>
<source>Remove Sub-repositories</source>
<translation>Unterrepositorys löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation>
</message>
@@ -29623,7 +29623,7 @@
<translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/>
<source>Create Unversioned Archive</source>
<translation>Erzeuge nicht versioniertes Archiv</translation>
</message>
@@ -29648,7 +29648,7 @@
<translation>Marke im Mercurial-Repository setzen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/>
<source>Created new branch <{0}>.</source>
<translation>Neuer Zweig <{0}> wurde angelegt.</translation>
</message>
@@ -29658,67 +29658,62 @@
<translation>Spitze des aktuellen Zweigs</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/>
- <source>Cancelling uncommitted merge</source>
- <translation>Breche Zusammenführung ab</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/>
<source>Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/>
<source>Delete Bookmark</source>
<translation>Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/>
<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="3649"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/>
<source>Delete Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/>
<source>Rename Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen umbenennen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/>
<source>Move Mercurial Bookmark</source>
<translation>Mercurial-Lesezeichen verschieben</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/>
<source>Pull Bookmark</source>
<translation>Lesezeichen herunterladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/>
<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="3831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/>
<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="3863"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/>
<source>Push Bookmark</source>
<translation>Lesezeichen hochladen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/>
<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="3875"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation>
</message>
@@ -29753,15 +29748,20 @@
<translation>Markiere als 'aufgelöst'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/>
<source>Delete All Backups</source>
<translation>Alle Backups löschen</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/>
<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="2180"/>
+ <source>Canceling uncommitted merge</source>
+ <translation>Breche Zusammenführung ab</translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -41913,7 +41913,7 @@
<message>
<location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/>
<source>Select to enable JavaScript support</source>
- <translation type="unfinished">Auswählen, um JavaScript zu aktivieren</translation>
+ <translation>Auswählen, um JavaScript zu aktivieren</translation>
</message>
</context>
<context>
