--- a/i18n/eric5_de.ts Tue Jan 07 09:19:57 2014 +0100 +++ b/i18n/eric5_de.ts Tue Jan 07 18:08:40 2014 +0100 @@ -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> @@ -1949,8 +1948,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -2186,8 +2185,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> </context> <context> @@ -3337,7 +3336,7 @@ <translation>Fehler: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="885"/> <source>Fix: {0}</source> <translation>Lösung: {0}</translation> </message> @@ -3383,12 +3382,12 @@ <context> <name>CodeStyleCheckerPy2</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="54"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="57"/> <source>Python2 interpreter not configured.</source> <translation>Kein Python 2-Interpreter konfiguriert.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="131"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="134"/> <source>Python2 interpreter did not finish within 15s.</source> <translation>Python 2-Interpreter wurde nicht innerhalb von 15s beendet.</translation> </message> @@ -15941,8 +15940,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen Strg+LMK</translation> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -19051,7 +19050,7 @@ <translation>Der hg-Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -19106,172 +19105,167 @@ <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> - <source>Taging in the Mercurial repository</source> - <translation>Marke im Mercurial-Repository setzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="980"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="997"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1052"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1312"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1529"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1938"/> <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="1961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1991"/> <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="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2144"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2155"/> <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="2217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/> <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="2243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2298"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2323"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2581"/> <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="2150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2482"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2650"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2538"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2318"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2348"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <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="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/> <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="2408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/> <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="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2724"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2455"/> <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="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2772"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -19281,72 +19275,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <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="3329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3359"/> <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="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2841"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2889"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2937"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2991"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3018"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> <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="3087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3117"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> <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="3158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3188"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19361,40 +19355,45 @@ <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="982"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="991"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3054"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1859"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1786"/> <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/hg.py" line="939"/> + <source>Tagging in the Mercurial repository</source> + <translation>Marke im Mercurial-Repository setzen</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -21263,7 +21262,7 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="60"/> <source>Mercurial Log</source> <translation>Mercurial-Log</translation> </message> @@ -21293,17 +21292,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1270"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1267"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -21358,102 +21357,102 @@ <translation>Gib die Anzahl an zu holenden Einträgen ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Auswählen, um die Anzeige von Log Meldungen bei einer Kopier- oder Verschiebeaktion zu stoppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="298"/> <source>Stop on Copy/Move</source> <translation>Bei Kopieren/Umbenennen anhalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="389"/> <source>Errors</source> <translation>Fehler</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="409"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="395"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Mercurial-Log-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des hg log-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="411"/> <source>Input</source> <translation>Eingabe</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> <source>Press to send the input to the hg process</source> <translation>Drücken um die Eingabe an den hg-Prozess zu senden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> <source>&Send</source> <translation>Sen&den</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/> + <source>Alt+S</source> + <translation>Alt+D</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="446"/> + <source>Enter data to be sent to the hg process</source> + <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> - <source>Alt+S</source> - <translation>Alt+D</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> - <source>Enter data to be sent to the hg process</source> - <translation>Gib die Daten ein, die an den hg-Prozess geschickt werden sollen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="467"/> <source>Select to switch the input field to password mode</source> <translation>Anwählen, um den Kennwortmodus für das Eingabefeld auszuwählen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="456"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="459"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> - <source>Added</source> - <translation>Hinzugefügt</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> - <source>Deleted</source> - <translation>Gelöscht</translation> + <source>Added</source> + <translation>Hinzugefügt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <source>Deleted</source> + <translation>Gelöscht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="125"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="740"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="740"/> <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/HgLogBrowserDialog.py" line="518"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="537"/> <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/HgLogBrowserDialog.py" line="521"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="540"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="543"/> <source>Mercurial Error</source> <translation>Mercurial-Fehler</translation> </message> @@ -21503,32 +21502,32 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="62"/> <source>Mercurial Log (Incoming)</source> <translation>Mercurial-Log (Eingang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="64"/> <source>Mercurial Log (Outgoing)</source> <translation>Mercurial-Log (Ausgang)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="134"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="74"/> <source>Press to refresh the list of changesets</source> <translation>Drücken, um die Liste der Änderungssätze zu erneuern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>&Refresh</source> <translation>&Erneuern</translation> </message> @@ -21538,46 +21537,61 @@ <translation>Phase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="150"/> <source>Change the phase of the selected revisions</source> <translation>Ändert die Phase der ausgewählten Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="152"/> <source><b>Change Phase</b> <p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase der ausgewählten Revisionen. Die ausgewählten Revisionen müssen sich in der gleichen Phase befinden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> - <source>Press to copy the selected changesets to the current branch</source> - <translation>Drücken, um die ausgewählten Änderungssätze in den aktuellen Zweig zu kopeieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1424"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1424"/> <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/HgLogBrowserDialog.ui" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> <source>Select to show differences side-by-side</source> <translation>Auswählen, um Unterschiede nebeinander anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="364"/> <source>Show differences side-by-side</source> <translation>Unterschiede nebeneinander anzeigen</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="371"/> + <source>Select action from menu</source> + <translation>Wähle eine Aktion aus dem Menü</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="143"/> + <source>Copy the selected changesets to the current branch</source> + <translation>Ausgewählte Änderungssätze in den aktuellen Zweig kopieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="158"/> + <source>Tag</source> + <translation>Marke setzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/> + <source>Tag the selected revision</source> + <translation>Ausgewählte Revision mit einer Marke versehen</translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -25172,75 +25186,41 @@ <context> <name>HgTagDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="39"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="36"/> <source>Enter the name of the tag</source> <translation>Gib den Namen der Marke ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="39"/> <source><b>Tag Name</b> <p>Enter the name of the tag to be created, moved or deleted.</p></source> <translation><b>Name der Marke</b> <p>Gib den Namen der zu erzeugenden oder zu löschenden Marke ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="23"/> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="66"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="70"/> <source>Tag Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="72"/> - <source>Select to create a regular tag</source> - <translation>Auswählen, um eine normale Marke zu erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="75"/> - <source><b>Create Regular Tag</b> -<p>Select this entry in order to create a regular tag.</p></source> - <translation><b>Normale Marke erzeugen</b> -<p>Wähle diesen Eintrag, um eine normale Marke zu erzeugen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="79"/> - <source>Create Regular Tag</source> - <translation>Normale Marke erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="89"/> - <source>Select to create a local tag</source> - <translation>Auswählen, um eine lokale Marke zu erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="92"/> - <source><b>Create Local Tag</b> -<p>Select this entry in order to create a local tag.</p></source> - <translation><b>Lokale Marke erzeugen</b> -<p>Wähle diesen Eintrag, um eine lokale Marke zu erzeugen.</p></translation> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="93"/> + <source>Select to delete a tag</source> + <translation>Auswählen, um eine Marke zu löschen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="96"/> - <source>Create Local Tag</source> - <translation>Lokale Marke erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="103"/> - <source>Select to delete a tag</source> - <translation>Auswählen, um eine Marke zu löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="106"/> <source><b>Delete Tag</b> <p>Select this entry in order to delete the selected tag.</p></source> <translation><b>Marke löschen</b> <p>Wähle diesen Eintrag, um eine Marke im Repository zu löschen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="100"/> <source>Delete Tag</source> <translation>Marke löschen</translation> </message> @@ -25249,6 +25229,58 @@ <source>Mercurial Tag</source> <translation>Mercurial-Tag</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="56"/> + <source>Revision:</source> + <translation>Revision:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="63"/> + <source>Enter a revision to set a tag for</source> + <translation>Gib eine Revision ein, die eine Marke erhalten soll</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="76"/> + <source>Select to create a tag</source> + <translation>Auswählen, um eine Marke zu erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="79"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation><b>Marke erzeugen</b> +<p>Wähle diesen Eintrag, um eine Marke zu erzeugen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="83"/> + <source>Create Tag</source> + <translation>Marke erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="110"/> + <source>Tag Type</source> + <translation>Markentyp</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="116"/> + <source>Select to create/delete a global tag</source> + <translation>Auswählen, um eine globale Marke zu erzeugen/zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="119"/> + <source>Global Tag</source> + <translation>Globale Marke</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="129"/> + <source>Select to create/delete a local tag</source> + <translation>Auswählen, um eine lokale Marke zu erzeugen/zu löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="132"/> + <source>Local Tag</source> + <translation>Lokale Marke</translation> + </message> </context> <context> <name>HistoryDialog</name> @@ -51169,7 +51201,7 @@ <translation>Drücken, um alle Dateien mit Problemen anzuzeigen</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="292"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="293"/> <source>No issues found.</source> <translation>Keine Probleme gefunden.</translation> </message> @@ -51194,7 +51226,7 @@ <translation>Starten</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="204"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="205"/> <source>Error: {0}</source> <translation>Fehler: {0}</translation> </message> @@ -61280,24 +61312,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1381"/> <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="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2068"/> <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="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2078"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1401"/> <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> @@ -61306,24 +61338,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> <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="2033"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/> <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="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2083"/> <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="2057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <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> @@ -61334,12 +61366,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2073"/> <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> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1441"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>