--- a/i18n/eric5_de.ts Mon May 28 15:59:36 2012 +0200
+++ b/i18n/eric5_de.ts Tue May 29 20:59:40 2012 +0200
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de">
+<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
<context>
<name>AboutDialog</name>
<message>
@@ -1783,7 +1782,7 @@
</message>
<message>
<location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/>
- <source>Open in New &Tab Ctrl+LMB</source>
+ <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source>
<translation>In neuem &Register öffnen\tStrg+LMK</translation>
</message>
</context>
@@ -2020,7 +2019,7 @@
</message>
<message>
<location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/>
- <source>Open in New &Tab Ctrl+LMB</source>
+ <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source>
<translation>In neuem &Register öffnen\tStrg+LMK</translation>
</message>
</context>
@@ -13665,7 +13664,7 @@
</message>
<message>
<location filename="Helpviewer/HelpBrowserWV.py" line="910"/>
- <source>Open Link in New Tab Ctrl+LMB</source>
+ <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
<translation>Link in neuem Fenster öffnen\tStrg+LMK</translation>
</message>
</context>
@@ -16517,277 +16516,277 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/>
<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="252"/>
- <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="254"/>
+ <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="256"/>
<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="280"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/>
<source>Create project repository</source>
<translation>Projektrepository anlegen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/>
<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="308"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/>
<source>Creating Mercurial repository</source>
<translation>Lege Mercurial Repository an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/>
<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="369"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/>
<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="531"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/>
<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="583"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/>
<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="647"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/>
<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="711"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/>
<source>Renaming {0}</source>
<translation>Benenne {0} um</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/>
<source>Taging in the Mercurial repository</source>
<translation>Marke im Mercurial Repository setzen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/>
<source>Reverting changes</source>
<translation>Mache Änderungen rückgängig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/>
<source>Merging</source>
<translation>Zusammenführen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/>
<source>Mercurial command</source>
<translation>Mercurial Befehl</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/>
<source>Copying {0}</source>
<translation>Kopiere {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/>
<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="1650"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/>
<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="1769"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/>
<source>Resolving files/directories</source>
<translation>Löse Dateien/Verzeichnisse auf</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
<source>Create Branch</source>
<translation>Zweig erzeugen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/>
<source>Enter branch name</source>
<translation>Gib den Zweignamen ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/>
<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="1882"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/>
<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="1907"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/>
<source>Showing the combined configuration settings</source>
<translation>Zeige die kombinierten Einstellungen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/>
<source>Showing aliases for remote repositories</source>
<translation>Zeige Namen für entfernte Repositories</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/>
<source>Recovering from interrupted transaction</source>
<translation>Setze abgebrochene Transaktion zurück</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/>
<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="1825"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/>
<source>Showing current branch</source>
<translation>Zeige aktuellen Zweig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/>
<source>Create changegroup</source>
<translation>Änderungsgruppe erzeugen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/>
<source>Apply changegroups</source>
<translation>Änderungsgruppen anwenden</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Ungültiger Bisect Unterbefehl ({0}).</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/>
<source>Preview changegroup</source>
<translation>Änderungsgruppe ansehen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/>
<source>Identifying project directory</source>
<translation>Projektverzeichnis identifizieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
<source>Create .hgignore file</source>
<translation>.hgignore Datei erstellen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/>
<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="2286"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/>
<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="2058"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial Änderungsgruppendateien (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/>
<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="2162"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/>
<source>Identifying changegroup file</source>
<translation>Identifiziere Änderungsgruppendatei</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/>
<source>Backing out changeset</source>
<translation>Änderungssatz umkehren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/>
<source>No revision given. Aborting...</source>
<translation>Keine Revision angegeben. Abbruch...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/>
<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="2367"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/>
<source>Rollback last transaction</source>
<translation>Letzte Transaktion zurücksetzen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/>
<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="479"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/>
<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="2745"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/>
<source>Mercurial Command Server</source>
<translation>Mercurial Befehlsserver</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/>
<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="2745"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/>
<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="2434"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/>
<source>Import Patch</source>
<translation>Patch importieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/>
<source>Export Patches</source>
<translation>Patches exportieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/>
<source>Change Phase</source>
<translation>Phase ändern</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
<source>Copy Changesets</source>
<translation>Änderungssätze kopieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/>
<source>Copy Changesets (Continue)</source>
<translation>Änderungssätze kopieren (Fortsetzung)</translation>
</message>
@@ -19360,11 +19359,6 @@
<translation>Änderungen rückgängig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/>
- <source>Resolve conflict</source>
- <translation>Konflikt lösen</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/>
<source>Select all local file entries</source>
<translation>Alle lokalen Dateieinträge auswählen</translation>
@@ -19399,6 +19393,11 @@
<source>Do you really want to remove these files from the repository?</source>
<translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/>
+ <source>Conflict resolved</source>
+ <translation>Konflikt gelöst</translation>
+ </message>
</context>
<context>
<name>HgProjectHelper</name>
@@ -19544,711 +19543,671 @@
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
- <source>Add to repository</source>
- <translation>Zum Repository hinzufügen</translation>
+ <source>Remove from repository (and disk)</source>
+ <translation>Vom Repository (und der Platte) löschen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/>
- <source>&Add to repository...</source>
- <translation>Zum Repository &hinzufügen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/>
- <source>Add the local project to the repository</source>
- <translation>Fügt das lokale Projekt zum Repository hinzu</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/>
- <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source>
- <translation><b>Zum Repository hinzufügen</b><p>Dies fügt das lokale Projekt zum Repository hinzu.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/>
- <source>Remove from repository (and disk)</source>
- <translation>Vom Repository (und der Platte) löschen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/>
<source>&Remove from repository (and disk)</source>
<translation>Vom Repository (und der Platte) &löschen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/>
<source>Remove the local project from the repository (and disk)</source>
<translation>Löscht das lokale Projekt von dem Repository (und der Platte)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/>
<source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source>
<translation><b>Vom Repository löschen</b><p>Dies löscht das lokale Projekt vom Repository (und der Platte).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/>
<source>Show log</source>
<translation>Beschreibungen anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/>
<source>Show &log</source>
<translation>&Beschreibungen anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/>
<source>Show the log of the local project</source>
<translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
<translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/>
<source>Show log browser</source>
<translation>Zeige Log Browser</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/>
<source>Show a dialog to browse the log of the local project</source>
<translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/>
+ <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
+ <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/>
+ <source>Show difference</source>
+ <translation>Unterschiede anzeigen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/>
+ <source>Show &difference</source>
+ <translation>&Unterschiede anzeigen</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/>
- <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
- <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/>
- <source>Show difference</source>
- <translation>Unterschiede anzeigen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/>
- <source>Show &difference</source>
- <translation>&Unterschiede anzeigen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/>
<source>Show the difference of the local project to the repository</source>
<translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/>
<source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
<translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/>
<source>Show difference (extended)</source>
<translation>Unterschiede anzeigen (erweitert)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Zeigt den Unterschied von Revisionen des Projektes an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/>
<source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
<translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
<source>Show status</source>
<translation>Status anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/>
<source>Show &status</source>
<translation>Status an&zeigen</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/>
+ <source>Show the status of the local project</source>
+ <translation>Zeige den Status des lokalen Projektes an</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/>
+ <source><b>Show status</b><p>This shows the status of the local project.</p></source>
+ <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/>
+ <source>Show heads</source>
+ <translation>Köpfe anzeigen</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/>
- <source>Show the status of the local project</source>
- <translation>Zeige den Status des lokalen Projektes an</translation>
+ <source>Show the heads of the repository</source>
+ <translation>Zeigt die Köpfe des Repository an</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/>
- <source><b>Show status</b><p>This shows the status of the local project.</p></source>
- <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation>
+ <source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
+ <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/>
- <source>Show heads</source>
- <translation>Köpfe anzeigen</translation>
+ <source>Show parents</source>
+ <translation>Vorgänger anzeigen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/>
- <source>Show the heads of the repository</source>
- <translation>Zeigt die Köpfe des Repository an</translation>
+ <source>Show the parents of the repository</source>
+ <translation>Zeigt die Vorgänger des repository an</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/>
- <source><b>Show heads</b><p>This shows the heads of the repository.</p></source>
- <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation>
+ <source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
+ <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/>
- <source>Show parents</source>
- <translation>Vorgänger anzeigen</translation>
+ <source>Show tip</source>
+ <translation>Spitze (tip) anzeigen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/>
- <source>Show the parents of the repository</source>
- <translation>Zeigt die Vorgänger des repository an</translation>
+ <source>Show the tip of the repository</source>
+ <translation>Zeigt die Spitze (tip) des Repository an</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/>
- <source><b>Show parents</b><p>This shows the parents of the repository.</p></source>
- <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation>
+ <source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
+ <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/>
+ <source>Revert changes</source>
+ <translation>Änderungen rückgängig</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/>
- <source>Show tip</source>
- <translation>Spitze (tip) anzeigen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/>
- <source>Show the tip of the repository</source>
- <translation>Zeigt die Spitze (tip) des Repository an</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/>
- <source><b>Show tip</b><p>This shows the tip of the repository.</p></source>
- <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/>
- <source>Revert changes</source>
- <translation>Änderungen rückgängig</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/>
<source>Re&vert changes</source>
<translation>Änderungen &rückgängig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/>
<source>Revert all changes made to the local project</source>
<translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/>
<source>Merge</source>
<translation>Änderungen einpflegen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/>
<source>Mer&ge changes...</source>
<translation>Änderungen ein&pflegen...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/>
<source>Merge changes of a revision into the local project</source>
<translation>Pflege Änderungen einer Revision in das lokale Projekt ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/>
<source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source>
<translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen einer Revision in das lokale Projekt ein.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/>
- <source>Resolve conflicts</source>
- <translation>Konflikte lösen</translation>
+ <source>Tag in repository</source>
+ <translation>Im Repository markieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/>
- <source>Resolve con&flicts</source>
- <translation>&Konflikte lösen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/>
- <source>Resolve all conflicts of the local project</source>
- <translation>Löse alle Konflikte des lokalen Projektes</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/>
- <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source>
- <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/>
- <source>Tag in repository</source>
- <translation>Im Repository markieren</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/>
<source>&Tag in repository...</source>
<translation>Im Repository &markieren...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/>
+ <source>Tag the local project in the repository</source>
+ <translation>Das lokale Projekt im Repository markieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/>
+ <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
+ <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/>
+ <source>List tags</source>
+ <translation>Marken listen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/>
+ <source>List tags...</source>
+ <translation>Marken listen...</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/>
- <source>Tag the local project in the repository</source>
- <translation>Das lokale Projekt im Repository markieren</translation>
+ <source>List tags of the project</source>
+ <translation>Listet Marken des Projektes</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/>
- <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
- <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/>
- <source>List tags</source>
- <translation>Marken listen</translation>
+ <source>List branches</source>
+ <translation>Zweige listen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/>
- <source>List tags...</source>
- <translation>Marken listen...</translation>
+ <source>List branches...</source>
+ <translation>Zweige listen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/>
- <source>List tags of the project</source>
- <translation>Listet Marken des Projektes</translation>
+ <source>List branches of the project</source>
+ <translation>Listet Zweige des Projektes</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
- <source>List branches</source>
- <translation>Zweige listen</translation>
+ <source>Create branch</source>
+ <translation>Zweig erzeugen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/>
- <source>List branches...</source>
- <translation>Zweige listen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/>
- <source>List branches of the project</source>
- <translation>Listet Zweige des Projektes</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
- <source>Create branch</source>
- <translation>Zweig erzeugen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/>
<source>Create &branch...</source>
<translation>&Zweig erzeugen...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/>
<source>Create a new branch for the local project in the repository</source>
<translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/>
<source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source>
<translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/>
<source>Close branch</source>
<translation>Zweig abschließen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/>
<source>Close the current branch of the local project</source>
<translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/>
<source><b>Close branch</b><p>This closes the current branch of the local project.</p></source>
<translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
<source>Switch</source>
<translation>Umschalten</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
<source>S&witch...</source>
<translation>Umschal&ten...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/>
+ <source>Switch the working directory to another revision</source>
+ <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/>
+ <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
+ <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <source>Cleanup</source>
+ <translation>Aufräumen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/>
+ <source>Cleanu&p</source>
+ <translation>Au&fräumen</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/>
- <source>Switch the working directory to another revision</source>
- <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation>
+ <source>Cleanup the local project</source>
+ <translation>Räume das lokale Projekt auf</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/>
- <source><b>Switch</b><p>This switches the working directory to another revision.</p></source>
- <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
- <source>Cleanup</source>
- <translation>Aufräumen</translation>
+ <source>Execute command</source>
+ <translation>Befehl ausführen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/>
- <source>Cleanu&p</source>
- <translation>Au&fräumen</translation>
+ <source>E&xecute command...</source>
+ <translation>Befehl ausf&ühren...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/>
- <source>Cleanup the local project</source>
- <translation>Räume das lokale Projekt auf</translation>
+ <source>Execute an arbitrary Mercurial command</source>
+ <translation>Führe einen beliebigen Mercurial Befehl aus</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
+ <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial Befehls.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/>
- <source>Execute command</source>
- <translation>Befehl ausführen</translation>
+ <source>Command options</source>
+ <translation>Befehlsoptionen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/>
- <source>E&xecute command...</source>
- <translation>Befehl ausf&ühren...</translation>
+ <source>Command &options...</source>
+ <translation>Befehls&optionen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/>
- <source>Execute an arbitrary Mercurial command</source>
- <translation>Führe einen beliebigen Mercurial Befehl aus</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/>
- <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source>
- <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial Befehls.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/>
- <source>Command options</source>
- <translation>Befehlsoptionen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/>
- <source>Command &options...</source>
- <translation>Befehls&optionen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/>
<source>Show the Mercurial command options</source>
<translation>Zeigt die Mercurial Befehlsoptionen</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/>
+ <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source>
+ <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial Befehlsoptionen.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Configure</source>
+ <translation>Einstellungen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/>
+ <source>Configure...</source>
+ <translation>Einstellungen...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/>
+ <source>Show the configuration dialog with the Mercurial page selected</source>
+ <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/>
- <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source>
- <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial Befehlsoptionen.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
- <source>Configure</source>
- <translation>Einstellungen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
- <source>Configure...</source>
- <translation>Einstellungen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
- <source>Show the configuration dialog with the Mercurial page selected</source>
- <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
<source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source>
<translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
+ <source>Show paths</source>
+ <translation>Pfade anzeigen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/>
+ <source>Show paths...</source>
+ <translation>Pfade anzeigen...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/>
+ <source>Show the aliases for remote repositories</source>
+ <translation>Zeigt die Namen für entfernte Repositories</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/>
+ <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
+ <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositories.</p<</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/>
- <source>Show paths</source>
- <translation>Pfade anzeigen</translation>
+ <source>Verify repository</source>
+ <translation>Repository verifizieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/>
- <source>Show paths...</source>
- <translation>Pfade anzeigen...</translation>
+ <source>Verify repository...</source>
+ <translation>Repository verifizieren...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/>
- <source>Show the aliases for remote repositories</source>
- <translation>Zeigt die Namen für entfernte Repositories</translation>
+ <source>Verify the integrity of the repository</source>
+ <translation>Verfiziert die Integrität des Repository</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/>
- <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source>
- <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositories.</p<</translation>
+ <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
+ <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
- <source>Verify repository</source>
- <translation>Repository verifizieren</translation>
+ <source>Recover</source>
+ <translation>Transaktion zurücksetzen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/>
- <source>Verify repository...</source>
- <translation>Repository verifizieren...</translation>
+ <source>Recover...</source>
+ <translation>Transaktion zurücksetzen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/>
- <source>Verify the integrity of the repository</source>
- <translation>Verfiziert die Integrität des Repository</translation>
+ <source>Recover from an interrupted transaction</source>
+ <translation>Setzt eine abgebrochene Transaktion zurück</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/>
- <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source>
- <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
- <source>Recover</source>
- <translation>Transaktion zurücksetzen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
- <source>Recover...</source>
- <translation>Transaktion zurücksetzen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/>
- <source>Recover from an interrupted transaction</source>
- <translation>Setzt eine abgebrochene Transaktion zurück</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/>
<source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source>
<translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/>
<source>Repository Administration</source>
<translation>Repository Administration</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <source>Create .hgignore</source>
+ <translation>Erstelle .hgignore</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
+ <source>Create a .hgignore file with default values</source>
+ <translation>Erstelle eine .hgignore Datei mit Standardwerten</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
+ <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore Datei mit Standardwerten.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
- <source>Create .hgignore</source>
- <translation>Erstelle .hgignore</translation>
+ <source>Create changegroup</source>
+ <translation>Änderungsgruppe erzeugen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/>
+ <source>Create changegroup...</source>
+ <translation>Änderungsgruppe erzeugen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/>
- <source>Create a .hgignore file with default values</source>
- <translation>Erstelle eine .hgignore Datei mit Standardwerten</translation>
+ <source>Create changegroup file collecting changesets</source>
+ <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/>
+ <source>Apply changegroups</source>
+ <translation>Änderungsgruppen anwenden</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/>
+ <source>Apply changegroups...</source>
+ <translation>Änderungsgruppen anwenden...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/>
+ <source>Apply one or several changegroup files</source>
+ <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/>
+ <source>Changegroup Management</source>
+ <translation>Verwaltung von Änderungsgruppen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/>
- <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source>
- <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore Datei mit Standardwerten.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <source>Create changegroup</source>
- <translation>Änderungsgruppe erzeugen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/>
- <source>Create changegroup...</source>
- <translation>Änderungsgruppe erzeugen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/>
- <source>Create changegroup file collecting changesets</source>
- <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/>
- <source>Apply changegroups</source>
- <translation>Änderungsgruppen anwenden</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/>
- <source>Apply changegroups...</source>
- <translation>Änderungsgruppen anwenden...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/>
- <source>Apply one or several changegroup files</source>
- <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/>
- <source>Changegroup Management</source>
- <translation>Verwaltung von Änderungsgruppen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/>
<source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source>
<translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/>
<source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source>
<translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit 'Änderungsgruppe erzeugen' erstellte Änderungsgruppendateien an (hg unbundle).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/>
<source>Show current branch</source>
<translation>Zeige aktuellen Zweig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/>
<source>Show the current branch of the project</source>
<translation>Zeigt den aktuellen Zweig des Projektes</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/>
<source><b>Show current branch</b><p>This shows the current branch of the project.</p></source>
<translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <source>Mark as "good"</source>
+ <translation>Als "gut" markieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/>
+ <source>Mark a selectable changeset as good</source>
+ <translation>Markiere einen auswählbaren Änderungssatz als gut</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/>
+ <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
+ <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
- <source>Mark as "good"</source>
- <translation>Als "gut" markieren</translation>
+ <source>Mark as "bad"</source>
+ <translation>Als "schlecht" markieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/>
- <source>Mark a selectable changeset as good</source>
- <translation>Markiere einen auswählbaren Änderungssatz als gut</translation>
+ <source>Mark a selectable changeset as bad</source>
+ <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/>
- <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source>
- <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
- <source>Mark as "bad"</source>
- <translation>Als "schlecht" markieren</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
- <source>Mark a selectable changeset as bad</source>
- <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source>
<translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
- <source>Skip</source>
- <translation>Überspringen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/>
- <source>Reset</source>
- <translation>Zurücksetzen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
- <source>Reset the bisect search data</source>
- <translation>Setzt die Bisect Suchdaten zurück</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
- <source><b>Reset</b><p>This resets the bisect search data.</p></source>
- <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/>
- <source>Bisect</source>
- <translation>Bisect</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
- <source>Mark as "good"...</source>
- <translation>Als "gut" markieren...</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
+ <source>Skip</source>
+ <translation>Überspringen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <source>Reset</source>
+ <translation>Zurücksetzen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/>
+ <source>Reset the bisect search data</source>
+ <translation>Setzt die Bisect Suchdaten zurück</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
+ <source><b>Reset</b><p>This resets the bisect search data.</p></source>
+ <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/>
+ <source>Bisect</source>
+ <translation>Bisect</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/>
+ <source>Mark as "good"...</source>
+ <translation>Als "gut" markieren...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/>
<source>Mark as "bad"...</source>
<translation>Als "schlecht" markieren...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
<source>Preview changegroup</source>
<translation>Änderungsgruppe ansehen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/>
<source>Preview changegroup...</source>
<translation>Änderungsgruppe ansehen...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Identify</source>
<translation>Identifizieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/>
<source>Identify...</source>
<translation>Identifizieren...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/>
<source>Identify the project directory</source>
<translation>Identifiziere das Projektverzeichnis</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/>
<source><b>Identify</b><p>This identifies the project directory.</p></source>
<translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/>
<source>Preview a changegroup file containing a collection of changesets</source>
<translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/>
<source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source>
<translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
<source>Identify changegroup</source>
<translation>Änderungsgruppe identifizieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/>
<source>Identify changegroup...</source>
<translation>Änderungsgruppe identifizieren...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/>
<source>Identify a changegroup file containing a collection of changesets</source>
<translation>Eine Änderungsgruppendatei für Änderungssätze identifizieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/>
<source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source>
<translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/>
<source>Back out changeset</source>
<translation>Änderungssatz umkehren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/>
<source>Back out changes of an earlier changeset</source>
<translation>Änderungen eines früheren Änderungssatzes umkehren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/>
<source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source>
<translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation>
</message>
@@ -20268,260 +20227,280 @@
<translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option 'force' hoch.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/>
<source>Specials</source>
<translation>Spezialfunktionen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Serve project repository</source>
<translation>Server für Projektrepository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/>
<source>Serve project repository...</source>
<translation>Server für Projektrepository...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/>
<source>Serve the project repository</source>
<translation>Server für das Projektrepository bereitstellen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/>
<source><b>Serve project repository</b><p>This serves the project repository.</p></source>
<translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/>
<source>Pull</source>
<translation>Pull</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/>
<source>The project should be reread. Do this now?</source>
<translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/>
<source>Push new branch</source>
<translation>Neuen Zweig hochladen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/>
<source>Push the current branch of the local project as a new named branch</source>
<translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/>
<source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source>
<translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/>
<source>Rollback last transaction</source>
<translation>Letzte Transaktion zurücksetzen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/>
<source>Rollback the last transaction</source>
<translation>Die letzte Transaktion zurücksetzen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/>
<source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source>
<translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/>
<source>Extensions</source>
<translation>Erweiterungen</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
+ <source>Edit user configuration</source>
+ <translation>Nutzerkonfiguration editieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/>
+ <source>Edit user configuration...</source>
+ <translation>Nutzerkonfiguration editieren...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/>
+ <source>Show an editor to edit the user configuration file</source>
+ <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/>
+ <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
+ <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
- <source>Edit user configuration</source>
- <translation>Nutzerkonfiguration editieren</translation>
+ <source>Edit repository configuration</source>
+ <translation>Repositorykonfiguration editieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/>
- <source>Edit user configuration...</source>
- <translation>Nutzerkonfiguration editieren...</translation>
+ <source>Edit repository configuration...</source>
+ <translation>Repositorykonfiguration editieren...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/>
- <source>Show an editor to edit the user configuration file</source>
- <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation>
+ <source>Show an editor to edit the repository configuration file</source>
+ <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/>
- <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source>
- <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation>
+ <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
+ <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
- <source>Edit repository configuration</source>
- <translation>Repositorykonfiguration editieren</translation>
+ <source>Show combined configuration settings</source>
+ <translation>Zeige kombinierte Einstellungen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/>
- <source>Edit repository configuration...</source>
- <translation>Repositorykonfiguration editieren...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/>
- <source>Show an editor to edit the repository configuration file</source>
- <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/>
- <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source>
- <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
- <source>Show combined configuration settings</source>
- <translation>Zeige kombinierte Einstellungen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/>
<source>Show combined configuration settings...</source>
<translation>Zeige kombinierte Einstellungen...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/>
<source>Show the combined configuration settings from all configuration files</source>
<translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/>
<source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source>
<translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/>
<source>Skip...</source>
<translation>Überspringen...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/>
<source>Skip a selectable changeset</source>
<translation>Überspringe einen auswählbaren Änderungssatz</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/>
<source><b>Skip</b><p>This skips a selectable changeset.</p></source>
<translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/>
<source>Import Patch</source>
<translation>Patch importieren</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/>
+ <source>Import Patch...</source>
+ <translation>Patch importieren...</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/>
+ <source>Import a patch from a patch file</source>
+ <translation>Einen Patch aus einer Patchdatei importieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/>
+ <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
+ <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/>
+ <source>Patch Management</source>
+ <translation>Verwaltung von Patches</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/>
+ <source>Revert Changes</source>
+ <translation>Änderungen rückgängig machen</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
- <source>Import Patch...</source>
- <translation>Patch importieren...</translation>
+ <source>Export Patches</source>
+ <translation>Patches exportieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/>
+ <source>Export Patches...</source>
+ <translation>Patches exportieren...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/>
- <source>Import a patch from a patch file</source>
- <translation>Einen Patch aus einer Patchdatei importieren</translation>
+ <source>Export revisions to patch files</source>
+ <translation>Änderungssätze in Patchdateien exportieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/>
- <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source>
- <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/>
- <source>Patch Management</source>
- <translation>Verwaltung von Patches</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/>
- <source>Revert Changes</source>
- <translation>Änderungen rückgängig machen</translation>
+ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
+ <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
- <source>Export Patches</source>
- <translation>Patches exportieren</translation>
+ <source>Change Phase</source>
+ <translation>Phase ändern</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
- <source>Export Patches...</source>
- <translation>Patches exportieren...</translation>
+ <source>Change Phase...</source>
+ <translation>Phase ändern...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/>
- <source>Export revisions to patch files</source>
- <translation>Änderungssätze in Patchdateien exportieren</translation>
+ <source>Change the phase of revisions</source>
+ <translation>Ändert die Phase von Revisionen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/>
- <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
- <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/>
- <source>Change Phase</source>
- <translation>Phase ändern</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/>
- <source>Change Phase...</source>
- <translation>Phase ändern...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/>
- <source>Change the phase of revisions</source>
- <translation>Ändert die Phase von Revisionen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/>
<source><b>Change Phase</b><p>This changes the phase of revisions.</p></source>
<translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/>
+ <source>Copy Changesets</source>
+ <translation>Änderungssätze kopieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/>
+ <source>Copies changesets from another branch</source>
+ <translation>Änderungssätze aus einem anderen Zweig kopieren</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/>
+ <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
+ <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/>
+ <source>Continue Copying Session</source>
+ <translation>Kopiersitzung fortsetzen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
+ <source>Continue the last copying session after conflicts were resolved</source>
+ <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/>
+ <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
+ <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/>
+ <source>Graft</source>
+ <translation>Graft</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/>
- <source>Copy Changesets</source>
- <translation>Änderungssätze kopieren</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/>
- <source>Copies changesets from another branch</source>
- <translation>Änderungssätze aus einem anderen Zweig kopieren</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
- <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source>
- <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/>
- <source>Continue Copying Session</source>
- <translation>Kopiersitzung fortsetzen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
- <source>Continue the last copying session after conflicts were resolved</source>
- <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/>
- <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source>
- <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/>
- <source>Graft</source>
- <translation>Graft</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/>
<source>Copy Changesets (Continue)</source>
<translation>Änderungssätze kopieren (Fortsetzung)</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/>
+ <source>Conflicts resolved</source>
+ <translation>Konflikte gelöst</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/>
+ <source>Con&flicts resolved</source>
+ <translation>&Konflikte gelöst</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -29191,7 +29170,7 @@
<translation><b>Quelltext Abdeckung...</b><p>Dies zeigt die Quelltextabdeckung für alle Python Dateien des Projektes an.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="3901"/>
+ <location filename="Project/Project.py" line="3903"/>
<source>Profile Data</source>
<translation>Profildaten</translation>
</message>
@@ -29216,12 +29195,12 @@
<translation>&Zeige</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3880"/>
+ <location filename="Project/Project.py" line="3882"/>
<source>There is no main script defined for the current project. Aborting</source>
<translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3834"/>
+ <location filename="Project/Project.py" line="3836"/>
<source>Coverage Data</source>
<translation>Quelltext Abdeckungsdaten</translation>
</message>
@@ -29231,7 +29210,7 @@
<translation>&Versionskontrolle</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3954"/>
+ <location filename="Project/Project.py" line="3956"/>
<source>Application Diagram</source>
<translation>Applikations-Diagramm</translation>
</message>
@@ -29261,17 +29240,17 @@
<translation>Projektdatei speichern</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3855"/>
+ <location filename="Project/Project.py" line="3857"/>
<source>Code Coverage</source>
<translation>Quelltext Abdeckung</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3855"/>
+ <location filename="Project/Project.py" line="3857"/>
<source>Please select a coverage file</source>
<translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3901"/>
+ <location filename="Project/Project.py" line="3903"/>
<source>Please select a profile file</source>
<translation>Bitte wählen sie eine Datei mit Profildaten</translation>
</message>
@@ -29416,7 +29395,7 @@
<translation>Sonstige</translation>
</message>
<message>
- <location filename="Project/Project.py" line="3954"/>
+ <location filename="Project/Project.py" line="3956"/>
<source>Include module names?</source>
<translation>Modulnamen anzeigen?</translation>
</message>
@@ -29724,7 +29703,7 @@
</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4085"/>
+ <location filename="Project/Project.py" line="4087"/>
<source>Create Package List</source>
<translation>Erzeuge Paketliste</translation>
</message>
@@ -29734,7 +29713,7 @@
<translation>Erzeuge &Paketliste</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4245"/>
+ <location filename="Project/Project.py" line="4247"/>
<source>Create Plugin Archive</source>
<translation>Erzeuge Plugin Archiv</translation>
</message>
@@ -29744,27 +29723,27 @@
<translation>Erzeuge Plugin &Archiv</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4058"/>
+ <location filename="Project/Project.py" line="4060"/>
<source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source>
<translation><p>Die Datei <b>PKGLIST</b> existiert bereits.</p><p>Überschreiben?</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4085"/>
+ <location filename="Project/Project.py" line="4087"/>
<source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source>
<translation><p>Die Datei <b>PKGLIST</b> konnte nicht erzeugt werden.</p><p>Ursache: {0}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4102"/>
+ <location filename="Project/Project.py" line="4104"/>
<source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source>
<translation><p>Die Datei <b>PKGLIST</b> existiert nicht. Abbruch...</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4110"/>
+ <location filename="Project/Project.py" line="4112"/>
<source>The project does not have a main script defined. Aborting...</source>
<translation>Für das Projekt wurde kein Hauptskript angegeben. Abbruch...</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4122"/>
+ <location filename="Project/Project.py" line="4124"/>
<source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source>
<translation><p>Die Datei <b>PKGLIST</b> konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation>
</message>
@@ -29794,7 +29773,7 @@
<translation><p>Der Projekttyp <b>{0}</b> existiert bereits.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4153"/>
+ <location filename="Project/Project.py" line="4155"/>
<source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source>
<translation><p>Die Datei <b>{0}</b> konnte nicht im Archiv gespeichert werde. Sie wird ignoriert.</p><p>Ursache: {1}</p></translation>
</message>
@@ -29809,7 +29788,7 @@
<translation>Erzeuge Plugin Archiv (&Snapshot)</translation>
</message>
<message>
- <location filename="Project/Project.py" line="4245"/>
+ <location filename="Project/Project.py" line="4247"/>
<source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source>
<translation><p>Die Plugindatei <b>{0}</b> konnte nicht gelesen werden.<br>Grund: {1}</p></translation>
</message>
@@ -29909,12 +29888,12 @@
<translation><b>Erzeuge Plugin Archiv (Snapshot)</b><p>Dies erzeugt eine eric5 Plugin Archivdatei mit den Dateien, die in der PKGLIST Datei angegeben wurden. Der Archivname wird aus dem Namen des Hauptskriptes generiert. Der Versionseintrag des Hauptskriptes wird verändert, um ein Snapshot Release anzuzeigen.</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4133"/>
+ <location filename="Project/Project.py" line="4135"/>
<source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source>
<translation><p>Die eric5 Plugin Archivdatei <b>{0}</b> konnte nicht erzeugt werden.</p><p>Ursache: {1}</p></translation>
</message>
<message>
- <location filename="Project/Project.py" line="4165"/>
+ <location filename="Project/Project.py" line="4167"/>
<source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source>
<translation><p>Die eric5 Plugin Archivdatei <b>{0}</b> wurde erfolgreich erzeugt.</p></translation>
</message>
@@ -38133,224 +38112,224 @@
<context>
<name>Subversion</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/>
<source>Importing project into Subversion repository</source>
<translation>Lade das Projekt in das Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/>
<source>Subversion Checkout</source>
<translation>Subversion Checkout</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/>
<source>Checking project out of Subversion repository</source>
<translation>Lade das Projekt aus dem Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/>
<source>Exporting project from Subversion repository</source>
<translation>Expotiere das Projekt aus dem Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/>
<source>Subversion Error</source>
<translation>Subversion Fehler</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/>
<source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source>
<translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag Operation wird abgebrochen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/>
<source>The URL of the project repository has an invalid format. The tag operation will be aborted</source>
<translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Tag Operation wird abgebrochen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/>
<source>Tagging {0} in the Subversion repository</source>
<translation>Markiere {0} im Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/>
<source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source>
<translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/>
<source>The URL of the project repository has an invalid format. The switch operation will be aborted</source>
<translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/>
<source>Switching to {0}</source>
<translation>Schalte {0} um</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/>
<source>Merging {0}</source>
<translation>Arbeite Änderungen in {0} ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/>
<source>Cleaning up {0}</source>
<translation>Räume {0} auf</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/>
<source>Subversion command</source>
<translation>Subversion Befehl</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/>
<source>Copying {0}</source>
<translation>Kopiere {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/>
<source>Moving {0}</source>
<translation>Verschiebe {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/>
<source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source>
<translation>Das Tag muß ein normales Tag (tags) oder ein Zweigtag (branches) sein. Bitte aus der Liste auswählen.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/>
<source>Subversion Export</source>
<translation>Subversion Export</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/>
<source>Subversion Set Property</source>
<translation>Subversion Eigenschaft definieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/>
<source>You have to supply a property name. Aborting.</source>
<translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/>
<source>Subversion Delete Property</source>
<translation>Subversion Eigenschaft löschen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/>
<source>Enter property name</source>
<translation>Gib den Namen der Eigenschaft ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/>
<source>Commiting changes to Subversion repository</source>
<translation>Pflege Änderungen in das Subversion Repository ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/>
<source>Synchronizing with the Subversion repository</source>
<translation>Gleiche mit dem Subversion Repository ab</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/>
<source>Adding files/directories to the Subversion repository</source>
<translation>Füge Dateien/Verzeichnisse dem Subversion Repository hinzu</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/>
<source>Adding directory trees to the Subversion repository</source>
<translation>Füge Verzeichnisbäume dem Subversion Repository hinzu</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/>
<source>Removing files/directories from the Subversion repository</source>
<translation>Lösche Dateien/Verzeichnisse aus dem Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/>
<source>Reverting changes</source>
<translation>Mache Änderungen rückgängig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/>
<source>Resolving conficts</source>
<translation>Löse Konflikte</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/>
<source>Create project in repository</source>
<translation>Projekt im Repository anlegen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/>
<source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source>
<translation>Das Projekt konnte nicht im Repository angelegt werden. Vielleicht existiert das angegebene Repository nicht oder der Repository-Server ist nicht verfügbar.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/>
<source>New project</source>
<translation>Neues Projekt</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/>
<source>The project could not be checked out of the repository.<br />Restoring the original contents.</source>
<translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/>
<source>Subversion Log</source>
<translation>Subversion Log</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/>
<source>Select number of entries to show.</source>
<translation>Wähle Anzahl der anzuzeigenden Einträge.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/>
<source>Locking in the Subversion repository</source>
<translation>Sperren im Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/>
<source>Unlocking in the Subversion repository</source>
<translation>Entsperren im Subversion Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/>
<source>Committed revision {0}.</source>
<translation>Revision {0} eingepflegt.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/>
<source>Revision {0}.
</source>
<translation>Revision {0}.
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/>
<source>Property set.</source>
<translation>Eigenschaft definiert.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/>
<source>Property deleted.</source>
<translation>Eigenschaft gelöscht.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/>
<source>Subversion Lock</source>
<translation>Subversion Sperre</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/>
<source>Enter lock comment</source>
<translation>Gib eine Kommentar für die Sperre ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/>
<source>Relocating</source>
<translation>Relozierung</translation>
</message>
@@ -38505,49 +38484,49 @@
<translation>unversioniert</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/>
<source>Imported revision {0}.
</source>
<translation>Revision {0} importiert.
</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/>
<source>The svn process finished with the exit code {0}</source>
<translation>Der svn Prozess endete mit dem Code {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/>
<source>The svn process did not finish within 30s.</source>
<translation>Der svn Prozess endete nicht innerhalb von 30s.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/>
<source>Could not start the svn executable.</source>
<translation>Das svn Programm konnte nicht gestartet werden.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/>
<source>Repository Browser</source>
<translation>Repository Browser</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/>
<source>Enter the repository URL.</source>
<translation>Gib die URL des Repository ein.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/>
<source>Remove from changelist</source>
<translation>Von Änderungsliste entfernen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/>
<source>Add to changelist</source>
<translation>Zu Änderungsliste hinzufügen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/>
<source>Enter name of the changelist:</source>
<translation>Gib deb Namen der Änderungsliste ein:</translation>
</message>
@@ -40100,11 +40079,6 @@
<translation>Änderungen einarbeiten</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/>
- <source>Resolve conflict</source>
- <translation>Konflikt lösen</translation>
- </message>
- <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/>
<source>Set Property</source>
<translation>Eigenschaft definieren</translation>
@@ -40199,6 +40173,11 @@
<source>Remove from Changelist</source>
<translation>Von Änderungsliste entfernen</translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/>
+ <source>Conflict resolved</source>
+ <translation>Konflikt gelöst</translation>
+ </message>
</context>
<context>
<name>SvnProjectHelper</name>
@@ -40264,524 +40243,504 @@
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/>
- <source>Add to repository</source>
- <translation>Zum Repository hinzufügen</translation>
+ <source>Remove from repository (and disk)</source>
+ <translation>Vom Repository (und der Platte) löschen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/>
- <source>&Add to repository...</source>
- <translation>Zum Repository &hinzufügen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/>
- <source>Add the local project to the VCS repository</source>
- <translation>Fügt das lokale Projekt zum VCS Repository hinzu</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/>
- <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source>
- <translation><b>Zum Repository hinzufügen</b><p>Dies fügt das lokale Projekt zum VCS Repository hinzu (Import).</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/>
- <source>Remove from repository (and disk)</source>
- <translation>Vom Repository (und der Platte) löschen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/>
<source>&Remove from repository (and disk)</source>
<translation>Vom Repository (und der Platte) &löschen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/>
<source>Remove the local project from the VCS repository (and disk)</source>
<translation>Löscht das lokale Projekt von dem VCS Repository (und der Platte)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/>
<source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source>
<translation><b>Vom Repository löschen</b><p>Dies löscht das lokale Projekt vom VCS Repository (und der Platte).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/>
<source>Show log</source>
<translation>Beschreibungen anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/>
<source>Show &log</source>
<translation>&Beschreibungen anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/>
<source>Show the log of the local project</source>
<translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/>
<source><b>Show log</b><p>This shows the log of the local project.</p></source>
<translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/>
<source>Show difference</source>
<translation>Unterschiede anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/>
<source>Show &difference</source>
<translation>&Unterschiede anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/>
<source>Show the difference of the local project to the repository</source>
<translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/>
<source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source>
<translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/>
<source>Show difference (extended)</source>
<translation>Unterschiede anzeigen (erweitert)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/>
<source>Show the difference of revisions of the project to the repository</source>
<translation>Zeigt den Unterschied von Revisionen des Projektes an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/>
<source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source>
<translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/>
<source>Show status</source>
<translation>Status anzeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/>
<source>Show &status</source>
<translation>Status an&zeigen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/>
<source>Show the status of the local project</source>
<translation>Zeige den Status des lokalen Projektes an</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/>
<source><b>Show status</b><p>This shows the status of the local project.</p></source>
<translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/>
<source>Tag in repository</source>
<translation>Im Repository markieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/>
<source>&Tag in repository...</source>
<translation>Im Repository &markieren...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/>
<source>Tag the local project in the repository</source>
<translation>Das lokale Projekt im Repository markieren</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/>
<source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source>
<translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/>
<source>Export from repository</source>
<translation>Export aus Repository</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/>
<source>&Export from repository...</source>
<translation>&Export aus Repository...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/>
+ <source>Export a project from the repository</source>
+ <translation>Exportiert ein Projekt aus dem Repository</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/>
+ <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
+ <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/>
+ <source>Command options</source>
+ <translation>Befehlsoptionen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/>
+ <source>Command &options...</source>
+ <translation>Befehls&optionen...</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/>
- <source>Export a project from the repository</source>
- <translation>Exportiert ein Projekt aus dem Repository</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/>
- <source><b>Export from repository</b><p>This exports a project from the repository.</p></source>
- <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/>
- <source>Command options</source>
- <translation>Befehlsoptionen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/>
- <source>Command &options...</source>
- <translation>Befehls&optionen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/>
<source>Show the VCS command options</source>
<translation>Zeigt die VCS Befehlsoptionen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/>
<source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source>
<translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS Befehlsoptionen.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/>
<source>Revert changes</source>
<translation>Änderungen rückgängig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/>
<source>Re&vert changes</source>
<translation>Änderungen &rückgängig</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/>
<source>Revert all changes made to the local project</source>
<translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/>
<source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source>
<translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/>
<source>Merge</source>
<translation>Änderungen einpflegen</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/>
<source>Mer&ge changes...</source>
<translation>Änderungen ein&pflegen...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/>
<source>Merge changes of a tag/revision into the local project</source>
<translation>Pflege Änderungen eines Tags/Zweiges in das lokale Projekt ein</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/>
<source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source>
<translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen eines Tags/Zweiges in das lokale Projekt ein.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/>
<source>Switch</source>
<translation>Umschalten</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/>
<source>S&witch...</source>
<translation>Umschal&ten...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/>
<source>Switch the local copy to another tag/branch</source>
<translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/>
<source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source>
<translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
- <source>Resolve conflicts</source>
- <translation>Konflikte lösen</translation>
+ <source>Cleanup</source>
+ <translation>Aufräumen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/>
- <source>Resolve con&flicts</source>
- <translation>&Konflikte lösen</translation>
+ <source>Cleanu&p</source>
+ <translation>Au&fräumen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/>
- <source>Resolve all conflicts of the local project</source>
- <translation>Löse alle Konflikte des lokalen Projektes</translation>
+ <source>Cleanup the local project</source>
+ <translation>Räume das lokale Projekt auf</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/>
- <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source>
- <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation>
+ <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
+ <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/>
- <source>Cleanup</source>
- <translation>Aufräumen</translation>
+ <source>Execute command</source>
+ <translation>Befehl ausführen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/>
- <source>Cleanu&p</source>
- <translation>Au&fräumen</translation>
+ <source>E&xecute command...</source>
+ <translation>Befehl ausf&ühren...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/>
- <source>Cleanup the local project</source>
- <translation>Räume das lokale Projekt auf</translation>
+ <source>Execute an arbitrary VCS command</source>
+ <translation>Führe einen beliebigen VCS Befehl aus</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/>
- <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source>
- <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation>
+ <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
+ <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS Befehls.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/>
- <source>Execute command</source>
- <translation>Befehl ausführen</translation>
+ <source>List tags</source>
+ <translation>Marken listen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/>
- <source>E&xecute command...</source>
- <translation>Befehl ausf&ühren...</translation>
+ <source>List tags...</source>
+ <translation>Marken listen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/>
- <source>Execute an arbitrary VCS command</source>
- <translation>Führe einen beliebigen VCS Befehl aus</translation>
+ <source>List tags of the project</source>
+ <translation>Listet Marken des Projektes</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/>
- <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source>
- <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS Befehls.</p></translation>
+ <source><b>List tags</b><p>This lists the tags of the project.</p></source>
+ <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/>
- <source>List tags</source>
- <translation>Marken listen</translation>
+ <source>List branches</source>
+ <translation>Zweige listen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/>
- <source>List tags...</source>
- <translation>Marken listen...</translation>
+ <source>List branches...</source>
+ <translation>Zweige listen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/>
- <source>List tags of the project</source>
- <translation>Listet Marken des Projektes</translation>
+ <source>List branches of the project</source>
+ <translation>Listet Zweige des Projektes</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/>
- <source><b>List tags</b><p>This lists the tags of the project.</p></source>
- <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation>
+ <source><b>List branches</b><p>This lists the branches of the project.</p></source>
+ <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/>
- <source>List branches</source>
- <translation>Zweige listen</translation>
+ <source>List repository contents</source>
+ <translation>Repository Inhalt listen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/>
- <source>List branches...</source>
- <translation>Zweige listen...</translation>
+ <source>List repository contents...</source>
+ <translation>Repository Inhalt listen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/>
- <source>List branches of the project</source>
- <translation>Listet Zweige des Projektes</translation>
+ <source>Lists the contents of the repository</source>
+ <translation>Listet den Inhalt des Repositories</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/>
- <source><b>List branches</b><p>This lists the branches of the project.</p></source>
- <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation>
+ <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
+ <translation><b>Repository Inhalt listen</b><p>Dies listet den Inhalt des Repositories.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/>
- <source>List repository contents</source>
- <translation>Repository Inhalt listen</translation>
+ <source>Set Property</source>
+ <translation>Eigenschaft definieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/>
- <source>List repository contents...</source>
- <translation>Repository Inhalt listen...</translation>
+ <source>Set Property...</source>
+ <translation>Eigenschaft definieren...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/>
- <source>Lists the contents of the repository</source>
- <translation>Listet den Inhalt des Repositories</translation>
+ <source>Set a property for the project files</source>
+ <translation>Definiert eine Eigenschaft für alle Projektdateien</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/>
- <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source>
- <translation><b>Repository Inhalt listen</b><p>Dies listet den Inhalt des Repositories.</p></translation>
+ <source><b>Set Property</b><p>This sets a property for the project files.</p></source>
+ <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/>
- <source>Set Property</source>
- <translation>Eigenschaft definieren</translation>
+ <source>List Properties</source>
+ <translation>Eigenschaften listen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/>
- <source>Set Property...</source>
- <translation>Eigenschaft definieren...</translation>
+ <source>List Properties...</source>
+ <translation>Eigenschaften listen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/>
- <source>Set a property for the project files</source>
- <translation>Definiert eine Eigenschaft für alle Projektdateien</translation>
+ <source>List properties of the project files</source>
+ <translation>Listet Eigenschaften der Projektdateien</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/>
- <source><b>Set Property</b><p>This sets a property for the project files.</p></source>
- <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation>
+ <source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
+ <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/>
- <source>List Properties</source>
- <translation>Eigenschaften listen</translation>
+ <source>Delete Property</source>
+ <translation>Eigenschaft löschen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/>
- <source>List Properties...</source>
- <translation>Eigenschaften listen...</translation>
+ <source>Delete Property...</source>
+ <translation>Eigenschaft löschen...</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/>
- <source>List properties of the project files</source>
- <translation>Listet Eigenschaften der Projektdateien</translation>
+ <source>Delete a property for the project files</source>
+ <translation>Eine Eigenschaft für alle Projektdateien löschen</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/>
- <source><b>List Properties</b><p>This lists the properties of the project files.</p></source>
- <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation>
+ <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
+ <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/>
+ <source>Show repository info</source>
+ <translation>Zeige Repository Informationen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/>
+ <source>Show some repository related information for the local project</source>
+ <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/>
- <source>Delete Property</source>
- <translation>Eigenschaft löschen</translation>
+ <source>Relocate</source>
+ <translation>Relozieren</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/>
- <source>Delete Property...</source>
- <translation>Eigenschaft löschen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/>
- <source>Delete a property for the project files</source>
- <translation>Eine Eigenschaft für alle Projektdateien löschen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/>
- <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source>
- <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/>
- <source>Show repository info</source>
- <translation>Zeige Repository Informationen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/>
- <source>Show some repository related information for the local project</source>
- <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/>
- <source>Relocate</source>
- <translation>Relozieren</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/>
<source>Relocate...</source>
<translation>Relozieren...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/>
<source>Relocate the working copy to a new repository URL</source>
<translation>Reloziere die Arbeitskopie zu einer neuen Repository URL</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/>
<source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source>
<translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository URL.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/>
<source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source>
<translation><b>Zeige Repository Informationen</b><p>Dies zeigt Repository bezogene Informationen des lokalen Projektes an.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/>
<source>Show difference (URLs)</source>
<translation>Unterschiede anzeigen (URLs)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/>
<source>Show the difference of the project between two repository URLs</source>
<translation>Zeigt den Unterschied des Projektes zwischen zwei Repository URLs</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/>
<source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source>
<translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt den Unterschied des Projektes zwischen zwei Repository URLs.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/>
<source>Repository Browser</source>
<translation>Repository Browser</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/>
<source>Repository Browser...</source>
<translation>Repository Browser...</translation>
</message>
<message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/>
+ <source>Show the Repository Browser dialog</source>
+ <translation>Zeigt den Repository Browser Dialog</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/>
+ <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
+ <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/>
+ <source>Show log browser</source>
+ <translation>Zeige Log Browser</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/>
+ <source>Show a dialog to browse the log of the local project</source>
+ <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/>
+ <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
+ <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/>
+ <source>Configure</source>
+ <translation>Einstellungen</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/>
+ <source>Configure...</source>
+ <translation>Einstellungen...</translation>
+ </message>
+ <message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/>
- <source>Show the Repository Browser dialog</source>
- <translation>Zeigt den Repository Browser Dialog</translation>
+ <source>Show the configuration dialog with the Subversion page selected</source>
+ <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite</translation>
</message>
<message>
<location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/>
- <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source>
- <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/>
- <source>Show log browser</source>
- <translation>Zeige Log Browser</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/>
- <source>Show a dialog to browse the log of the local project</source>
- <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/>
- <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source>
- <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/>
- <source>Configure</source>
- <translation>Einstellungen</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/>
- <source>Configure...</source>
- <translation>Einstellungen...</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/>
- <source>Show the configuration dialog with the Subversion page selected</source>
- <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite</translation>
- </message>
- <message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/>
<source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source>
<translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite.</p></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/>
+ <source>Conflicts resolved</source>
+ <translation>Konflikte gelöst</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/>
+ <source>Con&flicts resolved</source>
+ <translation>&Konflikte gelöst</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/>
+ <source>Mark all conflicts of the local project as resolved</source>
+ <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/>
+ <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source>
+ <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation>
+ </message>
</context>
<context>
<name>SvnPropDelDialog</name>
@@ -49522,17 +49481,17 @@
<context>
<name>VersionControl</name>
<message>
- <location filename="VCS/VersionControl.py" line="536"/>
+ <location filename="VCS/VersionControl.py" line="547"/>
<source>Process Generation Error</source>
<translation>Fehler beim Prozessstart</translation>
</message>
<message>
- <location filename="VCS/VersionControl.py" line="536"/>
+ <location filename="VCS/VersionControl.py" line="547"/>
<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="VCS/VersionControl.py" line="662"/>
+ <location filename="VCS/VersionControl.py" line="673"/>
<source>Repository status checking is switched off</source>
<translation>Repository Statusüberprüfung ist ausgeschaltet</translation>
</message>
@@ -53008,24 +52967,24 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/>
<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="1719"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/>
<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="1727"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/>
<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="1238"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/>
<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>
@@ -53034,7 +52993,7 @@
<tr><td><b>Committed um</b></td><td>{2}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -53051,24 +53010,24 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/>
<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="1715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/>
<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="1731"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/>
<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="1734"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/>
<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>
@@ -53079,7 +53038,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/>
<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>
@@ -53323,17 +53282,17 @@
<context>
<name>subversion</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/>
+ <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/>
<source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source>
<translation><h3>Repository Informationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/>
<source>unknown</source>
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/>
+ <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/>
<source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source>
<translation><h3>Repository Informationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation>
</message>
