--- a/i18n/eric5_de.ts Fri Sep 09 19:15:06 2011 +0200 +++ b/i18n/eric5_de.ts Fri Sep 09 19:31:51 2011 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1640,8 +1641,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1859,7 +1860,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="76"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12588,7 +12589,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="802"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15350,167 +15351,167 @@ <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/> <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="1637"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/> <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="1756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <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="1869"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/> <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="1894"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/> <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="1940"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> <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="1812"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <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="2273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/> <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="2045"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> <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="2149"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2354"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -15520,22 +15521,22 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/> <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="2560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2421"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> @@ -23641,27 +23642,27 @@ <translation>Nach Pull aktualisieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> <source>Edit the Mercurial configuration file</source> <translation>Editiere die Mercurial Konfigurationsdatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> <source>Edit configuration file</source> <translation>Konfigurationsdatei editieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> <source>Cleanup</source> <translation>Aufräumen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> <source>Pattern:</source> <translation>Muster:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> <translation>Gib die Dateinamenmuster für das Aufräumen ein (Einträge durch Leerzeichen getrennt)</translation> </message> @@ -23682,6 +23683,21 @@ <source>Prefer Unbundle</source> <translation>Unbundle vorziehen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <source>Revert</source> + <translation>Rückgängig machen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <source>Select to create a backup file (.orig) before reverting changes</source> + <translation>Auswählen, um eine Sicherungsdatei (.orig) vor dem Rückgängigmachen zu erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <source>Create Backup Files</source> + <translation>Sicherungsdateien erzeugen</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -48923,24 +48939,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/> <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="1714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> <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="1225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/> <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> @@ -48949,7 +48965,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48966,24 +48982,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/> <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="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/> <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="1718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/> <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> @@ -48994,7 +49010,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/> <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>