diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-02 05:11:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-02 05:11:57 (GMT) |
| commit | a8816e7bab0354badd915c1da09421a64c982831 (patch) | |
| tree | 4d481c55f29d977384f312646c84b0adb4ad0d4b /git-gui/po/de.po | |
| parent | 1087aba86b4a687cabf03d4a060d4b51282819d3 (diff) | |
| parent | a91be3fcbe92c24e809b1ec85881a6da40a9a340 (diff) | |
| download | git-a8816e7bab0354badd915c1da09421a64c982831.zip git-a8816e7bab0354badd915c1da09421a64c982831.tar.gz git-a8816e7bab0354badd915c1da09421a64c982831.tar.bz2 | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui: Fixes for Mac OS X TkAqua
git-gui: Update Russian translation
git-gui: run post-checkout hook after clone
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
git-gui (Win): make starting via "Git GUI Here" on .git/ possible
git-gui (Win): make "Explore Working Copy" more robust
git-gui: run post-checkout hook on checkout
git-gui: When calling post-commit hook wrong variable was cleared.
git-gui: use `git --html-path` to get the location of installed HTML docs
git-gui: fix deleting from the context menu with empty selection
git-gui: minor spelling fix and string factorisation.
git-gui: various French translation fixes
git-gui: Fix merge conflict display error when filename contains spaces
git-gui: don't hide the Browse button when resizing the repo chooser
Append ampersand to "Target" of lnk files created by do_cygwin_shortcut
git-gui: Support more git version notations.
git-gui: Avoid an infinite rescan loop in handle_empty_diff.
git-gui: Fix post-commit status with subject in non-locale encoding
Diffstat (limited to 'git-gui/po/de.po')
| -rw-r--r-- | git-gui/po/de.po | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/git-gui/po/de.po b/git-gui/po/de.po index a6f730b..51abb50 100644 --- a/git-gui/po/de.po +++ b/git-gui/po/de.po @@ -773,16 +773,6 @@ msgstr "Immer (ohne Zusammenführungstest)" msgid "The following branches are not completely merged into %s:" msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:" -#: lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult. \n" -"\n" -" Delete the selected branches?" -msgstr "" -"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n" -"\n" -"Gewählte Zweige jetzt löschen?" - #: lib/branch_delete.tcl:141 #, tcl-format msgid "" @@ -2506,7 +2496,7 @@ msgstr "Starten: %s" #: lib/tools.tcl:149 #, tcl-format -msgid "Tool completed succesfully: %s" +msgid "Tool completed successfully: %s" msgstr "Werkzeug erfolgreich abgeschlossen: %s" #: lib/tools.tcl:151 |