--- a/i18n/eric6_de.ts Sun Jun 03 11:30:57 2018 +0200 +++ b/i18n/eric6_de.ts Sun Jun 03 14:03:19 2018 +0200 @@ -1482,7 +1482,7 @@ </message> <message> <location filename="../Utilities/BackgroundService.py" line="422"/> - <source>Erics background client disconnected because of an unknown reason.</source> + <source>Eric's background client disconnected because of an unknown reason.</source> <translation>Die Verbindung zu Erics Hintergund Client wurde aus unbekanntem Grund getrennt.</translation> </message> <message> @@ -17952,182 +17952,182 @@ <translation>Bisect wiederholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2972"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> <source>Show Remote Info</source> <translation>Zeige entfernte Informationen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Rename Remote Repository</source> <translation>Entferntes Repository umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2919"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> <source>Enter new name for remote repository:</source> <translation>Gib einen Namen für das entfernte Repository ein:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2996"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> <source>Show Shortlog</source> <translation>Kurzbeschreibungen anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3054"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> <source>Cherry-pick</source> <translation>Aussuchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3084"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3109"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> <source>Copy Changesets (Quit)</source> <translation>Änderungssätze kopieren (Beenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3135"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> <source>Copy Changesets (Cancel)</source> <translation>Änderungssätze kopieren (Abbrechen)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3215"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> <source>Saving stash</source> <translation>Ablage sichern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Show Stash</source> <translation>Ablage anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3414"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> <source>Select a stash (empty for latest stash):</source> <translation>Wähle eine Ablage (leer für aktuellste):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3326"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> <source>Restore Stash</source> <translation>Ablage wiederherstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3340"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> <source>Restoring stash</source> <translation>Stelle Ablage wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3374"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3364"/> - <source>Enter a branch name to restore a stash to:</source> - <translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3389"/> - <source>Creating branch</source> - <translation>Erzeuge Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Delete Stash</source> - <translation>Ablage löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3423"/> - <source>Do you really want to delete the stash <b>{0}</b>?</source> - <translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3434"/> - <source>Deleting stash</source> - <translation>Lösche Ablage</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Delete All Stashes</source> - <translation>Alle Ablagen löschen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3454"/> - <source>Do you really want to delete all stashes?</source> - <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> - <source>Deleting all stashes</source> - <translation>Lösche alle Ablagen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3534"/> - <source>Showing the combined configuration settings</source> - <translation>Zeige die kombinierten Einstellungen</translation> + <source>Enter a branch name to restore a stash to:</source> + <translation>Gib einen Zweignamen für die Ablagewiederherstellung ein:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <source>Creating branch</source> + <translation>Erzeuge Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Delete Stash</source> + <translation>Ablage löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <source>Do you really want to delete the stash <b>{0}</b>?</source> + <translation>Soll die Ablage <b>{0}</b> wirklich gelöscht werden?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <source>Deleting stash</source> + <translation>Lösche Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Delete All Stashes</source> + <translation>Alle Ablagen löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <source>Do you really want to delete all stashes?</source> + <translation>Sollen wirklich alle Ablagen gelöscht werden?</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> - <source>Verifying the integrity of the Git repository</source> - <translation>Verifiziere die Integrität des Git-Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3585"/> - <source>Performing Repository Housekeeping</source> - <translation>Führe Repository Reorganisation durch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3629"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Statistik</b></td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3630"/> - <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3634"/> - <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3638"/> - <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> - <translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3642"/> - <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> - <translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3646"/> - <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> - <translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3650"/> - <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> - <translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3654"/> - <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> - <translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation> + <source>Deleting all stashes</source> + <translation>Lösche alle Ablagen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <source>Showing the combined configuration settings</source> + <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <source>Verifying the integrity of the Git repository</source> + <translation>Verifiziere die Integrität des Git-Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <source>Performing Repository Housekeeping</source> + <translation>Führe Repository Reorganisation durch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Statistik</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Anzahl loser Objekte: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Festplattenverbrauch durch lose Objekte: </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> + <translation><tr><td>Anzahl gepackter Objekte: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> + <translation><tr><td>Anzahl Pakete: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> + <translation><tr><td>Festplattenverbrauch durch lose Objekte </td><td>{0} KiB</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> + <translation><tr><td>Gepackte Objekte bereit zum Löschen: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> + <translation><tr><td>Wertlose Dateien: </td><td>{0}</td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Festplattenverbrauch durch wertlose Dateien: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3664"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>Keine Statistik verfügbar.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> <source>Creating Archive</source> <translation>Erzeuge Archiv</translation> </message> @@ -18157,57 +18157,57 @@ <translation>Patchdateien anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3773"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> <source>Add Submodule</source> <translation>Submodul hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>List Submodules</source> <translation>Submodule auflisten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> <source>No submodules defined for the project.</source> <translation>Für das Projekt sind keine Submodule definiert.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3858"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> <source>All</source> <translation>Alle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Submodule Path</source> <translation>Submodulpfad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3861"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> <source>Select a submodule path:</source> <translation>Wähle einen Submodulpfad:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3914"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> <source>Initialize Submodules</source> <translation>Submodule initialisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3951"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> <source>Unregister Submodules</source> <translation>Submodule deregistrieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> <source>Update Submodules</source> <translation>Submodule aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4065"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> <source>Synchronize Submodules</source> <translation>Submodule synchronisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4123"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> <source>Submodules Summary</source> <translation>Submodulüberblick</translation> </message> @@ -18239,6 +18239,31 @@ <source>Enter the remote URL</source> <translation>Gib die Repository URL ein</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="51"/> + <source>Credentials</source> + <translation>Berechtigung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="57"/> + <source>Username:</source> + <translation>Nutzername:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="64"/> + <source>Enter the user name for the remote repository</source> + <translation>Gib den Nutzernamen für das entfernte Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="71"/> + <source>Password:</source> + <translation>Kennwort:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.ui" line="81"/> + <source>Enter the password for the remote repository</source> + <translation>Gib das Kennwort für das entfernte Repository ein</translation> + </message> </context> <context> <name>GitApplyBundleDataDialog</name> @@ -18868,6 +18893,34 @@ </message> </context> <context> + <name>GitChangeRemoteUrlDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="14"/> + <source>Git Change Remote URL</source> + <translation>URL ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="23"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="40"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="57"/> + <source>New URL:</source> + <translation>Neue URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.ui" line="64"/> + <source>Enter the new remote URL</source> + <translation>Gib die neue Repository URL ein</translation> + </message> +</context> +<context> <name>GitCherryPickDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.ui" line="14"/> @@ -21120,7 +21173,7 @@ <translation><b>Zeige Entfernte</b><p>Dies zeigt die zum Hoch- und Herunterladen verfügbaren entfernten Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1765"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1797"/> <source>Show Remote Info</source> <translation>Zeige entfernte Informationen</translation> </message> @@ -21135,7 +21188,7 @@ <translation>Zeigt Informationen über ein entferntes Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1161"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> <source>Add</source> <translation>Hinzufügen</translation> </message> @@ -21155,7 +21208,7 @@ <translation><b>Hinzufügen</b><p>Ein entferntes Repository hinzufügen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1817"/> <source>Remove</source> <translation>Entfernen</translation> </message> @@ -21175,7 +21228,7 @@ <translation><b>Entfernen</b><p>Ein entferntes Repository entfernen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1831"/> <source>Prune</source> <translation>Aufräumen</translation> </message> @@ -21195,7 +21248,7 @@ <translation><b>Aufräumen</b><p>Dies löscht lose Trackingzweige eines entfernten Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Rename</source> <translation>Umbenennen</translation> </message> @@ -21215,712 +21268,712 @@ <translation><b>Umbenennen</b><p>Dies benennt ein entferntes Repository um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1833"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1895"/> <source>Copy Commits</source> <translation>Revisionen kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="609"/> - <source>Copies commits into the current branch</source> - <translation>Kopiert Revisionen in den aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="612"/> - <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> - <translation><b>Revisionen kopieren</b><p>Dies kopiert Revisionen in den aktuellen Zweig.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="619"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="623"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="626"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="635"/> - <source>Quit Copying Session</source> - <translation>Kopiersitzung beenden</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="639"/> - <source>Quit the current copying session</source> - <translation>Beendet die aktuelle Kopiersitzung</translation> + <source>Copies commits into the current branch</source> + <translation>Kopiert Revisionen in den aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <source><b>Copy Commits</b><p>This copies commits on top of the current branch.</p></source> + <translation><b>Revisionen kopieren</b><p>Dies kopiert Revisionen in den aktuellen Zweig.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="649"/> - <source>Cancel Copying Session</source> - <translation>Kopiersitzung abbrechen</translation> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="653"/> - <source>Cancel the current copying session and return to the previous state</source> - <translation>Bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="657"/> - <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> - <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück.</p></translation> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="656"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes</source> - <translation>Änderungen ablegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="665"/> - <source>Stash changes...</source> - <translation>Änderungen ablegen...</translation> + <source>Quit Copying Session</source> + <translation>Kopiersitzung beenden</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="669"/> - <source>Stash all current changes of the project</source> - <translation>Alle aktuellen Änderungen des Projektes ablegen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> - <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> - <translation><b>Änderungen ablegen</b<p>Dies legt alle aktuellen Änderungen des Projektes ab.</p></translation> + <source>Quit the current copying session</source> + <translation>Beendet die aktuelle Kopiersitzung</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser</source> - <translation>Zeige Ablagenbrowser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="679"/> - <source>Show stash browser...</source> - <translation>Zeige Ablagenbrowser...</translation> + <source>Cancel Copying Session</source> + <translation>Kopiersitzung abbrechen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="683"/> - <source>Show a dialog with all stashes</source> - <translation>Zeigt einen Dialog mit allen Ablagen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="686"/> - <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> - <translation><b>Zeige Ablagenbrowser</b<p>Dies zeigt einen Dialog mit allen Ablagen. Aktionen können über das Kontextmenü ausgewählt werden.</p></translation> + <source>Cancel the current copying session and return to the previous state</source> + <translation>Bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="687"/> + <source><b>Cancel Copying Session</b><p>This cancels the current copying session and returns to the previous state.</p></source> + <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die aktuelle Kopiersitzung ab und kehrt zum Ausgangszustand zurück.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash</source> - <translation>Ablage anzeigen</translation> + <source>Stash changes</source> + <translation>Änderungen ablegen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="695"/> - <source>Show stash...</source> - <translation>Ablage anzeigen...</translation> + <source>Stash changes...</source> + <translation>Änderungen ablegen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="699"/> - <source>Show a dialog with a patch of a stash</source> - <translation>Zeigt einen Dialog mit dem Inhalt der Ablage</translation> + <source>Stash all current changes of the project</source> + <translation>Alle aktuellen Änderungen des Projektes ablegen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="702"/> + <source><b>Stash changes</b><p>This stashes all current changes of the project.</p></source> + <translation><b>Änderungen ablegen</b<p>Dies legt alle aktuellen Änderungen des Projektes ab.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser</source> + <translation>Zeige Ablagenbrowser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="709"/> + <source>Show stash browser...</source> + <translation>Zeige Ablagenbrowser...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="713"/> + <source>Show a dialog with all stashes</source> + <translation>Zeigt einen Dialog mit allen Ablagen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="716"/> + <source><b>Show stash browser...</b><p>This shows a dialog listing all available stashes. Actions on these stashes may be executed via the context menu.</p></source> + <translation><b>Zeige Ablagenbrowser</b<p>Dies zeigt einen Dialog mit allen Ablagen. Aktionen können über das Kontextmenü ausgewählt werden.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash</source> + <translation>Ablage anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="725"/> + <source>Show stash...</source> + <translation>Ablage anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="729"/> + <source>Show a dialog with a patch of a stash</source> + <translation>Zeigt einen Dialog mit dem Inhalt der Ablage</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="732"/> <source><b>Show stash...</b><p>This shows a dialog with a patch of a selectable stash.</p></source> <translation><b>Ablage anzeigen...</b><p>Dies zeigt einen Dialog mit dem Inhalt einer ausgewählten Ablage.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="740"/> <source>Restore && Keep</source> <translation>Wiederherstellen && Behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="714"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="744"/> <source>Restore a stash but keep it</source> <translation>Ablage wieder herstellen und behalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="747"/> <source><b>Restore &amp; Keep</b><p>This restores a selectable stash and keeps it.</p></source> <translation><b>Wiederherstellen &amp; Behalten</b><p>Dies stellt eine Ablage wieder her, löscht sie aber nicht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="754"/> <source>Restore && Delete</source> <translation>Wiederherstellen && Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="728"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="758"/> <source>Restore a stash and delete it</source> <translation>Ablage wieder herstellen und löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="731"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="761"/> <source><b>Restore &amp; Delete</b><p>This restores a selectable stash and deletes it.</p></source> <translation><b>Wiederherstellen &amp; Löschen</b><p>Dies stellt eine Ablage wieder her und löscht sie.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1980"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2042"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="742"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="772"/> <source>Create a new branch and restore a stash into it</source> <translation>Erzeugt einen neuen Zweig und stellt eine Ablage in ihm wieder her</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="745"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="775"/> <source><b>Create Branch</b><p>This creates a new branch and restores a stash into it.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig und stellt eine Ablage in ihm wieder her.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="753"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="783"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="787"/> <source>Delete a stash</source> <translation>Ablage löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="760"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="790"/> <source><b>Delete</b><p>This deletes a stash.</p></source> <translation><b>Löschen</b><p>Dies löscht eine Ablage.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="767"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="797"/> <source>Delete All</source> <translation>Alle Löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="771"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="801"/> <source>Delete all stashes</source> <translation>Alle Ablagen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="804"/> <source><b>Delete All</b><p>This deletes all stashes.</p></source> <translation><b>Alle Löschen</b><p>Dies löscht alle Ablagen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="811"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="785"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="815"/> <source>Show an editor to edit the user configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="788"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="818"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration</source> <translation>Repositorykonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="825"/> <source>Edit repository configuration...</source> <translation>Repositorykonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="829"/> <source>Show an editor to edit the repository configuration file</source> <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="802"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="810"/> - <source>Create .gitignore</source> - <translation>Erstelle .gitignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="814"/> - <source>Create a .gitignore file with default values</source> - <translation>Erstelle eine .gitignore-Datei mit Standardwerten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="817"/> - <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> - <translation><b>Erstelle .gitignore</b><p>Dies erstellt eine .gitignore-Datei mit Standardwerten.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="824"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="828"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="832"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository</source> - <translation>Repository verifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="840"/> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> + <source>Create .gitignore</source> + <translation>Erstelle .gitignore</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="844"/> - <source>Verify the connectivity and validity of objects of the database</source> - <translation>Verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank</translation> + <source>Create a .gitignore file with default values</source> + <translation>Erstelle eine .gitignore-Datei mit Standardwerten</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="847"/> - <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> - <translation><b>Repository verifizieren</b><p>Dies verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository</source> - <translation>Repository optimieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="855"/> - <source>Optimize repository...</source> - <translation>Repository optimieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="859"/> - <source>Cleanup and optimize the local repository</source> - <translation>Säubert und optimiert das lokale Repository</translation> + <source><b>Create .gitignore</b><p>This creates a .gitignore file with default values.</p></source> + <translation><b>Erstelle .gitignore</b><p>Dies erstellt eine .gitignore-Datei mit Standardwerten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="854"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="858"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="862"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository</source> + <translation>Repository verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="870"/> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="874"/> + <source>Verify the connectivity and validity of objects of the database</source> + <translation>Verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="877"/> + <source><b>Verify repository</b><p>This verifies the connectivity and validity of objects of the database.</p></source> + <translation><b>Repository verifizieren</b><p>Dies verifiziert die Erreichbarkeit und Gültigkeit von Objekten der Datenbank.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository</source> + <translation>Repository optimieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="885"/> + <source>Optimize repository...</source> + <translation>Repository optimieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="889"/> + <source>Cleanup and optimize the local repository</source> + <translation>Säubert und optimiert das lokale Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="892"/> <source><b>Optimize repository</b><p>This cleans up and optimizes the local repository.</p></source> <translation><b>Repository optimieren</b><p>Dies säubert und optimiert das lokale Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics</source> <translation>Repository Statistiken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="869"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="899"/> <source>Repository Statistics...</source> <translation>Repository Statistiken...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="903"/> <source>Show some statistics of the local repository</source> <translation>Zeigt einige Statistiken zum lokalen Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="906"/> <source><b>Repository Statistics</b><p>This show some statistics of the local repository.</p></source> <translation><b>Repository Statistiken</b><p>Dies zeigt einige Statistiken zum lokalen Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="883"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="913"/> <source>Create Archive</source> <translation>Archiv erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="887"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="917"/> <source>Create an archive from the local repository</source> <translation>Erzeugt ein Archiv aus dem lokalen Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="890"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="920"/> <source><b>Create Archive</b><p>This creates an archive from the local repository.</p></source> <translation><b>Archiv erzeugen</b><p>Dies erzeugt ein Archiv aus dem lokalen Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle</source> - <translation>Paket erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="897"/> - <source>Create bundle...</source> - <translation>Paket erzeugen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="901"/> - <source>Create bundle file collecting changesets</source> - <translation>Erzeugt ein Paket mit Änderungssätzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="904"/> - <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> - <translation><b>Paket erzeugen</b><p>Dies erzeugt eine Paketdatei mit ausgewählten Änderungssätzen (git bundle create).</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle</source> - <translation>Paket verifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="912"/> - <source>Verify bundle...</source> - <translation>Paket verifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="916"/> - <source>Verify the validity and applicability of a bundle file</source> - <translation>Verifiziert die Gültigkeit und die Anwendbarkeit einer Paketdatei</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="919"/> - <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> - <translation><b>Paket verifizieren</b><p>Dies verifiziert, dass eine Paketdatei gültig ist und fehlerfrei angewendet werden kann.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads</source> - <translation>Köpfe eines Pakets anzeigen</translation> + <source>Create bundle</source> + <translation>Paket erzeugen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="927"/> - <source>List bundle heads...</source> - <translation>Köpfe eines Pakets anzeigen...</translation> + <source>Create bundle...</source> + <translation>Paket erzeugen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="931"/> - <source>List all heads contained in a bundle file</source> - <translation>Zeigt alle Köpfe, die in einer Paketdatei enthalten sind</translation> + <source>Create bundle file collecting changesets</source> + <translation>Erzeugt ein Paket mit Änderungssätzen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="934"/> + <source><b>Create bundle</b><p>This creates a bundle file collecting selected changesets (git bundle create).</p></source> + <translation><b>Paket erzeugen</b><p>Dies erzeugt eine Paketdatei mit ausgewählten Änderungssätzen (git bundle create).</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle</source> + <translation>Paket verifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="942"/> + <source>Verify bundle...</source> + <translation>Paket verifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="946"/> + <source>Verify the validity and applicability of a bundle file</source> + <translation>Verifiziert die Gültigkeit und die Anwendbarkeit einer Paketdatei</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="949"/> + <source><b>Verify bundle</b><p>This verifies that a bundle file is valid and will apply cleanly.</p></source> + <translation><b>Paket verifizieren</b><p>Dies verifiziert, dass eine Paketdatei gültig ist und fehlerfrei angewendet werden kann.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads</source> + <translation>Köpfe eines Pakets anzeigen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="957"/> + <source>List bundle heads...</source> + <translation>Köpfe eines Pakets anzeigen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="961"/> + <source>List all heads contained in a bundle file</source> + <translation>Zeigt alle Köpfe, die in einer Paketdatei enthalten sind</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="964"/> <source><b>List bundle heads</b><p>This lists all heads contained in a bundle file.</p></source> <translation><b>Köpfe eines Pakets anzeigen</b><p>Dies zeigt alle Köpfe, die in einer Paketdatei enthalten sind.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)</source> <translation>Paket anwenden (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="971"/> <source>Apply Bundle (fetch)...</source> <translation>Paket anwenden (fetch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="975"/> <source>Apply a head of a bundle file using fetch</source> <translation>Wendet einen Kopf der Paketdatei mittels 'fetch' an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="948"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="978"/> <source><b>Apply Bundle (fetch)</b><p>This applies a head of a bundle file using fetch.</p></source> <translation><b>Paket anwenden (fetch)</b><p>Dies wendet einen Kopf der Paketdatei mittels 'fetch' an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2097"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2159"/> <source>Apply Bundle (pull)</source> <translation>Paket anwenden (pull)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="955"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="985"/> <source>Apply Bundle (pull)...</source> <translation>Paket anwenden (pull)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="989"/> <source>Apply a head of a bundle file using pull</source> <translation>Wendet einen Kopf der Paketdatei mittels 'pull' an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="992"/> <source><b>Apply Bundle (pull)</b><p>This applies a head of a bundle file using pull.</p></source> <translation><b>Paket anwenden (pull)</b><p>Dies wendet einen Kopf der Paketdatei mittels 'pull' an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="969"/> - <source>Start</source> - <translation>Starten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="973"/> - <source>Start a bisect session</source> - <translation>Startet eine bisect Session</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="976"/> - <source><b>Start</b><p>This starts a bisect session.</p></source> - <translation><b>Starten</b><p>Dies startet eine bisect Session.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="983"/> - <source>Start (Extended)</source> - <translation>Starten (erweitert)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="987"/> - <source>Start a bisect session giving a bad and optionally good commits</source> - <translation>Startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="990"/> - <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> - <translation><b>Starten (erweitert)</b><p>Dies startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="999"/> - <source>Mark as "good"...</source> - <translation>Als „gut“ markieren...</translation> + <source>Start</source> + <translation>Starten</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1003"/> - <source>Mark a selectable revision as good</source> - <translation>Markiere eine auswählbare Revision als gut</translation> + <source>Start a bisect session</source> + <translation>Startet eine bisect Session</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1006"/> - <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> - <translation><b>Als "gut" markieren</b><p>Dies markiert eine auswählbare Revision als gut.</p></translation> + <source><b>Start</b><p>This starts a bisect session.</p></source> + <translation><b>Starten</b><p>Dies startet eine bisect Session.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1013"/> - <source>Mark as "bad"...</source> - <translation>Als „schlecht“ markieren...</translation> + <source>Start (Extended)</source> + <translation>Starten (erweitert)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1017"/> - <source>Mark a selectable revision as bad</source> - <translation>Markiere eine auswählbare Revision als schlecht</translation> + <source>Start a bisect session giving a bad and optionally good commits</source> + <translation>Startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1020"/> + <source><b>Start (Extended)</b><p>This starts a bisect session giving a bad and optionally good commits.</p></source> + <translation><b>Starten (erweitert)</b><p>Dies startet eine bisect Session mit Angabe einer schlechten und von guten Revisionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1029"/> + <source>Mark as "good"...</source> + <translation>Als „gut“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1033"/> + <source>Mark a selectable revision as good</source> + <translation>Markiere eine auswählbare Revision als gut</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1036"/> + <source><b>Mark as "good"</b><p>This marks a selectable revision as good.</p></source> + <translation><b>Als "gut" markieren</b><p>Dies markiert eine auswählbare Revision als gut.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1043"/> + <source>Mark as "bad"...</source> + <translation>Als „schlecht“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1047"/> + <source>Mark a selectable revision as bad</source> + <translation>Markiere eine auswählbare Revision als schlecht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1050"/> <source><b>Mark as "bad"</b><p>This marks a selectable revision as bad.</p></source> <translation><b>Als "schlecht" markieren</b><p>Dies markiert eine auswählbare Revision als schlecht.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1027"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1057"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1031"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1061"/> <source>Skip a selectable revision</source> <translation>Überspringe eine auswählbare Revision</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1034"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1064"/> <source><b>Skip</b><p>This skips a selectable revision.</p></source> <translation><b>Überspringen</b><p>Dies überspringt eine auswählbare Revision.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1041"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1071"/> <source>Reset...</source> <translation>Zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1045"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1075"/> <source>Reset the bisect session</source> <translation>Setzt die bisect Session zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1078"/> <source><b>Reset</b><p>This resets the bisect session.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die bisect Session zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1055"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1085"/> <source>Show bisect log browser</source> <translation>Bisect-Browser anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1090"/> <source>Show a dialog to browse the bisect log of the local project</source> <translation>Zeigt einen Dialog, um den Ablauf der bisect Session durchzusehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1093"/> <source><b>Show bisect log browser</b><p>This shows a dialog to browse the bisect log of the local project.</p></source> <translation><b>Bisect-Browser anzeigen</b><p>Dies zeigt einen Dialog, um den Ablauf der bisect Session durchzusehen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1072"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1102"/> <source>Create replay file</source> <translation>Wiederholungsdatei erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1076"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1106"/> <source>Create a replay file to repeat the current bisect session</source> <translation>Erzeugt eine Datei zur Wiederholung der aktuellen bisect Session</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1109"/> <source><b>Create replay file</b><p>This creates a replay file to repeat the current bisect session.</p></source> <translation><b>Wiederholungsdatei erzeugen</b><p>Dies erzeugt eine Datei zur Wiederholung der aktuellen bisect Session.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1088"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1118"/> <source>Edit replay file</source> <translation>Editiere Wiederholungsdatei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1092"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1122"/> <source>Edit a bisect replay file</source> <translation>Eine bisect Wiederholungsdatei bearbeiten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1125"/> <source><b>Edit replay file</b><p>This edits a bisect replay file.</p></source> <translation><b>Editiere Wiederholungsdatei</b><p>Dies bearbeitet eine bisect Wiederholungsdatei.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1103"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1133"/> <source>Replay session</source> <translation>Session wiederholen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1107"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1137"/> <source>Replay a bisect session from file</source> <translation>Wiederholt eine bisect Session aus einer Datei</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1140"/> <source><b>Replay session</b><p>This replays a bisect session from file.</p></source> <translation><b>Session wiederholen</b><p>Dies wiederholt eine bisect Session aus einer Datei.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1344"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1374"/> <source>Administration</source> <translation>Verwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1360"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1390"/> <source>Bundle Management</source> <translation>Paketverwaltung</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1690"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1722"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2237"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2299"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1397"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1427"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1405"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1435"/> <source>Branches</source> <translation>Zweige</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1418"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1448"/> <source>Manage Changes</source> <translation>Änderungen verwalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1456"/> <source>Remote Repositories</source> <translation>Entfernte Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1468"/> <source>Cherry-pick</source> <translation>Aussuchen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1444"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1476"/> <source>Stash</source> <translation>Ablage</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1646"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1678"/> <source>Branch</source> <translation>Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <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/vcsGit/ProjectHelper.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1747"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1734"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1766"/> <source>Unstage Changes</source> <translation>Vormerkung rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1813"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1874"/> <source>Select a remote repository:</source> <translation>Wähle ein entferntes Repository:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1853"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1915"/> <source>Copy Commits (Continue)</source> <translation>Revisionen kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1872"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1934"/> <source>Copy Commits (Quit)</source> <translation>Revisionen kopieren (Beenden)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1892"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1954"/> <source>Copy Commits (Cancel)</source> <translation>Revisionen kopieren (Abbrechen)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1911"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1973"/> <source>Save Stash</source> <translation>Ablage erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2023"/> <source>Restore Stash</source> <translation>Ablage wiederherstellen</translation> </message> @@ -21930,7 +21983,7 @@ <translation><b>Aktuellste Marke zeigen</b><p>Dies zeigt die aktuellste Marke, die vom Arbeitsbereich erreichbar ist.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="642"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="672"/> <source><b>Quit Copying Session</b><p>This quits the current copying session.</p></source> <translation><b>Kopiersitzung beenden</b><p>Dies beendet die aktuelle Kopiersitzung.</p></translation> </message> @@ -21955,225 +22008,265 @@ <translation><b>Änderungen in Repository einpflegen</b><p>Dies pflegt Änderungen am lokalen Projekt in das Git-Repository ein.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1541"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1573"/> <source>Git</source> <translation>Git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1117"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1147"/> <source>Check patch files</source> <translation>Patchdateien prüfen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1121"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1151"/> <source>Check a list of patch files, if they would apply cleanly</source> <translation>Prüfe eine Liste von Patchdateien, ob sie fehlerfrei angewendet werden können</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1124"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1154"/> <source><b>Check patch files</b><p>This checks a list of patch files, if they would apply cleanly.</p></source> <translation><b>Patchdateien prüfen</b><p>Dies prüft eine Liste von Patchdateien, ob sie fehlerfrei angewendet werden können.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2261"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="2323"/> <source>Apply patch files</source> <translation>Patchdateien anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1136"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1166"/> <source>Apply a list of patch files</source> <translation>Wendet eine Liste von Patchdateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1139"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1169"/> <source><b>Apply patch files</b><p>This applies a list of patch files.</p></source> <translation><b>Patchdateien anwenden</b><p>Dies wendet eine Liste von Patchdateien an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1146"/> - <source>Show patch statistics</source> - <translation>Zeige Patch Statistiken</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1150"/> - <source>Show some statistics for a list of patch files</source> - <translation>Zeigt Statistiken für eine Liste von Patchdateien an</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1153"/> - <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> - <translation><b>Zeige Patch Statistiken</b><p>Dies zeigt Statistiken für eine Liste von Patchdateien an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1371"/> - <source>Patch Management</source> - <translation>Verwaltung von Patches</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1165"/> - <source>Add a submodule to the current project</source> - <translation>Ein Submodule zum aktuellen Projekt hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1168"/> - <source><b>Add</b><p>This adds a submodule to the current project.</p></source> - <translation><b>Hinzufügen</b><p>Dies fügt dem aktuellen Projekt ein Submodul hinzu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1176"/> - <source>List</source> - <translation>Auflisten</translation> + <source>Show patch statistics</source> + <translation>Zeige Patch Statistiken</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1180"/> - <source>List the submodule of the current project</source> - <translation>Liste die Submodule des aktuellen Projektes auf</translation> + <source>Show some statistics for a list of patch files</source> + <translation>Zeigt Statistiken für eine Liste von Patchdateien an</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1183"/> - <source><b>List</b><p>This lists the submodules of the current project.</p></source> - <translation><b>Auflisten</b><p>Dies listet die Submodule des aktuellen Projektes auf.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1191"/> - <source>Initialize</source> - <translation>Initialisieren</translation> + <source><b>Show patch statistics</b><p>This shows some statistics for a list of patch files.</p></source> + <translation><b>Zeige Patch Statistiken</b><p>Dies zeigt Statistiken für eine Liste von Patchdateien an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1401"/> + <source>Patch Management</source> + <translation>Verwaltung von Patches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1195"/> - <source>Initialize the submodules of the current project</source> - <translation>Initialisiert die Submodule des aktuellen Projektes</translation> + <source>Add a submodule to the current project</source> + <translation>Ein Submodule zum aktuellen Projekt hinzufügen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1198"/> + <source><b>Add</b><p>This adds a submodule to the current project.</p></source> + <translation><b>Hinzufügen</b><p>Dies fügt dem aktuellen Projekt ein Submodul hinzu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1206"/> + <source>List</source> + <translation>Auflisten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1210"/> + <source>List the submodule of the current project</source> + <translation>Liste die Submodule des aktuellen Projektes auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1213"/> + <source><b>List</b><p>This lists the submodules of the current project.</p></source> + <translation><b>Auflisten</b><p>Dies listet die Submodule des aktuellen Projektes auf.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1221"/> + <source>Initialize</source> + <translation>Initialisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1225"/> + <source>Initialize the submodules of the current project</source> + <translation>Initialisiert die Submodule des aktuellen Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1228"/> <source><b>Initialize</b><p>This initializes the submodules of the current project.</p></source> <translation><b>Initialisieren</b><p>Dies initialisiert die Submodule des aktuellen Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1207"/> - <source>Unregister</source> - <translation>Deregistrieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1211"/> - <source>Unregister submodules of the current project</source> - <translation>Deregistriert Submodules des aktuellen Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1214"/> - <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> - <translation><b>Deregistrieren</b><p>Dies deregistriert Submodules des aktuellen Projektes.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1222"/> - <source>Update</source> - <translation>Aktualisieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1226"/> - <source>Update submodules of the current project</source> - <translation>Aktualisiert Submodule des aktuellen Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1229"/> - <source><b>Update</b><p>This updates submodules of the current project.</p></source> - <translation><b>Aktualisieren</b><p>Dies aktualisiert Submodule des aktuellen Projektes.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1237"/> - <source>Initialize and Update</source> - <translation>Initialisieren und Aktualisieren</translation> + <source>Unregister</source> + <translation>Deregistrieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1241"/> - <source>Initialize and update submodules of the current project</source> - <translation>Initialisiert und aktualisiert Submodule des aktuellen Projektes</translation> + <source>Unregister submodules of the current project</source> + <translation>Deregistriert Submodules des aktuellen Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1244"/> + <source><b>Unregister</b><p>This unregisters submodules of the current project.</p></source> + <translation><b>Deregistrieren</b><p>Dies deregistriert Submodules des aktuellen Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1252"/> + <source>Update</source> + <translation>Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1256"/> + <source>Update submodules of the current project</source> + <translation>Aktualisiert Submodule des aktuellen Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1259"/> + <source><b>Update</b><p>This updates submodules of the current project.</p></source> + <translation><b>Aktualisieren</b><p>Dies aktualisiert Submodule des aktuellen Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1267"/> + <source>Initialize and Update</source> + <translation>Initialisieren und Aktualisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1271"/> + <source>Initialize and update submodules of the current project</source> + <translation>Initialisiert und aktualisiert Submodule des aktuellen Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1274"/> <source><b>Initialize and Update</b><p>This initializes and updates submodules of the current project.</p></source> <translation><b>Initialisieren und Aktualisieren</b><p>Dies initialisiert und aktualisiert Submodule des aktuellen Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1283"/> <source>Fetch and Update</source> <translation>Herunterladen und Aktualisieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1257"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1287"/> <source>Fetch and update submodules of the current project</source> <translation>Lädt Änderungen an Submodulen des aktuellen Projektes herunter und aktualisiert sie</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1260"/> - <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> - <translation><b>Herunterladen und Aktualisieren</b><p>Dies lädt Änderungen an Submodulen des aktuellen Projektes herunter und aktualisiert sie.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1269"/> - <source>Update with Options</source> - <translation>Aktualisieren (mit Optionen)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1273"/> - <source>Update submodules of the current project offering a dialog to enter options</source> - <translation>Aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1277"/> - <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> - <translation><b>Aktualisieren (mit Optionen)</b><p>Dies aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1286"/> - <source>Synchronize URLs</source> - <translation>URLs synchronisieren</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1290"/> + <source><b>Fetch and Update</b><p>This fetches and updates submodules of the current project.</p></source> + <translation><b>Herunterladen und Aktualisieren</b><p>Dies lädt Änderungen an Submodulen des aktuellen Projektes herunter und aktualisiert sie.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1299"/> + <source>Update with Options</source> + <translation>Aktualisieren (mit Optionen)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1303"/> + <source>Update submodules of the current project offering a dialog to enter options</source> + <translation>Aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1307"/> + <source><b>Update with Options</b><p>This updates submodules of the current project offering a dialog to enter update options.</p></source> + <translation><b>Aktualisieren (mit Optionen)</b><p>Dies aktualisiert Submodule des aktuellen Projektes mit Eingabemöglichkeit für Optionen.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1316"/> + <source>Synchronize URLs</source> + <translation>URLs synchronisieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1320"/> <source>Synchronize URLs of submodules of the current project</source> <translation>Synchronisiert URLs der Submodule des aktuellen Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1323"/> <source><b>Synchronize URLs</b><p>This synchronizes URLs of submodules of the current project.</p></source> <translation><b>URLs synchronisieren</b><p>Dies synchronisiert URLs der Submodule des aktuellen Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1302"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1332"/> <source>Show Status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1336"/> <source>Show the status of submodules of the current project</source> <translation>Zeigt den Status der Submodule des aktuellen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1339"/> <source><b>Show Status</b><p>This shows a dialog with the status of submodules of the current project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status der Submodule des aktuellen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1318"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1348"/> <source>Show Summary</source> <translation>Übersicht anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1322"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1352"/> <source>Show summary information for submodules of the current project</source> <translation>Zeigt Übersichtsinformationen für Submodule des aktuellen Projektes an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1325"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1355"/> <source><b>Show Summary</b><p>This shows some summary information for submodules of the current project.</p></source> <translation><b>Übersicht anzeigen</b><p>Dies zeigt Übersichtsinformationen für Submodule des aktuellen Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1459"/> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="1491"/> <source>Submodules</source> <translation>Submodule</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL</source> + <translation>URL ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="604"/> + <source>Change URL...</source> + <translation>URL ändern...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="608"/> + <source>Change the URL of a remote repository</source> + <translation>Ändere die URL eines entfernten Repositories</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="611"/> + <source><b>Change URL</b><p>This changes the URL of a remote repository.</p></source> + <translation><b>URL ändern</b><p>Dies ändert die URL eines entfernten Repositories.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials</source> + <translation>Berechtigung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="618"/> + <source>Credentials...</source> + <translation>Berechtigung...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="622"/> + <source>Change or set the user credentials of a remote repository</source> + <translation>Ändere oder setze die Nutzerparameter eines entfernten Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/ProjectHelper.py" line="625"/> + <source><b>Credentials</b><p>This changes or sets the user credentials of a remote repository.</p></source> + <translation><b>Berechtigung</b><p>Dies ändert oder setzt die Nutzerparameter eines entfernten Repository.</p></translation> + </message> </context> <context> <name>GitPullDialog</name> @@ -22475,6 +22568,49 @@ </message> </context> <context> + <name>GitRemoteCredentialsDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="14"/> + <source>Git Remote Credentials</source> + <translation>Berechtigung für entferntes Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="23"/> + <source>Name:</source> + <translation>Name:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="40"/> + <source>URL:</source> + <translation>URL:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="57"/> + <source>Credentials</source> + <translation>Berechtigung</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="63"/> + <source>Username:</source> + <translation>Nutzername:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="70"/> + <source>Enter the user name for the remote repository</source> + <translation>Gib den Nutzernamen für das entfernte Repository ein</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="77"/> + <source>Password:</source> + <translation>Kennwort:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.ui" line="87"/> + <source>Enter the password for the remote repository</source> + <translation>Gib das Kennwort für das entfernte Repository ein</translation> + </message> +</context> +<context> <name>GitRemoteRepositoriesDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="14"/> @@ -22519,92 +22655,92 @@ <translation>&Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="159"/> <source>Press to rename the selected repository</source> <translation>Drücken, um das ausgewählte Repository umzubenennen</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="162"/> + <source>&Rename</source> + <translation>&Umbenennen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="92"/> + <source>Press to remove the selected repository</source> + <translation>Drücken, um das ausgewählte Repository zu entfernen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="95"/> - <source>&Rename</source> - <translation>&Umbenennen</translation> + <source>Re&move</source> + <translation>&Entfernen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="102"/> - <source>Press to remove the selected repository</source> - <translation>Drücken, um das ausgewählte Repository zu entfernen</translation> + <source>Press to delete stale tracking branches under the selected repository </source> + <translation>Drücken, um lose Trackingzweige innerhalb des ausgewählten Repository zu löschen </translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="105"/> - <source>Re&move</source> - <translation>&Entfernen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="112"/> - <source>Press to delete stale tracking branches under the selected repository </source> - <translation>Drücken, um lose Trackingzweige innerhalb des ausgewählten Repository zu löschen </translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="115"/> <source>&Prune</source> <translation>&Beschneiden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="119"/> <source>Press to show information about the selected repository</source> <translation>Drücken, um Informationen zum ausgewählten Repository anzuzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="122"/> <source>Show &Info...</source> <translation>&Informationen zeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="160"/> - <source>Errors</source> - <translation>Fehler</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="166"/> - <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> - <translation><b>Git Protokoll-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des git-Befehls.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> - <source>Input</source> - <translation>Eingabe</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="204"/> - <source>Press to send the input to the git process</source> - <translation>Drücken um die Eingabe an den git-Prozess zu senden</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="207"/> - <source>&Send</source> - <translation>Sen&den</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="210"/> + <source>Errors</source> + <translation>Fehler</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="216"/> + <source><b>Git log errors</b><p>This shows possible error messages of the git log command.</p></source> + <translation><b>Git Protokoll-Fehler</b><p>Dies zeigt mögliche Fehlermeldungen des git-Befehls.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="232"/> + <source>Input</source> + <translation>Eingabe</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="254"/> + <source>Press to send the input to the git process</source> + <translation>Drücken um die Eingabe an den git-Prozess zu senden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="257"/> + <source>&Send</source> + <translation>Sen&den</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="260"/> <source>Alt+S</source> <translation>Alt+D</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="267"/> <source>Enter data to be sent to the git process</source> <translation>Gib die Daten ein, die an den git-Prozess geschickt werden sollen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="224"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="274"/> <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/vcsGit/GitRemoteRepositoriesDialog.ui" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="277"/> <source>&Password Mode</source> <translation>&Kennwortmodus</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="280"/> <source>Alt+P</source> <translation>Alt+K</translation> </message> @@ -22628,6 +22764,26 @@ <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/vcsGit/GitRemoteRepositoriesDialog.ui" line="169"/> + <source>Press to change the URL of the selected repository</source> + <translation>Drücken, um die URL des ausgewählten Repository zu ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="172"/> + <source>Change &URL</source> + <translation>UR&L ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="179"/> + <source>Press to set or change the user credentials of the selected repository</source> + <translation>Drücken, um die Nutzerparameter des ausgewählten Repository zu ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.ui" line="182"/> + <source>&Credentials</source> + <translation>&Nutzerparameter</translation> + </message> </context> <context> <name>GitRevisionSelectionDialog</name>