--- a/i18n/eric5_de.ts Sat Aug 04 20:42:45 2012 +0200 +++ b/i18n/eric5_de.ts Wed Aug 08 18:21:45 2012 +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> @@ -1928,7 +1929,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <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> @@ -2165,7 +2166,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <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> @@ -14007,7 +14008,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="977"/> - <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> @@ -17184,17 +17185,17 @@ <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2916"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2785"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/> <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="2906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2916"/> <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> @@ -17214,42 +17215,42 @@ <translation>Phase ändern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2607"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2630"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2634"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2714"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2744"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2693"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2760"/> <source>Remove Sub-repositories</source> <translation>Unterrepositories löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -18866,6 +18867,26 @@ <source>Enter the date and time to be used</source> <translation>Gib das zu verwendenden Datum und Zeit ein</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="148"/> + <source>Select to append graft info to the log message</source> + <translation>Auswählen, um eine Kopierinformation an die Änderungsmeldung anzuhängen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="151"/> + <source>Append Graft &Info</source> + <translation>Kopier&information anhängen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="161"/> + <source>Select to perform a dry-run of the graft operation</source> + <translation>Auswählen, um einen Testlauf der Kopieraktion durchzuführen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.ui" line="164"/> + <source>Perform Dry-Run</source> + <translation>Testlauf durchführen</translation> + </message> </context> <context> <name>HgImportDialog</name>