--- a/i18n/eric5_de.ts Fri Apr 30 16:45:56 2010 +0000 +++ b/i18n/eric5_de.ts Sat May 01 18:26:14 2010 +0000 @@ -13206,205 +13206,225 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="164"/> <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="165"/> - <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="167"/> + <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="169"/> <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="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="193"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="195"/> <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="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="238"/> <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="277"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="279"/> <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="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="377"/> <source>Commiting changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="416"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <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="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <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="524"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <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="582"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="690"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="720"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="761"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="961"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1130"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <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="1319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <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="1428"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> <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="1526"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1533"/> <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="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1557"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1573"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> <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="1596"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1603"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> <translation><p>Die Mercurial Bundle Datei <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <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="1484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1491"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1697"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1655"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation>Mercurial Bundle Dateien (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1740"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Bundle Files (*.hg)</source> + <translation>Mercurial Bundle Dateien (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> <translation>Mercurial Bundle Dateien (*.hg);;Alle Dateien (*)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1626"/> + <source>Identifying project directory</source> + <translation>Projektverzeichnis identifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <source>Create .hgignore file</source> + <translation>.hgignore Datei erstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1651"/> + <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="1876"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14537,100 +14557,115 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="460"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="471"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="476"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="479"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="401"/> <source>Copy in repository</source> <translation>Im Repository kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> <source>Move in repository</source> <translation>Im Repository verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> <source>Show limited log</source> <translation>Beschreibungen limitiert anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="412"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="484"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="488"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="240"/> <source>Show annotated file</source> <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Resolve conflict</source> - <translation>Konflikt lösen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> - <source>Select all local file entries</source> - <translation>Alle lokalen Dateieinträge auswählen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Select all versioned file entries</source> - <translation>Alle versionierten Dateieinträge auswählen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="499"/> + <source>Resolve conflict</source> + <translation>Konflikt lösen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <source>Select all local file entries</source> + <translation>Alle lokalen Dateieinträge auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="504"/> + <source>Select all versioned file entries</source> + <translation>Alle versionierten Dateieinträge auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="508"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <source>Remove from repository only</source> + <translation>Nur vom Repository löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> + <source>Do you really want to remove these translation files from the repository?</source> + <translation>Wollen Sie wirklich diese Übersetzungsdateien vom Repository löschen?</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="626"/> + <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> </context> <context> <name>HgProjectHelper</name> @@ -15320,67 +15355,67 @@ <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="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <source>Create .hgignore</source> - <translation>Erstelle .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <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="577"/> - <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="584"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="584"/> - <source>Create changegroup...</source> - <translation>Änderungsgruppe erzeugen...</translation> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <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="613"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> - <source>Apply changegroups...</source> - <translation>Änderungsgruppen anwenden...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> - <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="704"/> - <source>Changegroup Management</source> - <translation>Verwaltung von Änderungsgruppen</translation> + <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="590"/> + <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="597"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="597"/> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <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="626"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Apply changegroups...</source> + <translation>Änderungsgruppen anwenden...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <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="718"/> + <source>Changegroup Management</source> + <translation>Verwaltung von Änderungsgruppen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> <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> @@ -15400,100 +15435,120 @@ <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="627"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> <source>Mark as "good"</source> <translation>Als "gut" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="630"/> - <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="633"/> - <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="640"/> - <source>Mark as "bad"</source> - <translation>Als "schlecht" markieren</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> - <source>Mark a selectable changeset as bad</source> - <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> + <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="646"/> - <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> + <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="653"/> - <source>Skip</source> - <translation>Überspringen</translation> + <source>Mark as "bad"</source> + <translation>Als "schlecht" markieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> - <source>Skip the current changeset</source> - <translation>Überspringe den aktuellen Änderungssatz</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="659"/> - <source><b>Skip</b><p>This skips the current changeset.</p></source> - <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> + <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="666"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> + <source>Skip</source> + <translation>Überspringen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> - <source>Reset the bisect search data</source> - <translation>Setzt die Bisect Suchdaten zurück</translation> + <source>Skip the current changeset</source> + <translation>Überspringe den aktuellen Änderungssatz</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <source><b>Skip</b><p>This skips the current changeset.</p></source> + <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <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="685"/> <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="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> - <source>Mark as "good"...</source> - <translation>Als "gut" markieren...</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source>Mark as "good"...</source> + <translation>Als "gut" markieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> <source>Preview a changegroup file containing a collecting of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting 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="571"/> + <source>Identify</source> + <translation>Identifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Identify...</source> + <translation>Identifizieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Identify the project directory</source> + <translation>Identifiziere das Projektverzeichnis</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15689,7 +15744,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="186"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -15776,95 +15831,110 @@ <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> - <source>added</source> - <translation>hinzugefügt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> - <source>modified</source> - <translation>modifiziert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> - <source>removed</source> - <translation>gelöscht</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> - <source>not tracked</source> - <translation>nicht versioniert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> - <source>ignored</source> - <translation>ignoriert</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>added</source> + <translation>hinzugefügt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="94"/> + <source>modified</source> + <translation>modifiziert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <source>removed</source> + <translation>gelöscht</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="96"/> + <source>not tracked</source> + <translation>nicht versioniert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="92"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <source>ignored</source> + <translation>ignoriert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="193"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="374"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>There are no uncommitted changes available/selected.</source> <translation>Es sind keine nicht eingepflegten Änderungen vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="400"/> <source>There are no unversioned entries available/selected.</source> <translation>Es sind keine unversionierten Einträge vorhanden/ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="435"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Remove from repository</source> + <translation>Vom Repository löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>Remove</source> + <translation>Entfernen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="420"/> + <source>There are no missing entries available/selected.</source> + <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="107"/> <source>Mercurial status checked successfully</source> <translation>Mercurial Status erfolgreich überprüft</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="118"/> <source>Could not start the Mercurial process.</source> <translation>Der Mercurial Prozess konnte nicht gestartet werden.</translation> </message> @@ -21688,12 +21758,12 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="828"/> + <location filename="Preferences/__init__.py" line="829"/> <source>Export Preferences</source> <translation>Konfiguration exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="847"/> + <location filename="Preferences/__init__.py" line="848"/> <source>Import Preferences</source> <translation>Konfiguration importieren</translation> </message> @@ -23107,34 +23177,39 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="Project/ProjectBrowser.py" line="71"/> + <location filename="Project/ProjectBrowser.py" line="72"/> <source>files added</source> <translation>Dateien hinzugefügt</translation> </message> <message> - <location filename="Project/ProjectBrowser.py" line="72"/> + <location filename="Project/ProjectBrowser.py" line="73"/> <source>local modifications</source> <translation>Lokale Änderungen</translation> </message> <message> + <location filename="Project/ProjectBrowser.py" line="76"/> + <source>update required</source> + <translation>Abgleich erforderlich</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="77"/> + <source>conflict</source> + <translation>Konflikt</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="71"/> + <source>up to date</source> + <translation>Aktuell</translation> + </message> + <message> + <location filename="Project/ProjectBrowser.py" line="75"/> + <source>files replaced</source> + <translation>Dateien ersetzt</translation> + </message> + <message> <location filename="Project/ProjectBrowser.py" line="74"/> - <source>update required</source> - <translation>Abgleich erforderlich</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="75"/> - <source>conflict</source> - <translation>Konflikt</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="70"/> - <source>up to date</source> - <translation>Aktuell</translation> - </message> - <message> - <location filename="Project/ProjectBrowser.py" line="73"/> - <source>files replaced</source> - <translation>Dateien ersetzt</translation> + <source>files removed</source> + <translation>Dateien entfernt</translation> </message> </context> <context> @@ -23150,7 +23225,7 @@ <translation>VCS Status</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="599"/> + <location filename="Project/ProjectBrowserModel.py" line="601"/> <source>local</source> <translation>lokal</translation> </message> @@ -30470,17 +30545,17 @@ <context> <name>SvnProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="595"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="594"/> <source>Update from repository</source> <translation>Abgleich mit Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="597"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="602"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> @@ -30490,117 +30565,117 @@ <translation>Verzeichnisbaum zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="605"/> <source>Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="499"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="498"/> <source>Copy in repository</source> <translation>Im Repository kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="501"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="500"/> <source>Move in repository</source> <translation>Im Repository verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="511"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="618"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="622"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="625"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="635"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="634"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="638"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="637"/> <source>Merge changes</source> <translation>Änderungen einarbeiten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="640"/> <source>Resolve conflict</source> <translation>Konflikt lösen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="643"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="645"/> <source>List Properties</source> <translation>Eigenschaften listen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="648"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="647"/> <source>Delete Property</source> <translation>Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="651"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="650"/> <source>Select all local file entries</source> <translation>Alle lokalen Dateieinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="652"/> <source>Select all versioned file entries</source> <translation>Alle versionierten Dateieinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="654"/> <source>Select all local directory entries</source> <translation>Alle lokalen Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="657"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="656"/> <source>Select all versioned directory entries</source> <translation>Alle versionierten Verzeichniseinträge auswählen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="515"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="514"/> <source>Show limited log</source> <translation>Beschreibungen limitiert anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="393"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="392"/> <source>Lock</source> <translation>Sperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="396"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="395"/> <source>Unlock</source> <translation>Entsperren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="399"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="398"/> <source>Break Lock</source> <translation>Sperre brechen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="401"/> <source>Steal Lock</source> <translation>Sperre stehlen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="584"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="583"/> <source>Version Control</source> <translation>Versionskontrolle</translation> </message> @@ -30610,32 +30685,32 @@ <translation>Zeige kommentierte Datei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="525"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="524"/> <source>Show repository info</source> <translation>Zeige Repository Informationen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="630"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="629"/> <source>Show difference (URLs)</source> <translation>Unterschiede anzeigen (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="517"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="660"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="659"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="612"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="611"/> <source>Add to Changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="615"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="614"/> <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> @@ -37820,6 +37895,16 @@ <source>Automatic updates enabled</source> <translation>Automatische Updates</translation> </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="262"/> + <source>VCS status "removed":</source> + <translation>VCS Status "Gelöscht":</translation> + </message> + <message> + <location filename="Preferences/ConfigurationPages/VcsPage.ui" line="275"/> + <source>Select the background colour for entries with VCS status "removed".</source> + <translation>Wähle die Hintergrundfarbe für Einträge mit VCS Status "gelöscht".</translation> + </message> </context> <context> <name>VcsProjectBrowserHelper</name> @@ -41087,24 +41172,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1014"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1381"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <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="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <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="1026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> <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> @@ -41113,7 +41198,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -41130,24 +41215,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> <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="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <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="1389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> <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="1392"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <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>