From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Mar 2008 05:22:52 +0000 (-0800)
Subject: Merge branch 'master' of git://repo.or.cz/git-gui
X-Git-Tag: v1.5.5-rc0~112
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dfb9a34ababeee98a9f241636c1fe6e98c754f7a;p=git.git

Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
  git-gui: fix typo in lib/spellcheck.tcl
  git-gui: Shorten Aspell version strings to just Aspell version number
  git-gui: Gracefully display non-aspell version errors to users
  git-gui: Catch and display aspell startup failures to the user
  git-gui: Only bind the spellcheck popup suggestion hook once
  git-gui: Remove explicit references to 'aspell' in message strings
  git-gui: Ensure all spellchecker 'class' variables are initialized
  git-gui: Update German translation.
  git-gui: (i18n) Add newly added translation strings to template.
---

dfb9a34ababeee98a9f241636c1fe6e98c754f7a
diff --cc git-gui/lib/about.tcl
index 47be8eb97,000000000..241ab892c
mode 100644,000000..100644
--- a/git-gui/lib/about.tcl
+++ b/git-gui/lib/about.tcl
@@@ -1,86 -1,0 +1,87 @@@
 +# git-gui about git-gui dialog
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc do_about {} {
 +	global appvers copyright oguilib
 +	global tcl_patchLevel tk_patchLevel
 +	global ui_comm_spell
 +
 +	set w .about_dialog
 +	toplevel $w
 +	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 +
 +	pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10
 +	label $w.header -text [mc "About %s" [appname]] \
 +		-font font_uibold
 +	pack $w.header -side top -fill x
 +
 +	frame $w.buttons
 +	button $w.buttons.close -text {Close} \
 +		-default active \
 +		-command [list destroy $w]
 +	pack $w.buttons.close -side right
 +	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 +
 +	label $w.desc \
 +		-text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" \
 +		-padx 5 -pady 5 \
 +		-justify left \
 +		-anchor w \
 +		-borderwidth 1 \
 +		-relief solid
 +	pack $w.desc -side top -fill x -padx 5 -pady 5
 +
 +	set v {}
 +	append v "git-gui version $appvers\n"
 +	append v "[git version]\n"
 +	append v "\n"
 +	if {$tcl_patchLevel eq $tk_patchLevel} {
 +		append v "Tcl/Tk version $tcl_patchLevel"
 +	} else {
 +		append v "Tcl version $tcl_patchLevel"
 +		append v ", Tk version $tk_patchLevel"
 +	}
- 	if {[info exists ui_comm_spell]} {
++	if {[info exists ui_comm_spell]
++		&& [$ui_comm_spell version] ne {}} {
 +		append v "\n"
 +		append v [$ui_comm_spell version]
 +	}
 +
 +	set d {}
 +	append d "git wrapper: $::_git\n"
 +	append d "git exec dir: [gitexec]\n"
 +	append d "git-gui lib: $oguilib"
 +
 +	label $w.vers \
 +		-text $v \
 +		-padx 5 -pady 5 \
 +		-justify left \
 +		-anchor w \
 +		-borderwidth 1 \
 +		-relief solid
 +	pack $w.vers -side top -fill x -padx 5 -pady 5
 +
 +	label $w.dirs \
 +		-text $d \
 +		-padx 5 -pady 5 \
 +		-justify left \
 +		-anchor w \
 +		-borderwidth 1 \
 +		-relief solid
 +	pack $w.dirs -side top -fill x -padx 5 -pady 5
 +
 +	menu $w.ctxm -tearoff 0
 +	$w.ctxm add command \
 +		-label {Copy} \
 +		-command "
 +		clipboard clear
 +		clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
 +	"
 +
 +	bind $w <Visibility> "grab $w; focus $w.buttons.close"
 +	bind $w <Key-Escape> "destroy $w"
 +	bind $w <Key-Return> "destroy $w"
 +	bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
 +	wm title $w "About [appname]"
 +	tkwait window $w
 +}
diff --cc git-gui/lib/spellcheck.tcl
index 7f018e400,000000000..9be748683
mode 100644,000000..100644
--- a/git-gui/lib/spellcheck.tcl
+++ b/git-gui/lib/spellcheck.tcl
@@@ -1,363 -1,0 +1,408 @@@
- # git-gui spellchecking support through aspell
++# git-gui spellchecking support through ispell/aspell
 +# Copyright (C) 2008 Shawn Pearce
 +
 +class spellcheck {
 +
- field s_fd     {} ; # pipe to aspell
- field s_version   ; # aspell version string
- field s_lang      ; # current language code
++field s_fd      {} ; # pipe to ispell/aspell
++field s_version {} ; # ispell/aspell version string
++field s_lang    {} ; # current language code
++field s_prog aspell; # are we actually old ispell?
++field s_failed   0 ; # is $s_prog bogus and not working?
 +
 +field w_text      ; # text widget we are spelling
 +field w_menu      ; # context menu for the widget
 +field s_menuidx 0 ; # last index of insertion into $w_menu
 +
- field s_i              ; # timer registration for _run callbacks
++field s_i           {} ; # timer registration for _run callbacks
 +field s_clear        0 ; # did we erase mispelled tags yet?
 +field s_seen    [list] ; # lines last seen from $w_text in _run
 +field s_checked [list] ; # lines already checked
- field s_pending [list] ; # [$line $data] sent to aspell
++field s_pending [list] ; # [$line $data] sent to ispell/aspell
 +field s_suggest        ; # array, list of suggestions, keyed by misspelling
 +
 +constructor init {pipe_fd ui_text ui_menu} {
 +	set w_text $ui_text
 +	set w_menu $ui_menu
++	array unset s_suggest
 +
++	bind_button3 $w_text [cb _popup_suggest %X %Y @%x,%y]
 +	_connect $this $pipe_fd
 +	return $this
 +}
 +
 +method _connect {pipe_fd} {
 +	fconfigure $pipe_fd \
 +		-encoding utf-8 \
 +		-eofchar {} \
 +		-translation lf
 +
 +	if {[gets $pipe_fd s_version] <= 0} {
- 		close $pipe_fd
- 		error [mc "Not connected to aspell"]
++		if {[catch {close $pipe_fd} err]} {
++
++			# Eh?  Is this actually ispell choking on aspell options?
++			#
++			if {$s_prog eq {aspell}
++				&& [regexp -nocase {^Usage: } $err]
++				&& ![catch {
++						set pipe_fd [open [list | $s_prog -v] r]
++						gets $pipe_fd s_version
++						close $pipe_fd
++				}]
++				&& $s_version ne {}} {
++				if {{@(#) } eq [string range $s_version 0 4]} {
++					set s_version [string range $s_version 5 end]
++				}
++				set s_failed 1
++				error_popup [strcat \
++					[mc "Unsupported spell checker"] \
++					":\n\n$s_version"]
++				set s_version {}
++				return
++			}
++
++			regsub -nocase {^Error: } $err {} err
++			if {$s_fd eq {}} {
++				error_popup [strcat [mc "Spell checking is unavailable"] ":\n\n$err"]
++			} else {
++				error_popup [strcat \
++					[mc "Invalid spell checking configuration"] \
++					":\n\n$err\n\n" \
++					[mc "Reverting dictionary to %s." $s_lang]]
++			}
++		} else {
++			error_popup [mc "Spell checker silently failed on startup"]
++		}
++		return
 +	}
++
 +	if {{@(#) } ne [string range $s_version 0 4]} {
- 		close $pipe_fd
- 		error [strcat [mc "Unrecognized aspell version"] ": $s_version"]
++		catch {close $pipe_fd}
++		error_popup [strcat [mc "Unrecognized spell checker"] ":\n\n$s_version"]
++		return
 +	}
 +	set s_version [string range $s_version 5 end]
++	regexp \
++		{International Ispell Version .* \(but really (Aspell .*?)\)$} \
++		$s_version _junk s_version
 +
 +	puts $pipe_fd !             ; # enable terse mode
 +	puts $pipe_fd {$$cr master} ; # fetch the language
 +	flush $pipe_fd
 +
 +	gets $pipe_fd s_lang
 +	regexp {[/\\]([^/\\]+)\.[^\.]+$} $s_lang _ s_lang
 +
 +	if {$::default_config(gui.spellingdictionary) eq {}
 +	 && [get_config gui.spellingdictionary] eq {}} {
 +		set ::default_config(gui.spellingdictionary) $s_lang
 +	}
 +
 +	if {$s_fd ne {}} {
 +		catch {close $s_fd}
 +	}
 +	set s_fd $pipe_fd
 +
 +	fconfigure $s_fd -blocking 0
 +	fileevent $s_fd readable [cb _read]
 +
 +	$w_text tag conf misspelled \
 +		-foreground red \
 +		-underline 1
- 	bind_button3 $w_text [cb _popup_suggest %X %Y @%x,%y]
 +
 +	array unset s_suggest
 +	set s_seen    [list]
 +	set s_checked [list]
 +	set s_pending [list]
 +	_run $this
 +}
 +
 +method lang {{n {}}} {
- 	if {$n ne {} && $s_lang ne $n} {
++	if {$n ne {} && $s_lang ne $n && !$s_failed} {
 +		set spell_cmd [list |]
 +		lappend spell_cmd aspell
 +		lappend spell_cmd --master=$n
 +		lappend spell_cmd --mode=none
 +		lappend spell_cmd --encoding=UTF-8
 +		lappend spell_cmd pipe
 +		_connect $this [open $spell_cmd r+]
 +	}
 +	return $s_lang
 +}
 +
 +method version {} {
- 	return "$s_version, $s_lang"
++	if {$s_version ne {}} {
++		return "$s_version, $s_lang"
++	}
++	return {}
 +}
 +
 +method stop {} {
 +	while {$s_menuidx > 0} {
 +		$w_menu delete 0
 +		incr s_menuidx -1
 +	}
 +	$w_text tag delete misspelled
 +
 +	catch {close $s_fd}
 +	catch {after cancel $s_i}
 +	set s_fd {}
 +	set s_i {}
 +	set s_lang {}
 +}
 +
 +method _popup_suggest {X Y pos} {
 +	while {$s_menuidx > 0} {
 +		$w_menu delete 0
 +		incr s_menuidx -1
 +	}
 +
 +	set b_loc [$w_text index "$pos wordstart"]
 +	set e_loc [_wordend $this $b_loc]
 +	set orig  [$w_text get $b_loc $e_loc]
 +	set tags  [$w_text tag names $b_loc]
 +
 +	if {[lsearch -exact $tags misspelled] >= 0} {
 +		if {[info exists s_suggest($orig)]} {
 +			set cnt 0
 +			foreach s $s_suggest($orig) {
 +				if {$cnt < 5} {
 +					$w_menu insert $s_menuidx command \
 +						-label $s \
 +						-command [cb _replace $b_loc $e_loc $s]
 +					incr s_menuidx
 +					incr cnt
 +				} else {
 +					break
 +				}
 +			}
 +		} else {
 +			$w_menu insert $s_menuidx command \
 +				-label [mc "No Suggestions"] \
 +				-state disabled
 +			incr s_menuidx
 +		}
 +		$w_menu insert $s_menuidx separator
 +		incr s_menuidx
 +	}
 +
 +	$w_text mark set saved-insert insert
 +	tk_popup $w_menu $X $Y
 +}
 +
 +method _replace {b_loc e_loc word} {
 +	$w_text configure -autoseparators 0
 +	$w_text edit separator
 +
 +	$w_text delete $b_loc $e_loc
 +	$w_text insert $b_loc $word
 +
 +	$w_text edit separator
 +	$w_text configure -autoseparators 1
 +	$w_text mark set insert saved-insert
 +}
 +
 +method _restart_timer {} {
 +	set s_i [after 300 [cb _run]]
 +}
 +
 +proc _match_length {max_line arr_name} {
 +	upvar $arr_name a
 +
 +	if {[llength $a] > $max_line} {
 +		set a [lrange $a 0 $max_line]
 +	}
 +	while {[llength $a] <= $max_line} {
 +		lappend a {}
 +	}
 +}
 +
 +method _wordend {pos} {
 +	set pos  [$w_text index "$pos wordend"]
 +	set tags [$w_text tag names $pos]
 +	while {[lsearch -exact $tags misspelled] >= 0} {
 +		set pos  [$w_text index "$pos +1c"]
 +		set tags [$w_text tag names $pos]
 +	}
 +	return $pos
 +}
 +
 +method _run {} {
 +	set cur_pos  [$w_text index {insert -1c}]
 +	set cur_line [lindex [split $cur_pos .] 0]
 +	set max_line [lindex [split [$w_text index end] .] 0]
 +	_match_length $max_line s_seen
 +	_match_length $max_line s_checked
 +
 +	# Nothing in the message buffer?  Nothing to spellcheck.
 +	#
 +	if {$cur_line == 1
 +	 && $max_line == 2
 +	 && [$w_text get 1.0 end] eq "\n"} {
 +		array unset s_suggest
 +		_restart_timer $this
 +		return
 +	}
 +
 +	set active 0
 +	for {set n 1} {$n <= $max_line} {incr n} {
 +		set s [$w_text get "$n.0" "$n.end"]
 +
 +		# Don't spellcheck the current line unless we are at
 +		# a word boundary.  The user might be typing on it.
 +		#
 +		if {$n == $cur_line
 +		 && ![regexp {^\W$} [$w_text get $cur_pos insert]]} {
 +
 +			# If the current word is mispelled remove the tag
 +			# but force a spellcheck later.
 +			#
 +			set tags [$w_text tag names $cur_pos]
 +			if {[lsearch -exact $tags misspelled] >= 0} {
 +				$w_text tag remove misspelled \
 +					"$cur_pos wordstart" \
 +					[_wordend $this $cur_pos]
 +				lset s_seen    $n $s
 +				lset s_checked $n {}
 +			}
 +
 +			continue
 +		}
 +
 +		if {[lindex $s_seen    $n] eq $s
 +		 && [lindex $s_checked $n] ne $s} {
 +			# Don't send empty lines to Aspell it doesn't check them.
 +			#
 +			if {$s eq {}} {
 +				lset s_checked $n $s
 +				continue
 +			}
 +
 +			# Don't send typical s-b-o lines as the emails are
 +			# almost always misspelled according to Aspell.
 +			#
 +			if {[regexp -nocase {^[a-z-]+-by:.*<.*@.*>$} $s]} {
 +				$w_text tag remove misspelled "$n.0" "$n.end"
 +				lset s_checked $n $s
 +				continue
 +			}
 +
 +			puts $s_fd ^$s
 +			lappend s_pending [list $n $s]
 +			set active 1
 +		} else {
 +			# Delay until another idle loop to make sure we don't
 +			# spellcheck lines the user is actively changing.
 +			#
 +			lset s_seen $n $s
 +		}
 +	}
 +
 +	if {$active} {
 +		set s_clear 1
 +		flush $s_fd
 +	} else {
 +		_restart_timer $this
 +	}
 +}
 +
 +method _read {} {
 +	while {[gets $s_fd line] >= 0} {
 +		set lineno [lindex $s_pending 0 0]
 +
 +		if {$s_clear} {
 +			$w_text tag remove misspelled "$lineno.0" "$lineno.end"
 +			set s_clear 0
 +		}
 +
 +		if {$line eq {}} {
 +			lset s_checked $lineno [lindex $s_pending 0 1]
 +			set s_pending [lrange $s_pending 1 end]
 +			set s_clear 1
 +			continue
 +		}
 +
 +		set sugg [list]
 +		switch -- [string range $line 0 1] {
 +		{& } {
 +			set line [split [string range $line 2 end] :]
 +			set info [split [lindex $line 0] { }]
 +			set orig [lindex $info 0]
 +			set offs [lindex $info 2]
 +			foreach s [split [lindex $line 1] ,] {
 +				lappend sugg [string range $s 1 end]
 +			}
 +		}
 +		{# } {
 +			set info [split [string range $line 2 end] { }]
 +			set orig [lindex $info 0]
 +			set offs [lindex $info 1]
 +		}
 +		default {
 +			puts stderr "<spell> $line"
 +			continue
 +		}
 +		}
 +
 +		incr offs -1
 +		set b_loc "$lineno.$offs"
 +		set e_loc [$w_text index "$lineno.$offs wordend"]
 +		set curr [$w_text get $b_loc $e_loc]
 +
 +		# At least for English curr = "bob", orig = "bob's"
 +		# so Tk didn't include the 's but Aspell did.  We
 +		# try to round out the word.
 +		#
 +		while {$curr ne $orig
 +		 && [string equal -length [string length $curr] $curr $orig]} {
 +			set n_loc  [$w_text index "$e_loc +1c"]
 +			set n_curr [$w_text get $b_loc $n_loc]
 +			if {$n_curr eq $curr} {
 +				break
 +			}
 +			set curr  $n_curr
 +			set e_loc $n_loc
 +		}
 +
 +		if {$curr eq $orig} {
 +			$w_text tag add misspelled $b_loc $e_loc
 +			if {[llength $sugg] > 0} {
 +				set s_suggest($orig) $sugg
 +			} else {
 +				unset -nocomplain s_suggest($orig)
 +			}
 +		} else {
 +			unset -nocomplain s_suggest($orig)
 +		}
 +	}
 +
 +	fconfigure $s_fd -block 1
 +	if {[eof $s_fd]} {
 +		if {![catch {close $s_fd} err]} {
- 			set err [mc "unexpected eof from aspell"]
++			set err [mc "Unexpected EOF from spell checker"]
 +		}
 +		catch {after cancel $s_i}
 +		$w_text tag remove misspelled 1.0 end
- 		error_popup [strcat "Spell Checker Failed" "\n\n" $err]
++		error_popup [strcat [mc "Spell Checker Failed"] "\n\n" $err]
 +		return
 +	}
 +	fconfigure $s_fd -block 0
 +
 +	if {[llength $s_pending] == 0} {
 +		_restart_timer $this
 +	}
 +}
 +
 +proc available_langs {} {
 +	set langs [list]
 +	catch {
 +		set fd [open [list | aspell dump dicts] r]
 +		while {[gets $fd line] >= 0} {
 +			if {$line eq {}} continue
 +			lappend langs $line
 +		}
 +		close $fd
 +	}
 +	return $langs
 +}
 +
 +}
diff --cc git-gui/po/de.po
index d7c38f9c7,000000000..e84e1c7e0
mode 100644,000000..100644
--- a/git-gui/po/de.po
+++ b/git-gui/po/de.po
@@@ -1,1952 -1,0 +1,1976 @@@
 +# Translation of git-gui to German.
 +# Copyright (C) 2007 Shawn Pearce, et al.
 +# This file is distributed under the same license as the git package.
 +# Christian Stimming <stimming@tuhh.de>, 2007
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: git-gui\n"
 +"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-02-02 10:14+0100\n"
- "PO-Revision-Date: 2008-02-02 10:18+0100\n"
++"POT-Creation-Date: 2008-02-16 21:24+0100\n"
++"PO-Revision-Date: 2008-02-16 21:52+0100\n"
 +"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 +"Language-Team: German\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
 +#: git-gui.sh:733
 +msgid "git-gui: fatal error"
 +msgstr "git-gui: Programmfehler"
 +
 +#: git-gui.sh:565
 +#, tcl-format
 +msgid "Invalid font specified in %s:"
 +msgstr "Ungültige Zeichensatz-Angabe in %s:"
 +
 +#: git-gui.sh:590
 +msgid "Main Font"
 +msgstr "Programmschriftart"
 +
 +#: git-gui.sh:591
 +msgid "Diff/Console Font"
 +msgstr "Vergleich-Schriftart"
 +
 +#: git-gui.sh:605
 +msgid "Cannot find git in PATH."
 +msgstr "Git kann im PATH nicht gefunden werden."
 +
 +#: git-gui.sh:632
 +msgid "Cannot parse Git version string:"
 +msgstr "Git Versionsangabe kann nicht erkannt werden:"
 +
 +#: git-gui.sh:650
 +#, tcl-format
 +msgid ""
 +"Git version cannot be determined.\n"
 +"\n"
 +"%s claims it is version '%s'.\n"
 +"\n"
 +"%s requires at least Git 1.5.0 or later.\n"
 +"\n"
 +"Assume '%s' is version 1.5.0?\n"
 +msgstr ""
 +"Die Version von Git kann nicht bestimmt werden.\n"
 +"\n"
 +"»%s« behauptet, es sei Version »%s«.\n"
 +"\n"
 +"%s benötigt mindestens Git 1.5.0 oder höher.\n"
 +"\n"
 +"Soll angenommen werden, »%s« sei Version 1.5.0?\n"
 +
 +#: git-gui.sh:888
 +msgid "Git directory not found:"
 +msgstr "Git-Verzeichnis nicht gefunden:"
 +
 +#: git-gui.sh:895
 +msgid "Cannot move to top of working directory:"
 +msgstr ""
 +"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
 +"werden:"
 +
 +#: git-gui.sh:902
 +msgid "Cannot use funny .git directory:"
 +msgstr "Unerwartete Struktur des .git Verzeichnis:"
 +
 +#: git-gui.sh:907
 +msgid "No working directory"
 +msgstr "Kein Arbeitsverzeichnis"
 +
 +#: git-gui.sh:1054
 +msgid "Refreshing file status..."
 +msgstr "Dateistatus aktualisieren..."
 +
 +#: git-gui.sh:1119
 +msgid "Scanning for modified files ..."
 +msgstr "Nach geänderten Dateien suchen..."
 +
 +#: git-gui.sh:1294 lib/browser.tcl:245
 +msgid "Ready."
 +msgstr "Bereit."
 +
 +#: git-gui.sh:1560
 +msgid "Unmodified"
 +msgstr "Unverändert"
 +
 +#: git-gui.sh:1562
 +msgid "Modified, not staged"
 +msgstr "Verändert, nicht bereitgestellt"
 +
 +#: git-gui.sh:1563 git-gui.sh:1568
 +msgid "Staged for commit"
 +msgstr "Bereitgestellt zum Eintragen"
 +
 +#: git-gui.sh:1564 git-gui.sh:1569
 +msgid "Portions staged for commit"
 +msgstr "Teilweise bereitgestellt zum Eintragen"
 +
 +#: git-gui.sh:1565 git-gui.sh:1570
 +msgid "Staged for commit, missing"
 +msgstr "Bereitgestellt zum Eintragen, fehlend"
 +
 +#: git-gui.sh:1567
 +msgid "Untracked, not staged"
 +msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
 +
 +#: git-gui.sh:1572
 +msgid "Missing"
 +msgstr "Fehlend"
 +
 +#: git-gui.sh:1573
 +msgid "Staged for removal"
 +msgstr "Bereitgestellt zum Löschen"
 +
 +#: git-gui.sh:1574
 +msgid "Staged for removal, still present"
 +msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
 +
 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
 +msgid "Requires merge resolution"
 +msgstr "Konfliktauflösung nötig"
 +
 +#: git-gui.sh:1614
 +msgid "Starting gitk... please wait..."
 +msgstr "Gitk wird gestartet... bitte warten."
 +
 +#: git-gui.sh:1623
 +#, tcl-format
 +msgid ""
 +"Unable to start gitk:\n"
 +"\n"
 +"%s does not exist"
 +msgstr ""
 +"Gitk kann nicht gestartet werden:\n"
 +"\n"
 +"%s existiert nicht"
 +
 +#: git-gui.sh:1823 lib/choose_repository.tcl:35
 +msgid "Repository"
 +msgstr "Projektarchiv"
 +
 +#: git-gui.sh:1824
 +msgid "Edit"
 +msgstr "Bearbeiten"
 +
 +#: git-gui.sh:1826 lib/choose_rev.tcl:560
 +msgid "Branch"
 +msgstr "Zweig"
 +
 +#: git-gui.sh:1829 lib/choose_rev.tcl:547
 +msgid "Commit@@noun"
 +msgstr "Version"
 +
 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 +msgid "Merge"
 +msgstr "Zusammenführen"
 +
 +#: git-gui.sh:1833 lib/choose_rev.tcl:556
 +msgid "Remote"
 +msgstr "Andere Archive"
 +
 +#: git-gui.sh:1842
 +msgid "Browse Current Branch's Files"
 +msgstr "Aktuellen Zweig durchblättern"
 +
 +#: git-gui.sh:1846
 +msgid "Browse Branch Files..."
 +msgstr "Einen Zweig durchblättern..."
 +
 +#: git-gui.sh:1851
 +msgid "Visualize Current Branch's History"
 +msgstr "Aktuellen Zweig darstellen"
 +
 +#: git-gui.sh:1855
 +msgid "Visualize All Branch History"
 +msgstr "Alle Zweige darstellen"
 +
 +#: git-gui.sh:1862
 +#, tcl-format
 +msgid "Browse %s's Files"
 +msgstr "Zweig »%s« durchblättern"
 +
 +#: git-gui.sh:1864
 +#, tcl-format
 +msgid "Visualize %s's History"
 +msgstr "Historie von »%s« darstellen"
 +
 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
 +msgid "Database Statistics"
 +msgstr "Datenbankstatistik"
 +
 +#: git-gui.sh:1872 lib/database.tcl:34
 +msgid "Compress Database"
 +msgstr "Datenbank komprimieren"
 +
 +#: git-gui.sh:1875
 +msgid "Verify Database"
 +msgstr "Datenbank überprüfen"
 +
 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 +msgid "Create Desktop Icon"
 +msgstr "Desktop-Icon erstellen"
 +
 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
 +msgid "Quit"
 +msgstr "Beenden"
 +
 +#: git-gui.sh:1902
 +msgid "Undo"
 +msgstr "Rückgängig"
 +
 +#: git-gui.sh:1905
 +msgid "Redo"
 +msgstr "Wiederholen"
 +
 +#: git-gui.sh:1909 git-gui.sh:2403
 +msgid "Cut"
 +msgstr "Ausschneiden"
 +
 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
 +#: lib/console.tcl:67
 +msgid "Copy"
 +msgstr "Kopieren"
 +
 +#: git-gui.sh:1915 git-gui.sh:2409
 +msgid "Paste"
 +msgstr "Einfügen"
 +
 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
 +#: lib/remote_branch_delete.tcl:38
 +msgid "Delete"
 +msgstr "Löschen"
 +
 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
 +msgid "Select All"
 +msgstr "Alle auswählen"
 +
 +#: git-gui.sh:1931
 +msgid "Create..."
 +msgstr "Erstellen..."
 +
 +#: git-gui.sh:1937
 +msgid "Checkout..."
 +msgstr "Umstellen..."
 +
 +#: git-gui.sh:1943
 +msgid "Rename..."
 +msgstr "Umbenennen..."
 +
 +#: git-gui.sh:1948 git-gui.sh:2048
 +msgid "Delete..."
 +msgstr "Löschen..."
 +
 +#: git-gui.sh:1953
 +msgid "Reset..."
 +msgstr "Zurücksetzen..."
 +
 +#: git-gui.sh:1965 git-gui.sh:2350
 +msgid "New Commit"
 +msgstr "Neue Version"
 +
 +#: git-gui.sh:1973 git-gui.sh:2357
 +msgid "Amend Last Commit"
 +msgstr "Letzte nachbessern"
 +
 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
 +msgid "Rescan"
 +msgstr "Neu laden"
 +
 +#: git-gui.sh:1988
 +msgid "Stage To Commit"
 +msgstr "Zum Eintragen bereitstellen"
 +
 +#: git-gui.sh:1994
 +msgid "Stage Changed Files To Commit"
 +msgstr "Geänderte Dateien bereitstellen"
 +
 +#: git-gui.sh:2000
 +msgid "Unstage From Commit"
 +msgstr "Aus der Bereitstellung herausnehmen"
 +
 +#: git-gui.sh:2005 lib/index.tcl:393
 +msgid "Revert Changes"
 +msgstr "Änderungen verwerfen"
 +
 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
 +msgid "Sign Off"
 +msgstr "Abzeichnen"
 +
 +#: git-gui.sh:2016 git-gui.sh:2333
 +msgid "Commit@@verb"
 +msgstr "Eintragen"
 +
 +#: git-gui.sh:2027
 +msgid "Local Merge..."
 +msgstr "Lokales Zusammenführen..."
 +
 +#: git-gui.sh:2032
 +msgid "Abort Merge..."
 +msgstr "Zusammenführen abbrechen..."
 +
 +#: git-gui.sh:2044
 +msgid "Push..."
 +msgstr "Versenden..."
 +
 +#: git-gui.sh:2055 lib/choose_repository.tcl:40
 +msgid "Apple"
 +msgstr "Apple"
 +
 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
 +#, tcl-format
 +msgid "About %s"
 +msgstr "Über %s"
 +
 +#: git-gui.sh:2062
 +msgid "Preferences..."
 +msgstr "Einstellungen..."
 +
 +#: git-gui.sh:2070 git-gui.sh:2595
 +msgid "Options..."
 +msgstr "Optionen..."
 +
 +#: git-gui.sh:2076 lib/choose_repository.tcl:46
 +msgid "Help"
 +msgstr "Hilfe"
 +
 +#: git-gui.sh:2117
 +msgid "Online Documentation"
 +msgstr "Online-Dokumentation"
 +
 +#: git-gui.sh:2201
 +#, tcl-format
 +msgid "fatal: cannot stat path %s: No such file or directory"
 +msgstr ""
 +"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
 +"nicht gefunden"
 +
 +#: git-gui.sh:2234
 +msgid "Current Branch:"
 +msgstr "Aktueller Zweig:"
 +
 +#: git-gui.sh:2255
 +msgid "Staged Changes (Will Commit)"
 +msgstr "Bereitstellung (zum Eintragen)"
 +
 +#: git-gui.sh:2274
 +msgid "Unstaged Changes"
 +msgstr "Nicht bereitgestellte Änderungen"
 +
 +#: git-gui.sh:2323
 +msgid "Stage Changed"
 +msgstr "Alles bereitstellen"
 +
 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
 +msgid "Push"
 +msgstr "Versenden"
 +
 +#: git-gui.sh:2369
 +msgid "Initial Commit Message:"
 +msgstr "Erste Versionsbeschreibung:"
 +
 +#: git-gui.sh:2370
 +msgid "Amended Commit Message:"
 +msgstr "Nachgebesserte Beschreibung:"
 +
 +#: git-gui.sh:2371
 +msgid "Amended Initial Commit Message:"
 +msgstr "Nachgebesserte erste Beschreibung:"
 +
 +#: git-gui.sh:2372
 +msgid "Amended Merge Commit Message:"
 +msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
 +
 +#: git-gui.sh:2373
 +msgid "Merge Commit Message:"
 +msgstr "Zusammenführungs-Beschreibung:"
 +
 +#: git-gui.sh:2374
 +msgid "Commit Message:"
 +msgstr "Versionsbeschreibung:"
 +
 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
 +msgid "Copy All"
 +msgstr "Alle kopieren"
 +
 +#: git-gui.sh:2443 lib/blame.tcl:104
 +msgid "File:"
 +msgstr "Datei:"
 +
 +#: git-gui.sh:2573
 +msgid "Apply/Reverse Hunk"
 +msgstr "Kontext anwenden/umkehren"
 +
 +#: git-gui.sh:2579
 +msgid "Show Less Context"
 +msgstr "Weniger Zeilen anzeigen"
 +
 +#: git-gui.sh:2586
 +msgid "Show More Context"
 +msgstr "Mehr Zeilen anzeigen"
 +
 +#: git-gui.sh:2594
 +msgid "Refresh"
 +msgstr "Aktualisieren"
 +
 +#: git-gui.sh:2615
 +msgid "Decrease Font Size"
 +msgstr "Schriftgröße verkleinern"
 +
 +#: git-gui.sh:2619
 +msgid "Increase Font Size"
 +msgstr "Schriftgröße vergrößern"
 +
 +#: git-gui.sh:2630
 +msgid "Unstage Hunk From Commit"
 +msgstr "Kontext aus Bereitstellung herausnehmen"
 +
 +#: git-gui.sh:2604
 +msgid "Stage Hunk For Commit"
 +msgstr "Kontext zur Bereitstellung hinzufügen"
 +
 +#: git-gui.sh:2623
 +msgid "Initializing..."
 +msgstr "Initialisieren..."
 +
 +#: git-gui.sh:2718
 +#, tcl-format
 +msgid ""
 +"Possible environment issues exist.\n"
 +"\n"
 +"The following environment variables are probably\n"
 +"going to be ignored by any Git subprocess run\n"
 +"by %s:\n"
 +"\n"
 +msgstr ""
 +"Möglicherweise gibt es Probleme mit manchen Umgebungsvariablen.\n"
 +"\n"
 +"Die folgenden Umgebungsvariablen können vermutlich nicht \n"
 +"von %s an Git weitergegeben werden:\n"
 +"\n"
 +
 +#: git-gui.sh:2748
 +msgid ""
 +"\n"
 +"This is due to a known issue with the\n"
 +"Tcl binary distributed by Cygwin."
 +msgstr ""
 +"\n"
 +"Dies ist ein bekanntes Problem der Tcl-Version, die\n"
 +"in Cygwin mitgeliefert wird."
 +
 +#: git-gui.sh:2753
 +#, tcl-format
 +msgid ""
 +"\n"
 +"\n"
 +"A good replacement for %s\n"
 +"is placing values for the user.name and\n"
 +"user.email settings into your personal\n"
 +"~/.gitconfig file.\n"
 +msgstr ""
 +"\n"
 +"\n"
 +"Um den Namen »%s« zu ändern, sollten Sie die \n"
 +"gewünschten Werte für die Einstellung user.name und \n"
 +"user.email in Ihre Datei ~/.gitconfig einfügen.\n"
 +
 +#: lib/about.tcl:25
 +msgid "git-gui - a graphical user interface for Git."
 +msgstr "git-gui - eine grafische Oberfläche für Git."
 +
 +#: lib/blame.tcl:77
 +msgid "File Viewer"
 +msgstr "Datei-Browser"
 +
 +#: lib/blame.tcl:81
 +msgid "Commit:"
 +msgstr "Version:"
 +
 +#: lib/blame.tcl:249
 +msgid "Copy Commit"
 +msgstr "Version kopieren"
 +
 +#: lib/blame.tcl:369
 +#, tcl-format
 +msgid "Reading %s..."
 +msgstr "%s lesen..."
 +
 +#: lib/blame.tcl:473
 +msgid "Loading copy/move tracking annotations..."
 +msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
 +
 +#: lib/blame.tcl:493
 +msgid "lines annotated"
 +msgstr "Zeilen annotiert"
 +
 +#: lib/blame.tcl:674
 +msgid "Loading original location annotations..."
 +msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
 +
 +#: lib/blame.tcl:677
 +msgid "Annotation complete."
 +msgstr "Annotierung vollständig."
 +
 +#: lib/blame.tcl:731
 +msgid "Loading annotation..."
 +msgstr "Annotierung laden..."
 +
 +#: lib/blame.tcl:787
 +msgid "Author:"
 +msgstr "Autor:"
 +
 +#: lib/blame.tcl:791
 +msgid "Committer:"
 +msgstr "Eintragender:"
 +
 +#: lib/blame.tcl:796
 +msgid "Original File:"
 +msgstr "Ursprüngliche Datei:"
 +
 +#: lib/blame.tcl:910
 +msgid "Originally By:"
 +msgstr "Ursprünglich von:"
 +
 +#: lib/blame.tcl:916
 +msgid "In File:"
 +msgstr "In Datei:"
 +
 +#: lib/blame.tcl:921
 +msgid "Copied Or Moved Here By:"
 +msgstr "Kopiert oder verschoben durch:"
 +
 +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 +msgid "Checkout Branch"
 +msgstr "Auf Zweig umstellen"
 +
 +#: lib/branch_checkout.tcl:23
 +msgid "Checkout"
 +msgstr "Umstellen"
 +
 +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 +msgid "Cancel"
 +msgstr "Abbrechen"
 +
 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 +msgid "Revision"
 +msgstr "Version"
 +
 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
 +msgid "Options"
 +msgstr "Optionen"
 +
 +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
 +msgid "Fetch Tracking Branch"
 +msgstr "Übernahmezweig anfordern"
 +
 +#: lib/branch_checkout.tcl:44
 +msgid "Detach From Local Branch"
 +msgstr "Verbindung zu lokalem Zweig lösen"
 +
 +#: lib/branch_create.tcl:22
 +msgid "Create Branch"
 +msgstr "Zweig erstellen"
 +
 +#: lib/branch_create.tcl:27
 +msgid "Create New Branch"
 +msgstr "Neuen Zweig erstellen"
 +
 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
 +msgid "Create"
 +msgstr "Erstellen"
 +
 +#: lib/branch_create.tcl:40
 +msgid "Branch Name"
 +msgstr "Zweigname"
 +
 +#: lib/branch_create.tcl:43
 +msgid "Name:"
 +msgstr "Name:"
 +
 +#: lib/branch_create.tcl:58
 +msgid "Match Tracking Branch Name"
 +msgstr "Passend zu Übernahmezweig-Name"
 +
 +#: lib/branch_create.tcl:66
 +msgid "Starting Revision"
 +msgstr "Anfangsversion"
 +
 +#: lib/branch_create.tcl:72
 +msgid "Update Existing Branch:"
 +msgstr "Existierenden Zweig aktualisieren:"
 +
 +#: lib/branch_create.tcl:75
 +msgid "No"
 +msgstr "Nein"
 +
 +#: lib/branch_create.tcl:80
 +msgid "Fast Forward Only"
 +msgstr "Nur Schnellzusammenführung"
 +
 +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 +msgid "Reset"
 +msgstr "Zurücksetzen"
 +
 +#: lib/branch_create.tcl:97
 +msgid "Checkout After Creation"
 +msgstr "Arbeitskopie umstellen nach Erstellen"
 +
 +#: lib/branch_create.tcl:131
 +msgid "Please select a tracking branch."
 +msgstr "Bitte wählen Sie einen Übernahmezweig."
 +
 +#: lib/branch_create.tcl:140
 +#, tcl-format
 +msgid "Tracking branch %s is not a branch in the remote repository."
 +msgstr "Übernahmezweig »%s« ist kein Zweig im anderen Projektarchiv."
 +
 +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 +msgid "Please supply a branch name."
 +msgstr "Bitte geben Sie einen Zweignamen an."
 +
 +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
 +#, tcl-format
 +msgid "'%s' is not an acceptable branch name."
 +msgstr "»%s« ist kein zulässiger Zweigname."
 +
 +#: lib/branch_delete.tcl:15
 +msgid "Delete Branch"
 +msgstr "Zweig löschen"
 +
 +#: lib/branch_delete.tcl:20
 +msgid "Delete Local Branch"
 +msgstr "Lokalen Zweig löschen"
 +
 +#: lib/branch_delete.tcl:37
 +msgid "Local Branches"
 +msgstr "Lokale Zweige"
 +
 +#: lib/branch_delete.tcl:52
 +msgid "Delete Only If Merged Into"
- msgstr "Nur löschen, wenn darin zusammengeführt"
++msgstr "Nur löschen, wenn zusammengeführt nach"
 +
 +#: lib/branch_delete.tcl:54
 +msgid "Always (Do not perform merge test.)"
 +msgstr "Immer (ohne Zusammenführungstest)"
 +
 +#: lib/branch_delete.tcl:103
 +#, tcl-format
 +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 ""
 +"Failed to delete branches:\n"
 +"%s"
 +msgstr ""
 +"Fehler beim Löschen der Zweige:\n"
 +"%s"
 +
 +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
 +msgid "Rename Branch"
 +msgstr "Zweig umbenennen"
 +
 +#: lib/branch_rename.tcl:26
 +msgid "Rename"
 +msgstr "Umbenennen"
 +
 +#: lib/branch_rename.tcl:36
 +msgid "Branch:"
 +msgstr "Zweig:"
 +
 +#: lib/branch_rename.tcl:39
 +msgid "New Name:"
 +msgstr "Neuer Name:"
 +
 +#: lib/branch_rename.tcl:75
 +msgid "Please select a branch to rename."
 +msgstr "Bitte wählen Sie einen Zweig zum umbenennen."
 +
 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
 +#, tcl-format
 +msgid "Branch '%s' already exists."
 +msgstr "Zweig »%s« existiert bereits."
 +
 +#: lib/branch_rename.tcl:117
 +#, tcl-format
 +msgid "Failed to rename '%s'."
 +msgstr "Fehler beim Umbenennen von »%s«."
 +
 +#: lib/browser.tcl:17
 +msgid "Starting..."
 +msgstr "Starten..."
 +
 +#: lib/browser.tcl:26
 +msgid "File Browser"
 +msgstr "Datei-Browser"
 +
 +#: lib/browser.tcl:125 lib/browser.tcl:142
 +#, tcl-format
 +msgid "Loading %s..."
 +msgstr "%s laden..."
 +
 +#: lib/browser.tcl:186
 +msgid "[Up To Parent]"
 +msgstr "[Nach oben]"
 +
 +#: lib/browser.tcl:266 lib/browser.tcl:272
 +msgid "Browse Branch Files"
 +msgstr "Dateien des Zweigs durchblättern"
 +
 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391
 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
 +#: lib/choose_repository.tcl:989
 +msgid "Browse"
 +msgstr "Blättern"
 +
 +#: lib/checkout_op.tcl:79
 +#, tcl-format
 +msgid "Fetching %s from %s"
 +msgstr "Änderungen »%s« von »%s« anfordern"
 +
 +#: lib/checkout_op.tcl:127
 +#, tcl-format
 +msgid "fatal: Cannot resolve %s"
 +msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
 +
 +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 +msgid "Close"
 +msgstr "Schließen"
 +
 +#: lib/checkout_op.tcl:169
 +#, tcl-format
 +msgid "Branch '%s' does not exist."
 +msgstr "Zweig »%s« existiert nicht."
 +
 +#: lib/checkout_op.tcl:206
 +#, tcl-format
 +msgid ""
 +"Branch '%s' already exists.\n"
 +"\n"
 +"It cannot fast-forward to %s.\n"
 +"A merge is required."
 +msgstr ""
 +"Zweig »%s« existiert bereits.\n"
 +"\n"
 +"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres "
 +"Zusammenführen ist notwendig."
 +
 +#: lib/checkout_op.tcl:220
 +#, tcl-format
 +msgid "Merge strategy '%s' not supported."
 +msgstr "Zusammenführungsmethode »%s« nicht unterstützt."
 +
 +#: lib/checkout_op.tcl:239
 +#, tcl-format
 +msgid "Failed to update '%s'."
 +msgstr "Aktualisieren von »%s« fehlgeschlagen."
 +
 +#: lib/checkout_op.tcl:251
 +msgid "Staging area (index) is already locked."
 +msgstr "Bereitstellung (»index«) ist zur Bearbeitung gesperrt (»locked«)."
 +
 +#: lib/checkout_op.tcl:266
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before the current branch can be changed.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 +"\n"
 +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
 +"geändert.  Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n"
 +"\n"
 +"Es wird gleich neu geladen.\n"
 +
 +#: lib/checkout_op.tcl:322
 +#, tcl-format
 +msgid "Updating working directory to '%s'..."
 +msgstr "Arbeitskopie umstellen auf »%s«..."
 +
 +#: lib/checkout_op.tcl:323
 +msgid "files checked out"
 +msgstr "Dateien aktualisiert"
 +
 +#: lib/checkout_op.tcl:353
 +#, tcl-format
 +msgid "Aborted checkout of '%s' (file level merging is required)."
 +msgstr ""
 +"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist "
 +"notwendig)."
 +
 +#: lib/checkout_op.tcl:354
 +msgid "File level merge required."
 +msgstr "Zusammenführen der Dateien ist notwendig."
 +
 +#: lib/checkout_op.tcl:358
 +#, tcl-format
 +msgid "Staying on branch '%s'."
 +msgstr "Es wird auf Zweig »%s« verblieben."
 +
 +#: lib/checkout_op.tcl:429
 +msgid ""
 +"You are no longer on a local branch.\n"
 +"\n"
 +"If you wanted to be on a branch, create one now starting from 'This Detached "
 +"Checkout'."
 +msgstr ""
 +"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
 +"\n"
 +"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
 +"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
 +
 +#: lib/checkout_op.tcl:446
 +#, tcl-format
 +msgid "Checked out '%s'."
 +msgstr "Umgestellt auf »%s«."
 +
 +#: lib/checkout_op.tcl:478
 +#, tcl-format
 +msgid "Resetting '%s' to '%s' will lose the following commits:"
 +msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:"
 +
 +#: lib/checkout_op.tcl:500
 +msgid "Recovering lost commits may not be easy."
 +msgstr ""
 +"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt "
 +"werden."
 +
 +#: lib/checkout_op.tcl:505
 +#, tcl-format
 +msgid "Reset '%s'?"
 +msgstr "»%s« zurücksetzen?"
 +
 +#: lib/checkout_op.tcl:510 lib/merge.tcl:164
 +msgid "Visualize"
 +msgstr "Darstellen"
 +
 +#: lib/checkout_op.tcl:578
 +#, tcl-format
 +msgid ""
 +"Failed to set current branch.\n"
 +"\n"
 +"This working directory is only partially switched.  We successfully updated "
 +"your files, but failed to update an internal Git file.\n"
 +"\n"
 +"This should not have occurred.  %s will now close and give up."
 +msgstr ""
 +"Lokaler Zweig kann nicht gesetzt werden.\n"
 +"\n"
 +"Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt "
 +"aktualisiert, aber einige interne Git-Dateien konnten nicht geändert "
 +"werden.\n"
 +"\n"
 +"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
 +
 +#: lib/choose_font.tcl:39
 +msgid "Select"
 +msgstr "Auswählen"
 +
 +#: lib/choose_font.tcl:53
 +msgid "Font Family"
 +msgstr "Schriftfamilie"
 +
 +#: lib/choose_font.tcl:73
 +msgid "Font Size"
 +msgstr "Schriftgröße"
 +
 +#: lib/choose_font.tcl:90
 +msgid "Font Example"
 +msgstr "Schriftbeispiel"
 +
 +#: lib/choose_font.tcl:101
 +msgid ""
 +"This is example text.\n"
 +"If you like this text, it can be your font."
 +msgstr ""
 +"Dies ist ein Beispieltext.\n"
 +"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
 +
 +#: lib/choose_repository.tcl:27
 +msgid "Git Gui"
 +msgstr "Git Gui"
 +
 +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
 +msgid "Create New Repository"
 +msgstr "Neues Projektarchiv"
 +
 +#: lib/choose_repository.tcl:86
 +msgid "New..."
 +msgstr "Neu..."
 +
 +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
 +msgid "Clone Existing Repository"
 +msgstr "Projektarchiv klonen"
 +
 +#: lib/choose_repository.tcl:99
 +msgid "Clone..."
 +msgstr "Klonen..."
 +
 +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
 +msgid "Open Existing Repository"
 +msgstr "Projektarchiv öffnen"
 +
 +#: lib/choose_repository.tcl:112
 +msgid "Open..."
 +msgstr "Öffnen..."
 +
 +#: lib/choose_repository.tcl:125
 +msgid "Recent Repositories"
 +msgstr "Zuletzt benutzte Projektarchive"
 +
 +#: lib/choose_repository.tcl:131
 +msgid "Open Recent Repository:"
 +msgstr "Zuletzt benutztes Projektarchiv öffnen:"
 +
 +#: lib/choose_repository.tcl:294
 +#, tcl-format
 +msgid "Location %s already exists."
 +msgstr "Projektarchiv »%s« existiert bereits."
 +
 +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
 +#: lib/choose_repository.tcl:314
 +#, tcl-format
 +msgid "Failed to create repository %s:"
 +msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
 +
 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
 +msgid "Directory:"
 +msgstr "Verzeichnis:"
 +
 +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
 +#: lib/choose_repository.tcl:1013
 +msgid "Git Repository"
 +msgstr "Git Projektarchiv"
 +
 +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
 +#, tcl-format
 +msgid "Directory %s already exists."
 +msgstr "Verzeichnis »%s« existiert bereits."
 +
 +#: lib/choose_repository.tcl:442
 +#, tcl-format
 +msgid "File %s already exists."
 +msgstr "Datei »%s« existiert bereits."
 +
 +#: lib/choose_repository.tcl:463
 +msgid "Clone"
 +msgstr "Klonen"
 +
 +#: lib/choose_repository.tcl:476
 +msgid "URL:"
 +msgstr "URL:"
 +
 +#: lib/choose_repository.tcl:496
 +msgid "Clone Type:"
 +msgstr "Art des Klonens:"
 +
 +#: lib/choose_repository.tcl:502
 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 +msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
 +
 +#: lib/choose_repository.tcl:508
 +msgid "Full Copy (Slower, Redundant Backup)"
 +msgstr "Alles kopieren (langsamer, volle Redundanz)"
 +
 +#: lib/choose_repository.tcl:514
 +msgid "Shared (Fastest, Not Recommended, No Backup)"
 +msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
 +
 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
 +#, tcl-format
 +msgid "Not a Git repository: %s"
 +msgstr "Kein Git-Projektarchiv in »%s« gefunden."
 +
 +#: lib/choose_repository.tcl:586
 +msgid "Standard only available for local repository."
 +msgstr "Standard ist nur für lokale Projektarchive verfügbar."
 +
 +#: lib/choose_repository.tcl:590
 +msgid "Shared only available for local repository."
 +msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
 +
 +#: lib/choose_repository.tcl:617
 +msgid "Failed to configure origin"
 +msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
 +
 +#: lib/choose_repository.tcl:629
 +msgid "Counting objects"
 +msgstr "Objekte werden gezählt"
 +
 +#: lib/choose_repository.tcl:630
 +msgid "buckets"
 +msgstr "Buckets"
 +
 +#: lib/choose_repository.tcl:654
 +#, tcl-format
 +msgid "Unable to copy objects/info/alternates: %s"
 +msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
 +
 +#: lib/choose_repository.tcl:690
 +#, tcl-format
 +msgid "Nothing to clone from %s."
 +msgstr "Von »%s« konnte nichts geklont werden."
 +
 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
 +#: lib/choose_repository.tcl:918
 +msgid "The 'master' branch has not been initialized."
 +msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
 +
 +#: lib/choose_repository.tcl:705
 +msgid "Hardlinks are unavailable.  Falling back to copying."
 +msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
 +
 +#: lib/choose_repository.tcl:717
 +#, tcl-format
 +msgid "Cloning from %s"
 +msgstr "Kopieren von »%s«"
 +
 +#: lib/choose_repository.tcl:748
 +msgid "Copying objects"
 +msgstr "Objektdatenbank kopieren"
 +
 +#: lib/choose_repository.tcl:749
 +msgid "KiB"
 +msgstr "KB"
 +
 +#: lib/choose_repository.tcl:773
 +#, tcl-format
 +msgid "Unable to copy object: %s"
 +msgstr "Objekt kann nicht kopiert werden: %s"
 +
 +#: lib/choose_repository.tcl:783
 +msgid "Linking objects"
 +msgstr "Objekte verlinken"
 +
 +#: lib/choose_repository.tcl:784
 +msgid "objects"
 +msgstr "Objekte"
 +
 +#: lib/choose_repository.tcl:792
 +#, tcl-format
 +msgid "Unable to hardlink object: %s"
 +msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
 +
 +#: lib/choose_repository.tcl:847
 +msgid "Cannot fetch branches and objects.  See console output for details."
 +msgstr ""
 +"Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die "
 +"Ausgaben auf der Konsole für weitere Angaben."
 +
 +#: lib/choose_repository.tcl:858
 +msgid "Cannot fetch tags.  See console output for details."
 +msgstr ""
 +"Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die "
 +"Ausgaben auf der Konsole für weitere Angaben."
 +
 +#: lib/choose_repository.tcl:882
 +msgid "Cannot determine HEAD.  See console output for details."
 +msgstr ""
 +"Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
 +"Ausgaben auf der Konsole für weitere Angaben."
 +
 +#: lib/choose_repository.tcl:891
 +#, tcl-format
 +msgid "Unable to cleanup %s"
 +msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
 +
 +#: lib/choose_repository.tcl:897
 +msgid "Clone failed."
 +msgstr "Klonen fehlgeschlagen."
 +
 +#: lib/choose_repository.tcl:904
 +msgid "No default branch obtained."
 +msgstr "Kein voreingestellter Zweig gefunden."
 +
 +#: lib/choose_repository.tcl:915
 +#, tcl-format
 +msgid "Cannot resolve %s as a commit."
 +msgstr "»%s« wurde nicht als Version gefunden."
 +
 +#: lib/choose_repository.tcl:927
 +msgid "Creating working directory"
 +msgstr "Arbeitskopie erstellen"
 +
 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
 +#: lib/index.tcl:193
 +msgid "files"
 +msgstr "Dateien"
 +
 +#: lib/choose_repository.tcl:957
 +msgid "Initial file checkout failed."
 +msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
 +
 +#: lib/choose_repository.tcl:973
 +msgid "Open"
 +msgstr "Öffnen"
 +
 +#: lib/choose_repository.tcl:983
 +msgid "Repository:"
 +msgstr "Projektarchiv:"
 +
 +#: lib/choose_repository.tcl:1033
 +#, tcl-format
 +msgid "Failed to open repository %s:"
 +msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
 +
 +#: lib/choose_rev.tcl:53
 +msgid "This Detached Checkout"
 +msgstr "Abgetrennte Arbeitskopie-Version"
 +
 +#: lib/choose_rev.tcl:60
 +msgid "Revision Expression:"
 +msgstr "Version Regexp-Ausdruck:"
 +
 +#: lib/choose_rev.tcl:74
 +msgid "Local Branch"
 +msgstr "Lokaler Zweig"
 +
 +#: lib/choose_rev.tcl:79
 +msgid "Tracking Branch"
 +msgstr "Übernahmezweig"
 +
 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 +msgid "Tag"
 +msgstr "Markierung"
 +
 +#: lib/choose_rev.tcl:317
 +#, tcl-format
 +msgid "Invalid revision: %s"
 +msgstr "Ungültige Version: %s"
 +
 +#: lib/choose_rev.tcl:338
 +msgid "No revision selected."
 +msgstr "Keine Version ausgewählt."
 +
 +#: lib/choose_rev.tcl:346
 +msgid "Revision expression is empty."
 +msgstr "Versions-Ausdruck ist leer."
 +
 +#: lib/choose_rev.tcl:530
 +msgid "Updated"
 +msgstr "Aktualisiert"
 +
 +#: lib/choose_rev.tcl:558
 +msgid "URL"
 +msgstr "URL"
 +
 +#: lib/commit.tcl:9
 +msgid ""
 +"There is nothing to amend.\n"
 +"\n"
 +"You are about to create the initial commit.  There is no commit before this "
 +"to amend.\n"
 +msgstr ""
 +"Keine Version zur Nachbesserung vorhanden.\n"
 +"\n"
 +"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende "
 +"Version, die Sie nachbessern könnten.\n"
 +
 +#: lib/commit.tcl:18
 +msgid ""
 +"Cannot amend while merging.\n"
 +"\n"
 +"You are currently in the middle of a merge that has not been fully "
 +"completed.  You cannot amend the prior commit unless you first abort the "
 +"current merge activity.\n"
 +msgstr ""
 +"Nachbesserung währen Zusammenführung nicht möglich.\n"
 +"\n"
 +"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht "
 +"beendet. Sie können keine vorige Übertragung nachbessern, solange eine "
 +"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung "
 +"beenden oder abbrechen.\n"
 +
 +#: lib/commit.tcl:49
 +msgid "Error loading commit data for amend:"
 +msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:"
 +
 +#: lib/commit.tcl:76
 +msgid "Unable to obtain your identity:"
 +msgstr "Benutzername konnte nicht bestimmt werden:"
 +
 +#: lib/commit.tcl:81
 +msgid "Invalid GIT_COMMITTER_IDENT:"
 +msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:"
 +
 +#: lib/commit.tcl:133
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before another commit can be created.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 +"\n"
 +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
 +"geändert.  Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
 +"\n"
 +"Es wird gleich neu geladen.\n"
 +
 +#: lib/commit.tcl:154
 +#, tcl-format
 +msgid ""
 +"Unmerged files cannot be committed.\n"
 +"\n"
 +"File %s has merge conflicts.  You must resolve them and stage the file "
 +"before committing.\n"
 +msgstr ""
 +"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
 +"\n"
 +"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
 +"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
 +
 +#: lib/commit.tcl:162
 +#, tcl-format
 +msgid ""
 +"Unknown file state %s detected.\n"
 +"\n"
 +"File %s cannot be committed by this program.\n"
 +msgstr ""
 +"Unbekannter Dateizustand »%s«.\n"
 +"\n"
 +"Datei »%s« kann nicht eingetragen werden.\n"
 +
 +#: lib/commit.tcl:170
 +msgid ""
 +"No changes to commit.\n"
 +"\n"
 +"You must stage at least 1 file before you can commit.\n"
 +msgstr ""
 +"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
 +"\n"
 +"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
 +
 +#: lib/commit.tcl:183
 +msgid ""
 +"Please supply a commit message.\n"
 +"\n"
 +"A good commit message has the following format:\n"
 +"\n"
 +"- First line: Describe in one sentence what you did.\n"
 +"- Second line: Blank\n"
 +"- Remaining lines: Describe why this change is good.\n"
 +msgstr ""
 +"Bitte geben Sie eine Versionsbeschreibung ein.\n"
 +"\n"
 +"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n"
 +"\n"
 +"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n"
 +"\n"
 +"- Zweite Zeile: Leerzeile\n"
 +"\n"
 +"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
 +
 +#: lib/commit.tcl:207
 +#, tcl-format
 +msgid "warning: Tcl does not support encoding '%s'."
 +msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
 +
 +#: lib/commit.tcl:221
 +msgid "Calling pre-commit hook..."
- msgstr ""
++msgstr "Aufrufen der Vor-Eintragen-Kontrolle..."
 +
 +#: lib/commit.tcl:236
 +msgid "Commit declined by pre-commit hook."
- msgstr ""
++msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
 +
 +#: lib/commit.tcl:259
 +msgid "Calling commit-msg hook..."
- msgstr ""
++msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..."
 +
 +#: lib/commit.tcl:274
 +msgid "Commit declined by commit-msg hook."
- msgstr ""
++msgstr "Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message hook«)."
 +
 +#: lib/commit.tcl:287
 +msgid "Committing changes..."
 +msgstr "Änderungen eintragen..."
 +
 +#: lib/commit.tcl:303
 +msgid "write-tree failed:"
 +msgstr "write-tree fehlgeschlagen:"
 +
 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
 +msgid "Commit failed."
 +msgstr "Eintragen fehlgeschlagen."
 +
 +#: lib/commit.tcl:321
 +#, tcl-format
 +msgid "Commit %s appears to be corrupt"
 +msgstr "Version »%s« scheint beschädigt zu sein"
 +
 +#: lib/commit.tcl:279
 +msgid ""
 +"No changes to commit.\n"
 +"\n"
 +"No files were modified by this commit and it was not a merge commit.\n"
 +"\n"
 +"A rescan will be automatically started now.\n"
 +msgstr ""
 +"Keine Änderungen einzutragen.\n"
 +"\n"
 +"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
 +"zusammengeführt.\n"
 +"\n"
 +"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 +
 +#: lib/commit.tcl:286
 +msgid "No changes to commit."
 +msgstr "Keine Änderungen, die eingetragen werden können."
 +
 +#: lib/commit.tcl:347
 +msgid "commit-tree failed:"
 +msgstr "commit-tree fehlgeschlagen:"
 +
 +#: lib/commit.tcl:339
 +msgid "update-ref failed:"
 +msgstr "update-ref fehlgeschlagen:"
 +
 +#: lib/commit.tcl:430
 +#, tcl-format
 +msgid "Created commit %s: %s"
 +msgstr "Version %s übertragen: %s"
 +
 +#: lib/console.tcl:57
 +msgid "Working... please wait..."
 +msgstr "Verarbeitung. Bitte warten..."
 +
 +#: lib/console.tcl:183
 +msgid "Success"
 +msgstr "Erfolgreich"
 +
 +#: lib/console.tcl:196
 +msgid "Error: Command Failed"
 +msgstr "Fehler: Kommando fehlgeschlagen"
 +
 +#: lib/database.tcl:43
 +msgid "Number of loose objects"
 +msgstr "Anzahl unverknüpfter Objekte"
 +
 +#: lib/database.tcl:44
 +msgid "Disk space used by loose objects"
 +msgstr "Festplattenplatz von unverknüpften Objekten"
 +
 +#: lib/database.tcl:45
 +msgid "Number of packed objects"
 +msgstr "Anzahl komprimierter Objekte"
 +
 +#: lib/database.tcl:46
 +msgid "Number of packs"
 +msgstr "Anzahl Komprimierungseinheiten"
 +
 +#: lib/database.tcl:47
 +msgid "Disk space used by packed objects"
 +msgstr "Festplattenplatz von komprimierten Objekten"
 +
 +#: lib/database.tcl:48
 +msgid "Packed objects waiting for pruning"
- msgstr "Komprimierte Objekte, die zum Entfernen vorgesehen sind"
++msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind"
 +
 +#: lib/database.tcl:49
 +msgid "Garbage files"
 +msgstr "Dateien im Mülleimer"
 +
 +#: lib/database.tcl:72
 +msgid "Compressing the object database"
 +msgstr "Objektdatenbank komprimieren"
 +
 +#: lib/database.tcl:83
 +msgid "Verifying the object database with fsck-objects"
 +msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
 +
 +#: lib/database.tcl:108
 +#, tcl-format
 +msgid ""
 +"This repository currently has approximately %i loose objects.\n"
 +"\n"
 +"To maintain optimal performance it is strongly recommended that you compress "
 +"the database when more than %i loose objects exist.\n"
 +"\n"
 +"Compress the database now?"
 +msgstr ""
 +"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
 +"\n"
 +"Für eine optimale Performance wird empfohlen, die Datenbank des "
 +"Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte "
 +"vorliegen.\n"
 +"\n"
 +"Soll die Datenbank jetzt komprimiert werden?"
 +
 +#: lib/date.tcl:25
 +#, tcl-format
 +msgid "Invalid date from Git: %s"
 +msgstr "Ungültiges Datum von Git: %s"
 +
 +#: lib/diff.tcl:42
 +#, tcl-format
 +msgid ""
 +"No differences detected.\n"
 +"\n"
 +"%s has no changes.\n"
 +"\n"
 +"The modification date of this file was updated by another application, but "
 +"the content within the file was not changed.\n"
 +"\n"
 +"A rescan will be automatically started to find other files which may have "
 +"the same state."
 +msgstr ""
 +"Keine Änderungen feststellbar.\n"
 +"\n"
 +"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei "
 +"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
 +"unverändert.\n"
 +"\n"
 +"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
 +"Dateien zu prüfen."
 +
 +#: lib/diff.tcl:81
 +#, tcl-format
 +msgid "Loading diff of %s..."
 +msgstr "Vergleich von »%s« laden..."
 +
 +#: lib/diff.tcl:114 lib/diff.tcl:184
 +#, tcl-format
 +msgid "Unable to display %s"
 +msgstr "Datei »%s« kann nicht angezeigt werden"
 +
 +#: lib/diff.tcl:115
 +msgid "Error loading file:"
 +msgstr "Fehler beim Laden der Datei:"
 +
 +#: lib/diff.tcl:122
 +msgid "Git Repository (subproject)"
 +msgstr "Git-Projektarchiv (Unterprojekt)"
 +
 +#: lib/diff.tcl:134
 +msgid "* Binary file (not showing content)."
 +msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
 +
 +#: lib/diff.tcl:185
 +msgid "Error loading diff:"
 +msgstr "Fehler beim Laden des Vergleichs:"
 +
 +#: lib/diff.tcl:302
 +msgid "Failed to unstage selected hunk."
 +msgstr ""
 +"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
 +
 +#: lib/diff.tcl:309
 +msgid "Failed to stage selected hunk."
 +msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
 +
 +#: lib/error.tcl:12 lib/error.tcl:102
 +msgid "error"
 +msgstr "Fehler"
 +
 +#: lib/error.tcl:28
 +msgid "warning"
 +msgstr "Warnung"
 +
 +#: lib/error.tcl:81
 +msgid "You must correct the above errors before committing."
 +msgstr ""
 +"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
 +
 +#: lib/index.tcl:6
 +msgid "Unable to unlock the index."
 +msgstr "Bereitstellung kann nicht wieder freigegeben werden."
 +
 +#: lib/index.tcl:15
 +msgid "Index Error"
 +msgstr "Fehler in Bereitstellung"
 +
 +#: lib/index.tcl:21
 +msgid ""
 +"Updating the Git index failed.  A rescan will be automatically started to "
 +"resynchronize git-gui."
 +msgstr ""
 +"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
 +"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
 +"synchronisieren."
 +
 +#: lib/index.tcl:27
 +msgid "Continue"
 +msgstr "Fortsetzen"
 +
 +#: lib/index.tcl:31
 +msgid "Unlock Index"
 +msgstr "Bereitstellung freigeben"
 +
 +#: lib/index.tcl:282
 +#, tcl-format
 +msgid "Unstaging %s from commit"
 +msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
 +
 +#: lib/index.tcl:313
 +msgid "Ready to commit."
 +msgstr "Bereit zum Eintragen."
 +
 +#: lib/index.tcl:326
 +#, tcl-format
 +msgid "Adding %s"
 +msgstr "»%s« hinzufügen..."
 +
 +#: lib/index.tcl:381
 +#, tcl-format
 +msgid "Revert changes in file %s?"
 +msgstr "Änderungen in Datei »%s« verwerfen?"
 +
 +#: lib/index.tcl:383
 +#, tcl-format
 +msgid "Revert changes in these %i files?"
 +msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
 +
 +#: lib/index.tcl:389
 +msgid "Any unstaged changes will be permanently lost by the revert."
 +msgstr ""
 +"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
 +
 +#: lib/index.tcl:392
 +msgid "Do Nothing"
 +msgstr "Nichts tun"
 +
 +#: lib/merge.tcl:13
 +msgid ""
 +"Cannot merge while amending.\n"
 +"\n"
 +"You must finish amending this commit before starting any type of merge.\n"
 +msgstr ""
 +"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
 +"\n"
 +"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
 +"zusammenführen können.\n"
 +
 +#: lib/merge.tcl:27
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before a merge can be performed.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
 +"\n"
 +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
 +"geändert.  Vor einem Zusammenführen muss neu geladen werden.\n"
 +"\n"
 +"Es wird gleich neu geladen.\n"
 +
 +#: lib/merge.tcl:44
 +#, tcl-format
 +msgid ""
 +"You are in the middle of a conflicted merge.\n"
 +"\n"
 +"File %s has merge conflicts.\n"
 +"\n"
 +"You must resolve them, stage the file, and commit to complete the current "
 +"merge.  Only then can you begin another merge.\n"
 +msgstr ""
 +"Zusammenführung mit Konflikten.\n"
 +"\n"
 +"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
 +"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
 +"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
 +"danach kann eine neue Zusammenführung begonnen werden.\n"
 +
 +#: lib/merge.tcl:54
 +#, tcl-format
 +msgid ""
 +"You are in the middle of a change.\n"
 +"\n"
 +"File %s is modified.\n"
 +"\n"
 +"You should complete the current commit before starting a merge.  Doing so "
 +"will help you abort a failed merge, should the need arise.\n"
 +msgstr ""
 +"Es liegen Änderungen vor.\n"
 +"\n"
 +"Die Datei »%s« wurde geändert.  Sie sollten zuerst die bereitgestellte "
 +"Version abschließen, bevor Sie eine Zusammenführung beginnen.  Mit dieser "
 +"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
 +"einfacher beheben oder abbrechen.\n"
 +
 +#: lib/merge.tcl:106
 +#, tcl-format
 +msgid "%s of %s"
 +msgstr "%s von %s"
 +
 +#: lib/merge.tcl:119
 +#, tcl-format
- msgid "Merging %s and %s"
- msgstr "Zusammenführen von %s und %s"
++msgid "Merging %s and %s..."
++msgstr "Zusammenführen von %s und %s..."
 +
- #: lib/merge.tcl:131
++#: lib/merge.tcl:130
 +msgid "Merge completed successfully."
 +msgstr "Zusammenführen erfolgreich abgeschlossen."
 +
 +#: lib/merge.tcl:133
 +msgid "Merge failed.  Conflict resolution is required."
 +msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
 +
 +#: lib/merge.tcl:158
 +#, tcl-format
 +msgid "Merge Into %s"
- msgstr "Zusammenführen in %s"
++msgstr "Zusammenführen in »%s«"
 +
 +#: lib/merge.tcl:177
 +msgid "Revision To Merge"
 +msgstr "Zusammenzuführende Version"
 +
 +#: lib/merge.tcl:212
 +msgid ""
 +"Cannot abort while amending.\n"
 +"\n"
 +"You must finish amending this commit.\n"
 +msgstr ""
 +"Abbruch der Nachbesserung ist nicht möglich.\n"
 +"\n"
 +"Sie müssen die Nachbesserung der Version abschließen.\n"
 +
 +#: lib/merge.tcl:222
 +msgid ""
 +"Abort merge?\n"
 +"\n"
 +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
 +"\n"
 +"Continue with aborting the current merge?"
 +msgstr ""
 +"Zusammenführen abbrechen?\n"
 +"\n"
 +"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
 +"verloren.\n"
 +"\n"
 +"Zusammenführen jetzt abbrechen?"
 +
 +#: lib/merge.tcl:228
 +msgid ""
 +"Reset changes?\n"
 +"\n"
 +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
 +"\n"
 +"Continue with resetting the current changes?"
 +msgstr ""
 +"Änderungen zurücksetzen?\n"
 +"\n"
 +"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
 +"verloren.\n"
 +"\n"
 +"Änderungen jetzt zurücksetzen?"
 +
 +#: lib/merge.tcl:239
 +msgid "Aborting"
 +msgstr "Abbruch"
 +
 +#: lib/merge.tcl:238
 +msgid "files reset"
 +msgstr "Dateien zurückgesetzt"
 +
 +#: lib/merge.tcl:265
 +msgid "Abort failed."
 +msgstr "Abbruch fehlgeschlagen."
 +
 +#: lib/merge.tcl:268
 +msgid "Abort completed.  Ready."
 +msgstr "Abbruch durchgeführt. Bereit."
 +
 +#: lib/option.tcl:82
 +msgid "Restore Defaults"
 +msgstr "Voreinstellungen wiederherstellen"
 +
 +#: lib/option.tcl:86
 +msgid "Save"
 +msgstr "Speichern"
 +
 +#: lib/option.tcl:96
 +#, tcl-format
 +msgid "%s Repository"
 +msgstr "Projektarchiv %s"
 +
 +#: lib/option.tcl:97
 +msgid "Global (All Repositories)"
 +msgstr "Global (Alle Projektarchive)"
 +
 +#: lib/option.tcl:103
 +msgid "User Name"
 +msgstr "Benutzername"
 +
 +#: lib/option.tcl:104
 +msgid "Email Address"
 +msgstr "E-Mail-Adresse"
 +
 +#: lib/option.tcl:106
 +msgid "Summarize Merge Commits"
 +msgstr "Zusammenführungs-Versionen zusammenfassen"
 +
 +#: lib/option.tcl:107
 +msgid "Merge Verbosity"
 +msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
 +
 +#: lib/option.tcl:108
 +msgid "Show Diffstat After Merge"
 +msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
 +
 +#: lib/option.tcl:110
 +msgid "Trust File Modification Timestamps"
 +msgstr "Auf Dateiänderungsdatum verlassen"
 +
 +#: lib/option.tcl:111
 +msgid "Prune Tracking Branches During Fetch"
- msgstr "Übernahmezweige entfernen während Anforderung"
++msgstr "Übernahmezweige aufräumen während Anforderung"
 +
 +#: lib/option.tcl:112
 +msgid "Match Tracking Branches"
 +msgstr "Passend zu Übernahmezweig"
 +
 +#: lib/option.tcl:113
 +msgid "Number of Diff Context Lines"
 +msgstr "Anzahl der Kontextzeilen beim Vergleich"
 +
 +#: lib/option.tcl:114
 +msgid "New Branch Name Template"
 +msgstr "Namensvorschlag für neue Zweige"
 +
- #: lib/option.tcl:176
++#: lib/option.tcl:191
++msgid "Spelling Dictionary:"
++msgstr "Wörterbuch Rechtschreibprüfung:"
++
++#: lib/option.tcl:215
 +msgid "Change Font"
 +msgstr "Schriftart ändern"
 +
 +#: lib/option.tcl:180
 +#, tcl-format
 +msgid "Choose %s"
 +msgstr "%s wählen"
 +
 +#: lib/option.tcl:186
 +msgid "pt."
 +msgstr "pt."
 +
 +#: lib/option.tcl:200
 +msgid "Preferences"
 +msgstr "Einstellungen"
 +
 +#: lib/option.tcl:235
 +msgid "Failed to completely save options:"
 +msgstr "Optionen konnten nicht gespeichert werden:"
 +
 +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 +msgid "Delete Remote Branch"
- msgstr "Zweig aus anderem Projektarchiv löschen"
++msgstr "Zweig in anderem Projektarchiv löschen"
 +
 +#: lib/remote_branch_delete.tcl:47
 +msgid "From Repository"
- msgstr "Von Projektarchiv"
++msgstr "In Projektarchiv"
 +
 +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 +msgid "Remote:"
 +msgstr "Anderes Archiv:"
 +
 +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 +msgid "Arbitrary URL:"
- msgstr "Kommunikation mit URL:"
++msgstr "Archiv-URL:"
 +
 +#: lib/remote_branch_delete.tcl:84
 +msgid "Branches"
 +msgstr "Zweige"
 +
 +#: lib/remote_branch_delete.tcl:109
 +msgid "Delete Only If"
- msgstr "Löschen, falls"
++msgstr "Nur löschen, wenn"
 +
 +#: lib/remote_branch_delete.tcl:111
 +msgid "Merged Into:"
- msgstr "Zusammenführen mit:"
++msgstr "Zusammengeführt mit:"
 +
 +#: lib/remote_branch_delete.tcl:119
 +msgid "Always (Do not perform merge checks)"
 +msgstr "Immer (Keine Zusammenführungsprüfung)"
 +
 +#: lib/remote_branch_delete.tcl:152
 +msgid "A branch is required for 'Merged Into'."
 +msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
 +
 +#: lib/remote_branch_delete.tcl:184
 +#, tcl-format
 +msgid ""
 +"The following branches are not completely merged into %s:\n"
 +"\n"
 +" - %s"
 +msgstr ""
 +"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n"
 +"\n"
 +" - %s"
 +
 +#: lib/remote_branch_delete.tcl:189
 +#, tcl-format
 +msgid ""
 +"One or more of the merge tests failed because you have not fetched the "
 +"necessary commits.  Try fetching from %s first."
 +msgstr ""
 +"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die "
 +"notwendigen Versionen vorher angefordert haben.  Sie sollten versuchen, "
 +"zuerst von »%s« anzufordern."
 +
 +#: lib/remote_branch_delete.tcl:207
 +msgid "Please select one or more branches to delete."
 +msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll."
 +
 +#: lib/remote_branch_delete.tcl:216
 +msgid ""
 +"Recovering deleted branches is difficult.\n"
 +"\n"
 +"Delete the selected branches?"
 +msgstr ""
 +"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
 +"möglich.\n"
 +"\n"
 +"Sollen die ausgewählten Zweige gelöscht werden?"
 +
 +#: lib/remote_branch_delete.tcl:226
 +#, tcl-format
 +msgid "Deleting branches from %s"
 +msgstr "Zweige auf »%s« werden gelöscht"
 +
 +#: lib/remote_branch_delete.tcl:286
 +msgid "No repository selected."
 +msgstr "Kein Projektarchiv ausgewählt."
 +
 +#: lib/remote_branch_delete.tcl:291
 +#, tcl-format
 +msgid "Scanning %s..."
 +msgstr "»%s« laden..."
 +
 +#: lib/remote.tcl:165
 +msgid "Prune from"
- msgstr "Entfernen von"
++msgstr "Aufräumen von"
 +
 +#: lib/remote.tcl:170
 +msgid "Fetch from"
 +msgstr "Anfordern von"
 +
 +#: lib/remote.tcl:213
 +msgid "Push to"
 +msgstr "Versenden nach"
 +
 +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 +msgid "Cannot write shortcut:"
 +msgstr "Fehler beim Schreiben der Verknüpfung:"
 +
 +#: lib/shortcut.tcl:136
 +msgid "Cannot write icon:"
 +msgstr "Fehler beim Erstellen des Icons:"
 +
++#: lib/spellcheck.tcl:37
++msgid "Not connected to aspell"
++msgstr "Keine Verbindung zu »aspell«"
++
++#: lib/spellcheck.tcl:41
++msgid "Unrecognized aspell version"
++msgstr "Unbekannte Version von »aspell«"
++
++#: lib/spellcheck.tcl:135
++msgid "No Suggestions"
++msgstr "Keine Vorschläge"
++
++#: lib/spellcheck.tcl:336
++msgid "Unexpected EOF from aspell"
++msgstr "Unerwartetes EOF von »aspell«"
++
++#: lib/spellcheck.tcl:340
++msgid "Spell Checker Failed"
++msgstr "Rechtschreibprüfung fehlgeschlagen"
++
 +#: lib/status_bar.tcl:83
 +#, tcl-format
 +msgid "%s ... %*i of %*i %s (%3i%%)"
 +msgstr "%s ... %*i von %*i %s (%3i%%)"
 +
 +#: lib/transport.tcl:6
 +#, tcl-format
 +msgid "fetch %s"
 +msgstr "»%s« anfordern"
 +
 +#: lib/transport.tcl:7
 +#, tcl-format
 +msgid "Fetching new changes from %s"
 +msgstr "Neue Änderungen von »%s« holen"
 +
 +#: lib/transport.tcl:18
 +#, tcl-format
 +msgid "remote prune %s"
- msgstr "Entfernen von »%s« aus anderem Archiv"
++msgstr "Aufräumen von »%s«"
 +
 +#: lib/transport.tcl:19
 +#, tcl-format
 +msgid "Pruning tracking branches deleted from %s"
- msgstr "Übernahmezweige entfernen, die in »%s« gelöscht wurden"
++msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden"
 +
 +#: lib/transport.tcl:25 lib/transport.tcl:71
 +#, tcl-format
 +msgid "push %s"
 +msgstr "»%s« versenden..."
 +
 +#: lib/transport.tcl:26
 +#, tcl-format
 +msgid "Pushing changes to %s"
 +msgstr "Änderungen nach »%s« versenden"
 +
 +#: lib/transport.tcl:72
 +#, tcl-format
 +msgid "Pushing %s %s to %s"
 +msgstr "%s %s nach %s versenden"
 +
 +#: lib/transport.tcl:89
 +msgid "Push Branches"
 +msgstr "Zweige versenden"
 +
 +#: lib/transport.tcl:103
 +msgid "Source Branches"
- msgstr "Herkunftszweige"
++msgstr "Lokale Zweige"
 +
 +#: lib/transport.tcl:120
 +msgid "Destination Repository"
 +msgstr "Ziel-Projektarchiv"
 +
 +#: lib/transport.tcl:158
 +msgid "Transfer Options"
 +msgstr "Netzwerk-Einstellungen"
 +
 +#: lib/transport.tcl:160
 +msgid "Force overwrite existing branch (may discard changes)"
 +msgstr ""
 +"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
 +
 +#: lib/transport.tcl:164
 +msgid "Use thin pack (for slow network connections)"
 +msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
 +
 +#: lib/transport.tcl:168
 +msgid "Include tags"
 +msgstr "Mit Markierungen übertragen"
diff --cc git-gui/po/git-gui.pot
index 3f139da6c,000000000..2e332849f
mode 100644,000000..100644
--- a/git-gui/po/git-gui.pot
+++ b/git-gui/po/git-gui.pot
@@@ -1,1778 -1,0 +1,1802 @@@
 +# SOME DESCRIPTIVE TITLE.
 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 +# This file is distributed under the same license as the PACKAGE package.
 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 +#
 +#, fuzzy
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: PACKAGE VERSION\n"
 +"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2008-02-02 10:14+0100\n"
++"POT-Creation-Date: 2008-02-16 21:24+0100\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 +"Language-Team: LANGUAGE <LL@li.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=CHARSET\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
 +#: git-gui.sh:733
 +msgid "git-gui: fatal error"
 +msgstr ""
 +
 +#: git-gui.sh:565
 +#, tcl-format
 +msgid "Invalid font specified in %s:"
 +msgstr ""
 +
 +#: git-gui.sh:590
 +msgid "Main Font"
 +msgstr ""
 +
 +#: git-gui.sh:591
 +msgid "Diff/Console Font"
 +msgstr ""
 +
 +#: git-gui.sh:605
 +msgid "Cannot find git in PATH."
 +msgstr ""
 +
 +#: git-gui.sh:632
 +msgid "Cannot parse Git version string:"
 +msgstr ""
 +
 +#: git-gui.sh:650
 +#, tcl-format
 +msgid ""
 +"Git version cannot be determined.\n"
 +"\n"
 +"%s claims it is version '%s'.\n"
 +"\n"
 +"%s requires at least Git 1.5.0 or later.\n"
 +"\n"
 +"Assume '%s' is version 1.5.0?\n"
 +msgstr ""
 +
 +#: git-gui.sh:888
 +msgid "Git directory not found:"
 +msgstr ""
 +
 +#: git-gui.sh:895
 +msgid "Cannot move to top of working directory:"
 +msgstr ""
 +
 +#: git-gui.sh:902
 +msgid "Cannot use funny .git directory:"
 +msgstr ""
 +
 +#: git-gui.sh:907
 +msgid "No working directory"
 +msgstr ""
 +
 +#: git-gui.sh:1054
 +msgid "Refreshing file status..."
 +msgstr ""
 +
 +#: git-gui.sh:1119
 +msgid "Scanning for modified files ..."
 +msgstr ""
 +
 +#: git-gui.sh:1294 lib/browser.tcl:245
 +msgid "Ready."
 +msgstr ""
 +
 +#: git-gui.sh:1560
 +msgid "Unmodified"
 +msgstr ""
 +
 +#: git-gui.sh:1562
 +msgid "Modified, not staged"
 +msgstr ""
 +
 +#: git-gui.sh:1563 git-gui.sh:1568
 +msgid "Staged for commit"
 +msgstr ""
 +
 +#: git-gui.sh:1564 git-gui.sh:1569
 +msgid "Portions staged for commit"
 +msgstr ""
 +
 +#: git-gui.sh:1565 git-gui.sh:1570
 +msgid "Staged for commit, missing"
 +msgstr ""
 +
 +#: git-gui.sh:1567
 +msgid "Untracked, not staged"
 +msgstr ""
 +
 +#: git-gui.sh:1572
 +msgid "Missing"
 +msgstr ""
 +
 +#: git-gui.sh:1573
 +msgid "Staged for removal"
 +msgstr ""
 +
 +#: git-gui.sh:1574
 +msgid "Staged for removal, still present"
 +msgstr ""
 +
 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
 +msgid "Requires merge resolution"
 +msgstr ""
 +
 +#: git-gui.sh:1614
 +msgid "Starting gitk... please wait..."
 +msgstr ""
 +
 +#: git-gui.sh:1623
 +#, tcl-format
 +msgid ""
 +"Unable to start gitk:\n"
 +"\n"
 +"%s does not exist"
 +msgstr ""
 +
 +#: git-gui.sh:1823 lib/choose_repository.tcl:35
 +msgid "Repository"
 +msgstr ""
 +
 +#: git-gui.sh:1824
 +msgid "Edit"
 +msgstr ""
 +
 +#: git-gui.sh:1826 lib/choose_rev.tcl:560
 +msgid "Branch"
 +msgstr ""
 +
 +#: git-gui.sh:1829 lib/choose_rev.tcl:547
 +msgid "Commit@@noun"
 +msgstr ""
 +
 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
 +msgid "Merge"
 +msgstr ""
 +
 +#: git-gui.sh:1833 lib/choose_rev.tcl:556
 +msgid "Remote"
 +msgstr ""
 +
 +#: git-gui.sh:1842
 +msgid "Browse Current Branch's Files"
 +msgstr ""
 +
 +#: git-gui.sh:1846
 +msgid "Browse Branch Files..."
 +msgstr ""
 +
 +#: git-gui.sh:1851
 +msgid "Visualize Current Branch's History"
 +msgstr ""
 +
 +#: git-gui.sh:1855
 +msgid "Visualize All Branch History"
 +msgstr ""
 +
 +#: git-gui.sh:1862
 +#, tcl-format
 +msgid "Browse %s's Files"
 +msgstr ""
 +
 +#: git-gui.sh:1864
 +#, tcl-format
 +msgid "Visualize %s's History"
 +msgstr ""
 +
 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
 +msgid "Database Statistics"
 +msgstr ""
 +
 +#: git-gui.sh:1872 lib/database.tcl:34
 +msgid "Compress Database"
 +msgstr ""
 +
 +#: git-gui.sh:1875
 +msgid "Verify Database"
 +msgstr ""
 +
 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
 +msgid "Create Desktop Icon"
 +msgstr ""
 +
 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
 +msgid "Quit"
 +msgstr ""
 +
 +#: git-gui.sh:1902
 +msgid "Undo"
 +msgstr ""
 +
 +#: git-gui.sh:1905
 +msgid "Redo"
 +msgstr ""
 +
 +#: git-gui.sh:1909 git-gui.sh:2403
 +msgid "Cut"
 +msgstr ""
 +
 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
 +#: lib/console.tcl:67
 +msgid "Copy"
 +msgstr ""
 +
 +#: git-gui.sh:1915 git-gui.sh:2409
 +msgid "Paste"
 +msgstr ""
 +
 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
 +#: lib/remote_branch_delete.tcl:38
 +msgid "Delete"
 +msgstr ""
 +
 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
 +msgid "Select All"
 +msgstr ""
 +
 +#: git-gui.sh:1931
 +msgid "Create..."
 +msgstr ""
 +
 +#: git-gui.sh:1937
 +msgid "Checkout..."
 +msgstr ""
 +
 +#: git-gui.sh:1943
 +msgid "Rename..."
 +msgstr ""
 +
 +#: git-gui.sh:1948 git-gui.sh:2048
 +msgid "Delete..."
 +msgstr ""
 +
 +#: git-gui.sh:1953
 +msgid "Reset..."
 +msgstr ""
 +
 +#: git-gui.sh:1965 git-gui.sh:2350
 +msgid "New Commit"
 +msgstr ""
 +
 +#: git-gui.sh:1973 git-gui.sh:2357
 +msgid "Amend Last Commit"
 +msgstr ""
 +
 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
 +msgid "Rescan"
 +msgstr ""
 +
 +#: git-gui.sh:1988
 +msgid "Stage To Commit"
 +msgstr ""
 +
 +#: git-gui.sh:1994
 +msgid "Stage Changed Files To Commit"
 +msgstr ""
 +
 +#: git-gui.sh:2000
 +msgid "Unstage From Commit"
 +msgstr ""
 +
 +#: git-gui.sh:2005 lib/index.tcl:393
 +msgid "Revert Changes"
 +msgstr ""
 +
 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
 +msgid "Sign Off"
 +msgstr ""
 +
 +#: git-gui.sh:2016 git-gui.sh:2333
 +msgid "Commit@@verb"
 +msgstr ""
 +
 +#: git-gui.sh:2027
 +msgid "Local Merge..."
 +msgstr ""
 +
 +#: git-gui.sh:2032
 +msgid "Abort Merge..."
 +msgstr ""
 +
 +#: git-gui.sh:2044
 +msgid "Push..."
 +msgstr ""
 +
 +#: git-gui.sh:2055 lib/choose_repository.tcl:40
 +msgid "Apple"
 +msgstr ""
 +
 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
 +#, tcl-format
 +msgid "About %s"
 +msgstr ""
 +
 +#: git-gui.sh:2062
 +msgid "Preferences..."
 +msgstr ""
 +
 +#: git-gui.sh:2070 git-gui.sh:2595
 +msgid "Options..."
 +msgstr ""
 +
 +#: git-gui.sh:2076 lib/choose_repository.tcl:46
 +msgid "Help"
 +msgstr ""
 +
 +#: git-gui.sh:2117
 +msgid "Online Documentation"
 +msgstr ""
 +
 +#: git-gui.sh:2201
 +#, tcl-format
 +msgid "fatal: cannot stat path %s: No such file or directory"
 +msgstr ""
 +
 +#: git-gui.sh:2234
 +msgid "Current Branch:"
 +msgstr ""
 +
 +#: git-gui.sh:2255
 +msgid "Staged Changes (Will Commit)"
 +msgstr ""
 +
 +#: git-gui.sh:2274
 +msgid "Unstaged Changes"
 +msgstr ""
 +
 +#: git-gui.sh:2323
 +msgid "Stage Changed"
 +msgstr ""
 +
 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
 +msgid "Push"
 +msgstr ""
 +
 +#: git-gui.sh:2369
 +msgid "Initial Commit Message:"
 +msgstr ""
 +
 +#: git-gui.sh:2370
 +msgid "Amended Commit Message:"
 +msgstr ""
 +
 +#: git-gui.sh:2371
 +msgid "Amended Initial Commit Message:"
 +msgstr ""
 +
 +#: git-gui.sh:2372
 +msgid "Amended Merge Commit Message:"
 +msgstr ""
 +
 +#: git-gui.sh:2373
 +msgid "Merge Commit Message:"
 +msgstr ""
 +
 +#: git-gui.sh:2374
 +msgid "Commit Message:"
 +msgstr ""
 +
 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
 +msgid "Copy All"
 +msgstr ""
 +
 +#: git-gui.sh:2443 lib/blame.tcl:104
 +msgid "File:"
 +msgstr ""
 +
 +#: git-gui.sh:2573
 +msgid "Apply/Reverse Hunk"
 +msgstr ""
 +
 +#: git-gui.sh:2579
 +msgid "Show Less Context"
 +msgstr ""
 +
 +#: git-gui.sh:2586
 +msgid "Show More Context"
 +msgstr ""
 +
 +#: git-gui.sh:2594
 +msgid "Refresh"
 +msgstr ""
 +
 +#: git-gui.sh:2615
 +msgid "Decrease Font Size"
 +msgstr ""
 +
 +#: git-gui.sh:2619
 +msgid "Increase Font Size"
 +msgstr ""
 +
 +#: git-gui.sh:2630
 +msgid "Unstage Hunk From Commit"
 +msgstr ""
 +
 +#: git-gui.sh:2604
 +msgid "Stage Hunk For Commit"
 +msgstr ""
 +
 +#: git-gui.sh:2623
 +msgid "Initializing..."
 +msgstr ""
 +
 +#: git-gui.sh:2718
 +#, tcl-format
 +msgid ""
 +"Possible environment issues exist.\n"
 +"\n"
 +"The following environment variables are probably\n"
 +"going to be ignored by any Git subprocess run\n"
 +"by %s:\n"
 +"\n"
 +msgstr ""
 +
 +#: git-gui.sh:2748
 +msgid ""
 +"\n"
 +"This is due to a known issue with the\n"
 +"Tcl binary distributed by Cygwin."
 +msgstr ""
 +
 +#: git-gui.sh:2753
 +#, tcl-format
 +msgid ""
 +"\n"
 +"\n"
 +"A good replacement for %s\n"
 +"is placing values for the user.name and\n"
 +"user.email settings into your personal\n"
 +"~/.gitconfig file.\n"
 +msgstr ""
 +
 +#: lib/about.tcl:25
 +msgid "git-gui - a graphical user interface for Git."
 +msgstr ""
 +
 +#: lib/blame.tcl:77
 +msgid "File Viewer"
 +msgstr ""
 +
 +#: lib/blame.tcl:81
 +msgid "Commit:"
 +msgstr ""
 +
 +#: lib/blame.tcl:249
 +msgid "Copy Commit"
 +msgstr ""
 +
 +#: lib/blame.tcl:369
 +#, tcl-format
 +msgid "Reading %s..."
 +msgstr ""
 +
 +#: lib/blame.tcl:473
 +msgid "Loading copy/move tracking annotations..."
 +msgstr ""
 +
 +#: lib/blame.tcl:493
 +msgid "lines annotated"
 +msgstr ""
 +
 +#: lib/blame.tcl:674
 +msgid "Loading original location annotations..."
 +msgstr ""
 +
 +#: lib/blame.tcl:677
 +msgid "Annotation complete."
 +msgstr ""
 +
 +#: lib/blame.tcl:731
 +msgid "Loading annotation..."
 +msgstr ""
 +
 +#: lib/blame.tcl:787
 +msgid "Author:"
 +msgstr ""
 +
 +#: lib/blame.tcl:791
 +msgid "Committer:"
 +msgstr ""
 +
 +#: lib/blame.tcl:796
 +msgid "Original File:"
 +msgstr ""
 +
 +#: lib/blame.tcl:910
 +msgid "Originally By:"
 +msgstr ""
 +
 +#: lib/blame.tcl:916
 +msgid "In File:"
 +msgstr ""
 +
 +#: lib/blame.tcl:921
 +msgid "Copied Or Moved Here By:"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
 +msgid "Checkout Branch"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:23
 +msgid "Checkout"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
 +#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
 +msgid "Cancel"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
 +msgid "Revision"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
 +msgid "Options"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
 +msgid "Fetch Tracking Branch"
 +msgstr ""
 +
 +#: lib/branch_checkout.tcl:44
 +msgid "Detach From Local Branch"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:22
 +msgid "Create Branch"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:27
 +msgid "Create New Branch"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
 +msgid "Create"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:40
 +msgid "Branch Name"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:43
 +msgid "Name:"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:58
 +msgid "Match Tracking Branch Name"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:66
 +msgid "Starting Revision"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:72
 +msgid "Update Existing Branch:"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:75
 +msgid "No"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:80
 +msgid "Fast Forward Only"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
 +msgid "Reset"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:97
 +msgid "Checkout After Creation"
 +msgstr ""
 +
 +#: lib/branch_create.tcl:131
 +msgid "Please select a tracking branch."
 +msgstr ""
 +
 +#: lib/branch_create.tcl:140
 +#, tcl-format
 +msgid "Tracking branch %s is not a branch in the remote repository."
 +msgstr ""
 +
 +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
 +msgid "Please supply a branch name."
 +msgstr ""
 +
 +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
 +#, tcl-format
 +msgid "'%s' is not an acceptable branch name."
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:15
 +msgid "Delete Branch"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:20
 +msgid "Delete Local Branch"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:37
 +msgid "Local Branches"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:52
 +msgid "Delete Only If Merged Into"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:54
 +msgid "Always (Do not perform merge test.)"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:103
 +#, tcl-format
 +msgid "The following branches are not completely merged into %s:"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:115
 +msgid ""
 +"Recovering deleted branches is difficult. \n"
 +"\n"
 +" Delete the selected branches?"
 +msgstr ""
 +
 +#: lib/branch_delete.tcl:141
 +#, tcl-format
 +msgid ""
 +"Failed to delete branches:\n"
 +"%s"
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
 +msgid "Rename Branch"
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:26
 +msgid "Rename"
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:36
 +msgid "Branch:"
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:39
 +msgid "New Name:"
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:75
 +msgid "Please select a branch to rename."
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
 +#, tcl-format
 +msgid "Branch '%s' already exists."
 +msgstr ""
 +
 +#: lib/branch_rename.tcl:117
 +#, tcl-format
 +msgid "Failed to rename '%s'."
 +msgstr ""
 +
 +#: lib/browser.tcl:17
 +msgid "Starting..."
 +msgstr ""
 +
 +#: lib/browser.tcl:26
 +msgid "File Browser"
 +msgstr ""
 +
 +#: lib/browser.tcl:125 lib/browser.tcl:142
 +#, tcl-format
 +msgid "Loading %s..."
 +msgstr ""
 +
 +#: lib/browser.tcl:186
 +msgid "[Up To Parent]"
 +msgstr ""
 +
 +#: lib/browser.tcl:266 lib/browser.tcl:272
 +msgid "Browse Branch Files"
 +msgstr ""
 +
 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391
 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
 +#: lib/choose_repository.tcl:989
 +msgid "Browse"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:79
 +#, tcl-format
 +msgid "Fetching %s from %s"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:127
 +#, tcl-format
 +msgid "fatal: Cannot resolve %s"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
 +msgid "Close"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:169
 +#, tcl-format
 +msgid "Branch '%s' does not exist."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:206
 +#, tcl-format
 +msgid ""
 +"Branch '%s' already exists.\n"
 +"\n"
 +"It cannot fast-forward to %s.\n"
 +"A merge is required."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:220
 +#, tcl-format
 +msgid "Merge strategy '%s' not supported."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:239
 +#, tcl-format
 +msgid "Failed to update '%s'."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:251
 +msgid "Staging area (index) is already locked."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:266
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before the current branch can be changed.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:322
 +#, tcl-format
 +msgid "Updating working directory to '%s'..."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:323
 +msgid "files checked out"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:353
 +#, tcl-format
 +msgid "Aborted checkout of '%s' (file level merging is required)."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:354
 +msgid "File level merge required."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:358
 +#, tcl-format
 +msgid "Staying on branch '%s'."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:429
 +msgid ""
 +"You are no longer on a local branch.\n"
 +"\n"
 +"If you wanted to be on a branch, create one now starting from 'This Detached "
 +"Checkout'."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:446
 +#, tcl-format
 +msgid "Checked out '%s'."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:478
 +#, tcl-format
 +msgid "Resetting '%s' to '%s' will lose the following commits:"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:500
 +msgid "Recovering lost commits may not be easy."
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:505
 +#, tcl-format
 +msgid "Reset '%s'?"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:510 lib/merge.tcl:164
 +msgid "Visualize"
 +msgstr ""
 +
 +#: lib/checkout_op.tcl:578
 +#, tcl-format
 +msgid ""
 +"Failed to set current branch.\n"
 +"\n"
 +"This working directory is only partially switched.  We successfully updated "
 +"your files, but failed to update an internal Git file.\n"
 +"\n"
 +"This should not have occurred.  %s will now close and give up."
 +msgstr ""
 +
 +#: lib/choose_font.tcl:39
 +msgid "Select"
 +msgstr ""
 +
 +#: lib/choose_font.tcl:53
 +msgid "Font Family"
 +msgstr ""
 +
 +#: lib/choose_font.tcl:73
 +msgid "Font Size"
 +msgstr ""
 +
 +#: lib/choose_font.tcl:90
 +msgid "Font Example"
 +msgstr ""
 +
 +#: lib/choose_font.tcl:101
 +msgid ""
 +"This is example text.\n"
 +"If you like this text, it can be your font."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:27
 +msgid "Git Gui"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
 +msgid "Create New Repository"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:86
 +msgid "New..."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
 +msgid "Clone Existing Repository"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:99
 +msgid "Clone..."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
 +msgid "Open Existing Repository"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:112
 +msgid "Open..."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:125
 +msgid "Recent Repositories"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:131
 +msgid "Open Recent Repository:"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:294
 +#, tcl-format
 +msgid "Location %s already exists."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
 +#: lib/choose_repository.tcl:314
 +#, tcl-format
 +msgid "Failed to create repository %s:"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
 +msgid "Directory:"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
 +#: lib/choose_repository.tcl:1013
 +msgid "Git Repository"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
 +#, tcl-format
 +msgid "Directory %s already exists."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:442
 +#, tcl-format
 +msgid "File %s already exists."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:463
 +msgid "Clone"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:476
 +msgid "URL:"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:496
 +msgid "Clone Type:"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:502
 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:508
 +msgid "Full Copy (Slower, Redundant Backup)"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:514
 +msgid "Shared (Fastest, Not Recommended, No Backup)"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
 +#, tcl-format
 +msgid "Not a Git repository: %s"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:586
 +msgid "Standard only available for local repository."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:590
 +msgid "Shared only available for local repository."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:617
 +msgid "Failed to configure origin"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:629
 +msgid "Counting objects"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:630
 +msgid "buckets"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:654
 +#, tcl-format
 +msgid "Unable to copy objects/info/alternates: %s"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:690
 +#, tcl-format
 +msgid "Nothing to clone from %s."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
 +#: lib/choose_repository.tcl:918
 +msgid "The 'master' branch has not been initialized."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:705
 +msgid "Hardlinks are unavailable.  Falling back to copying."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:717
 +#, tcl-format
 +msgid "Cloning from %s"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:748
 +msgid "Copying objects"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:749
 +msgid "KiB"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:773
 +#, tcl-format
 +msgid "Unable to copy object: %s"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:783
 +msgid "Linking objects"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:784
 +msgid "objects"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:792
 +#, tcl-format
 +msgid "Unable to hardlink object: %s"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:847
 +msgid "Cannot fetch branches and objects.  See console output for details."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:858
 +msgid "Cannot fetch tags.  See console output for details."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:882
 +msgid "Cannot determine HEAD.  See console output for details."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:891
 +#, tcl-format
 +msgid "Unable to cleanup %s"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:897
 +msgid "Clone failed."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:904
 +msgid "No default branch obtained."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:915
 +#, tcl-format
 +msgid "Cannot resolve %s as a commit."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:927
 +msgid "Creating working directory"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
 +#: lib/index.tcl:193
 +msgid "files"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:957
 +msgid "Initial file checkout failed."
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:973
 +msgid "Open"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:983
 +msgid "Repository:"
 +msgstr ""
 +
 +#: lib/choose_repository.tcl:1033
 +#, tcl-format
 +msgid "Failed to open repository %s:"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:53
 +msgid "This Detached Checkout"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:60
 +msgid "Revision Expression:"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:74
 +msgid "Local Branch"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:79
 +msgid "Tracking Branch"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
 +msgid "Tag"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:317
 +#, tcl-format
 +msgid "Invalid revision: %s"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:338
 +msgid "No revision selected."
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:346
 +msgid "Revision expression is empty."
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:530
 +msgid "Updated"
 +msgstr ""
 +
 +#: lib/choose_rev.tcl:558
 +msgid "URL"
 +msgstr ""
 +
 +#: lib/commit.tcl:9
 +msgid ""
 +"There is nothing to amend.\n"
 +"\n"
 +"You are about to create the initial commit.  There is no commit before this "
 +"to amend.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:18
 +msgid ""
 +"Cannot amend while merging.\n"
 +"\n"
 +"You are currently in the middle of a merge that has not been fully "
 +"completed.  You cannot amend the prior commit unless you first abort the "
 +"current merge activity.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:49
 +msgid "Error loading commit data for amend:"
 +msgstr ""
 +
 +#: lib/commit.tcl:76
 +msgid "Unable to obtain your identity:"
 +msgstr ""
 +
 +#: lib/commit.tcl:81
 +msgid "Invalid GIT_COMMITTER_IDENT:"
 +msgstr ""
 +
 +#: lib/commit.tcl:133
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before another commit can be created.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:154
 +#, tcl-format
 +msgid ""
 +"Unmerged files cannot be committed.\n"
 +"\n"
 +"File %s has merge conflicts.  You must resolve them and stage the file "
 +"before committing.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:162
 +#, tcl-format
 +msgid ""
 +"Unknown file state %s detected.\n"
 +"\n"
 +"File %s cannot be committed by this program.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:170
 +msgid ""
 +"No changes to commit.\n"
 +"\n"
 +"You must stage at least 1 file before you can commit.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:183
 +msgid ""
 +"Please supply a commit message.\n"
 +"\n"
 +"A good commit message has the following format:\n"
 +"\n"
 +"- First line: Describe in one sentence what you did.\n"
 +"- Second line: Blank\n"
 +"- Remaining lines: Describe why this change is good.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:207
 +#, tcl-format
 +msgid "warning: Tcl does not support encoding '%s'."
 +msgstr ""
 +
 +#: lib/commit.tcl:221
 +msgid "Calling pre-commit hook..."
 +msgstr ""
 +
 +#: lib/commit.tcl:236
 +msgid "Commit declined by pre-commit hook."
 +msgstr ""
 +
 +#: lib/commit.tcl:259
 +msgid "Calling commit-msg hook..."
 +msgstr ""
 +
 +#: lib/commit.tcl:274
 +msgid "Commit declined by commit-msg hook."
 +msgstr ""
 +
 +#: lib/commit.tcl:287
 +msgid "Committing changes..."
 +msgstr ""
 +
 +#: lib/commit.tcl:303
 +msgid "write-tree failed:"
 +msgstr ""
 +
 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
 +msgid "Commit failed."
 +msgstr ""
 +
 +#: lib/commit.tcl:321
 +#, tcl-format
 +msgid "Commit %s appears to be corrupt"
 +msgstr ""
 +
 +#: lib/commit.tcl:279
 +msgid ""
 +"No changes to commit.\n"
 +"\n"
 +"No files were modified by this commit and it was not a merge commit.\n"
 +"\n"
 +"A rescan will be automatically started now.\n"
 +msgstr ""
 +
 +#: lib/commit.tcl:286
 +msgid "No changes to commit."
 +msgstr ""
 +
 +#: lib/commit.tcl:347
 +msgid "commit-tree failed:"
 +msgstr ""
 +
 +#: lib/commit.tcl:339
 +msgid "update-ref failed:"
 +msgstr ""
 +
 +#: lib/commit.tcl:430
 +#, tcl-format
 +msgid "Created commit %s: %s"
 +msgstr ""
 +
 +#: lib/console.tcl:57
 +msgid "Working... please wait..."
 +msgstr ""
 +
 +#: lib/console.tcl:183
 +msgid "Success"
 +msgstr ""
 +
 +#: lib/console.tcl:196
 +msgid "Error: Command Failed"
 +msgstr ""
 +
 +#: lib/database.tcl:43
 +msgid "Number of loose objects"
 +msgstr ""
 +
 +#: lib/database.tcl:44
 +msgid "Disk space used by loose objects"
 +msgstr ""
 +
 +#: lib/database.tcl:45
 +msgid "Number of packed objects"
 +msgstr ""
 +
 +#: lib/database.tcl:46
 +msgid "Number of packs"
 +msgstr ""
 +
 +#: lib/database.tcl:47
 +msgid "Disk space used by packed objects"
 +msgstr ""
 +
 +#: lib/database.tcl:48
 +msgid "Packed objects waiting for pruning"
 +msgstr ""
 +
 +#: lib/database.tcl:49
 +msgid "Garbage files"
 +msgstr ""
 +
 +#: lib/database.tcl:72
 +msgid "Compressing the object database"
 +msgstr ""
 +
 +#: lib/database.tcl:83
 +msgid "Verifying the object database with fsck-objects"
 +msgstr ""
 +
 +#: lib/database.tcl:108
 +#, tcl-format
 +msgid ""
 +"This repository currently has approximately %i loose objects.\n"
 +"\n"
 +"To maintain optimal performance it is strongly recommended that you compress "
 +"the database when more than %i loose objects exist.\n"
 +"\n"
 +"Compress the database now?"
 +msgstr ""
 +
 +#: lib/date.tcl:25
 +#, tcl-format
 +msgid "Invalid date from Git: %s"
 +msgstr ""
 +
 +#: lib/diff.tcl:42
 +#, tcl-format
 +msgid ""
 +"No differences detected.\n"
 +"\n"
 +"%s has no changes.\n"
 +"\n"
 +"The modification date of this file was updated by another application, but "
 +"the content within the file was not changed.\n"
 +"\n"
 +"A rescan will be automatically started to find other files which may have "
 +"the same state."
 +msgstr ""
 +
 +#: lib/diff.tcl:81
 +#, tcl-format
 +msgid "Loading diff of %s..."
 +msgstr ""
 +
 +#: lib/diff.tcl:114 lib/diff.tcl:184
 +#, tcl-format
 +msgid "Unable to display %s"
 +msgstr ""
 +
 +#: lib/diff.tcl:115
 +msgid "Error loading file:"
 +msgstr ""
 +
 +#: lib/diff.tcl:122
 +msgid "Git Repository (subproject)"
 +msgstr ""
 +
 +#: lib/diff.tcl:134
 +msgid "* Binary file (not showing content)."
 +msgstr ""
 +
 +#: lib/diff.tcl:185
 +msgid "Error loading diff:"
 +msgstr ""
 +
 +#: lib/diff.tcl:302
 +msgid "Failed to unstage selected hunk."
 +msgstr ""
 +
 +#: lib/diff.tcl:309
 +msgid "Failed to stage selected hunk."
 +msgstr ""
 +
 +#: lib/error.tcl:12 lib/error.tcl:102
 +msgid "error"
 +msgstr ""
 +
 +#: lib/error.tcl:28
 +msgid "warning"
 +msgstr ""
 +
 +#: lib/error.tcl:81
 +msgid "You must correct the above errors before committing."
 +msgstr ""
 +
 +#: lib/index.tcl:6
 +msgid "Unable to unlock the index."
 +msgstr ""
 +
 +#: lib/index.tcl:15
 +msgid "Index Error"
 +msgstr ""
 +
 +#: lib/index.tcl:21
 +msgid ""
 +"Updating the Git index failed.  A rescan will be automatically started to "
 +"resynchronize git-gui."
 +msgstr ""
 +
 +#: lib/index.tcl:27
 +msgid "Continue"
 +msgstr ""
 +
 +#: lib/index.tcl:31
 +msgid "Unlock Index"
 +msgstr ""
 +
 +#: lib/index.tcl:282
 +#, tcl-format
 +msgid "Unstaging %s from commit"
 +msgstr ""
 +
 +#: lib/index.tcl:313
 +msgid "Ready to commit."
 +msgstr ""
 +
 +#: lib/index.tcl:326
 +#, tcl-format
 +msgid "Adding %s"
 +msgstr ""
 +
 +#: lib/index.tcl:381
 +#, tcl-format
 +msgid "Revert changes in file %s?"
 +msgstr ""
 +
 +#: lib/index.tcl:383
 +#, tcl-format
 +msgid "Revert changes in these %i files?"
 +msgstr ""
 +
 +#: lib/index.tcl:389
 +msgid "Any unstaged changes will be permanently lost by the revert."
 +msgstr ""
 +
 +#: lib/index.tcl:392
 +msgid "Do Nothing"
 +msgstr ""
 +
 +#: lib/merge.tcl:13
 +msgid ""
 +"Cannot merge while amending.\n"
 +"\n"
 +"You must finish amending this commit before starting any type of merge.\n"
 +msgstr ""
 +
 +#: lib/merge.tcl:27
 +msgid ""
 +"Last scanned state does not match repository state.\n"
 +"\n"
 +"Another Git program has modified this repository since the last scan.  A "
 +"rescan must be performed before a merge can be performed.\n"
 +"\n"
 +"The rescan will be automatically started now.\n"
 +msgstr ""
 +
 +#: lib/merge.tcl:44
 +#, tcl-format
 +msgid ""
 +"You are in the middle of a conflicted merge.\n"
 +"\n"
 +"File %s has merge conflicts.\n"
 +"\n"
 +"You must resolve them, stage the file, and commit to complete the current "
 +"merge.  Only then can you begin another merge.\n"
 +msgstr ""
 +
 +#: lib/merge.tcl:54
 +#, tcl-format
 +msgid ""
 +"You are in the middle of a change.\n"
 +"\n"
 +"File %s is modified.\n"
 +"\n"
 +"You should complete the current commit before starting a merge.  Doing so "
 +"will help you abort a failed merge, should the need arise.\n"
 +msgstr ""
 +
 +#: lib/merge.tcl:106
 +#, tcl-format
 +msgid "%s of %s"
 +msgstr ""
 +
 +#: lib/merge.tcl:119
 +#, tcl-format
- msgid "Merging %s and %s"
++msgid "Merging %s and %s..."
 +msgstr ""
 +
- #: lib/merge.tcl:131
++#: lib/merge.tcl:130
 +msgid "Merge completed successfully."
 +msgstr ""
 +
 +#: lib/merge.tcl:133
 +msgid "Merge failed.  Conflict resolution is required."
 +msgstr ""
 +
 +#: lib/merge.tcl:158
 +#, tcl-format
 +msgid "Merge Into %s"
 +msgstr ""
 +
 +#: lib/merge.tcl:177
 +msgid "Revision To Merge"
 +msgstr ""
 +
 +#: lib/merge.tcl:212
 +msgid ""
 +"Cannot abort while amending.\n"
 +"\n"
 +"You must finish amending this commit.\n"
 +msgstr ""
 +
 +#: lib/merge.tcl:222
 +msgid ""
 +"Abort merge?\n"
 +"\n"
 +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
 +"\n"
 +"Continue with aborting the current merge?"
 +msgstr ""
 +
 +#: lib/merge.tcl:228
 +msgid ""
 +"Reset changes?\n"
 +"\n"
 +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
 +"\n"
 +"Continue with resetting the current changes?"
 +msgstr ""
 +
 +#: lib/merge.tcl:239
 +msgid "Aborting"
 +msgstr ""
 +
 +#: lib/merge.tcl:238
 +msgid "files reset"
 +msgstr ""
 +
 +#: lib/merge.tcl:265
 +msgid "Abort failed."
 +msgstr ""
 +
 +#: lib/merge.tcl:268
 +msgid "Abort completed.  Ready."
 +msgstr ""
 +
 +#: lib/option.tcl:82
 +msgid "Restore Defaults"
 +msgstr ""
 +
 +#: lib/option.tcl:86
 +msgid "Save"
 +msgstr ""
 +
 +#: lib/option.tcl:96
 +#, tcl-format
 +msgid "%s Repository"
 +msgstr ""
 +
 +#: lib/option.tcl:97
 +msgid "Global (All Repositories)"
 +msgstr ""
 +
 +#: lib/option.tcl:103
 +msgid "User Name"
 +msgstr ""
 +
 +#: lib/option.tcl:104
 +msgid "Email Address"
 +msgstr ""
 +
 +#: lib/option.tcl:106
 +msgid "Summarize Merge Commits"
 +msgstr ""
 +
 +#: lib/option.tcl:107
 +msgid "Merge Verbosity"
 +msgstr ""
 +
 +#: lib/option.tcl:108
 +msgid "Show Diffstat After Merge"
 +msgstr ""
 +
 +#: lib/option.tcl:110
 +msgid "Trust File Modification Timestamps"
 +msgstr ""
 +
 +#: lib/option.tcl:111
 +msgid "Prune Tracking Branches During Fetch"
 +msgstr ""
 +
 +#: lib/option.tcl:112
 +msgid "Match Tracking Branches"
 +msgstr ""
 +
 +#: lib/option.tcl:113
 +msgid "Number of Diff Context Lines"
 +msgstr ""
 +
 +#: lib/option.tcl:114
 +msgid "New Branch Name Template"
 +msgstr ""
 +
- #: lib/option.tcl:176
++#: lib/option.tcl:191
++msgid "Spelling Dictionary:"
++msgstr ""
++
++#: lib/option.tcl:215
 +msgid "Change Font"
 +msgstr ""
 +
 +#: lib/option.tcl:180
 +#, tcl-format
 +msgid "Choose %s"
 +msgstr ""
 +
 +#: lib/option.tcl:186
 +msgid "pt."
 +msgstr ""
 +
 +#: lib/option.tcl:200
 +msgid "Preferences"
 +msgstr ""
 +
 +#: lib/option.tcl:235
 +msgid "Failed to completely save options:"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
 +msgid "Delete Remote Branch"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:47
 +msgid "From Repository"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
 +msgid "Remote:"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
 +msgid "Arbitrary URL:"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:84
 +msgid "Branches"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:109
 +msgid "Delete Only If"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:111
 +msgid "Merged Into:"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:119
 +msgid "Always (Do not perform merge checks)"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:152
 +msgid "A branch is required for 'Merged Into'."
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:184
 +#, tcl-format
 +msgid ""
 +"The following branches are not completely merged into %s:\n"
 +"\n"
 +" - %s"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:189
 +#, tcl-format
 +msgid ""
 +"One or more of the merge tests failed because you have not fetched the "
 +"necessary commits.  Try fetching from %s first."
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:207
 +msgid "Please select one or more branches to delete."
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:216
 +msgid ""
 +"Recovering deleted branches is difficult.\n"
 +"\n"
 +"Delete the selected branches?"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:226
 +#, tcl-format
 +msgid "Deleting branches from %s"
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:286
 +msgid "No repository selected."
 +msgstr ""
 +
 +#: lib/remote_branch_delete.tcl:291
 +#, tcl-format
 +msgid "Scanning %s..."
 +msgstr ""
 +
 +#: lib/remote.tcl:165
 +msgid "Prune from"
 +msgstr ""
 +
 +#: lib/remote.tcl:170
 +msgid "Fetch from"
 +msgstr ""
 +
 +#: lib/remote.tcl:213
 +msgid "Push to"
 +msgstr ""
 +
 +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
 +msgid "Cannot write shortcut:"
 +msgstr ""
 +
 +#: lib/shortcut.tcl:136
 +msgid "Cannot write icon:"
 +msgstr ""
 +
++#: lib/spellcheck.tcl:37
++msgid "Not connected to aspell"
++msgstr ""
++
++#: lib/spellcheck.tcl:41
++msgid "Unrecognized aspell version"
++msgstr ""
++
++#: lib/spellcheck.tcl:135
++msgid "No Suggestions"
++msgstr ""
++
++#: lib/spellcheck.tcl:336
++msgid "Unexpected EOF from aspell"
++msgstr ""
++
++#: lib/spellcheck.tcl:340
++msgid "Spell Checker Failed"
++msgstr ""
++
 +#: lib/status_bar.tcl:83
 +#, tcl-format
 +msgid "%s ... %*i of %*i %s (%3i%%)"
 +msgstr ""
 +
 +#: lib/transport.tcl:6
 +#, tcl-format
 +msgid "fetch %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:7
 +#, tcl-format
 +msgid "Fetching new changes from %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:18
 +#, tcl-format
 +msgid "remote prune %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:19
 +#, tcl-format
 +msgid "Pruning tracking branches deleted from %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:25 lib/transport.tcl:71
 +#, tcl-format
 +msgid "push %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:26
 +#, tcl-format
 +msgid "Pushing changes to %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:72
 +#, tcl-format
 +msgid "Pushing %s %s to %s"
 +msgstr ""
 +
 +#: lib/transport.tcl:89
 +msgid "Push Branches"
 +msgstr ""
 +
 +#: lib/transport.tcl:103
 +msgid "Source Branches"
 +msgstr ""
 +
 +#: lib/transport.tcl:120
 +msgid "Destination Repository"
 +msgstr ""
 +
 +#: lib/transport.tcl:158
 +msgid "Transfer Options"
 +msgstr ""
 +
 +#: lib/transport.tcl:160
 +msgid "Force overwrite existing branch (may discard changes)"
 +msgstr ""
 +
 +#: lib/transport.tcl:164
 +msgid "Use thin pack (for slow network connections)"
 +msgstr ""
 +
 +#: lib/transport.tcl:168
 +msgid "Include tags"
 +msgstr ""
diff --cc git-gui/po/glossary/de.po
index 0b33c572b,000000000..35764d1d2
mode 100644,000000..100644
--- a/git-gui/po/glossary/de.po
+++ b/git-gui/po/glossary/de.po
@@@ -1,189 -1,0 +1,189 @@@
 +# Translation of git-gui glossary to German
 +# Copyright (C) 2007 Shawn Pearce, et al.
 +# This file is distributed under the same license as the git package.
 +# Christian Stimming <stimming@tuhh.de>, 2007
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: git-gui glossary\n"
 +"POT-Creation-Date: 2008-01-07 21:20+0100\n"
- "PO-Revision-Date: 2008-01-15 20:32+0100\n"
++"PO-Revision-Date: 2008-02-16 21:48+0100\n"
 +"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 +"Language-Team: German \n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
 +#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
 +msgid ""
 +"English Term (Dear translator: This file will never be visible to the user!)"
 +msgstr ""
 +"Deutsche Übersetzung.\n"
 +"Andere deutsche SCM:\n"
 +"  http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://"
 +"tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po "
 +"(username=guest, password empty, gut),\n"
 +"  http://msdn.microsoft.com/de-de/library/ms181038(vs.80).aspx (MS Visual "
 +"Source Safe, kommerziell),\n"
 +"  http://cvsbook.red-bean.com/translations/german/Kap_06.html "
 +"(mittelmäßig),\n"
 +"  http://tortoisecvs.cvs.sourceforge.net/tortoisecvs/po/TortoiseCVS/de_DE.po?"
 +"view=markup (mittelmäßig),\n"
 +"  http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po "
 +"(username=guest, password empty, schlecht)"
 +
 +#. ""
 +msgid "amend"
 +msgstr "nachbessern (ergänzen)"
 +
 +#. ""
 +msgid "annotate"
 +msgstr "annotieren"
 +
 +#. "A 'branch' is an active line of development."
 +msgid "branch [noun]"
 +msgstr "Zweig"
 +
 +#. ""
 +msgid "branch [verb]"
 +msgstr "verzweigen"
 +
 +#. ""
 +msgid "checkout [noun]"
 +msgstr ""
 +"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? "
 +"Source Safe: Auscheckvorgang)"
 +
 +#. "The action of updating the working tree to a revision which was stored in the object database."
 +msgid "checkout [verb]"
 +msgstr ""
 +"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? "
 +"ausspielen? abrufen? Source Safe: auschecken)"
 +
 +#. ""
 +msgid "clone [verb]"
 +msgstr "klonen"
 +
 +#. "A single point in the git history."
 +msgid "commit [noun]"
 +msgstr ""
 +"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, "
 +"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)"
 +
 +#. "The action of storing a new snapshot of the project's state in the git history."
 +msgid "commit [verb]"
 +msgstr ""
 +"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, "
 +"übergeben?, einspielen?, einpflegen?, ablegen?)"
 +
 +#. ""
 +msgid "diff [noun]"
 +msgstr "Vergleich (Source Safe: Unterschiede)"
 +
 +#. ""
 +msgid "diff [verb]"
 +msgstr "vergleichen"
 +
 +#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
 +msgid "fast forward merge"
 +msgstr "Schnellzusammenführung"
 +
 +#. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
 +msgid "fetch"
 +msgstr "anfordern (holen?)"
 +
 +#. "One context of consecutive lines in a whole patch, which consists of many such hunks"
 +msgid "hunk"
 +msgstr "Kontext"
 +
 +#. "A collection of files. The index is a stored version of your working tree."
 +msgid "index (in git-gui: staging area)"
 +msgstr "Bereitstellung"
 +
 +#. "A successful merge results in the creation of a new commit representing the result of the merge."
 +msgid "merge [noun]"
 +msgstr "Zusammenführung"
 +
 +#. "To bring the contents of another branch into the current branch."
 +msgid "merge [verb]"
 +msgstr "zusammenführen"
 +
 +#. ""
 +msgid "message"
 +msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
 +
 +#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 +msgid "prune"
- msgstr "entfernen"
++msgstr "aufräumen (entfernen?)"
 +
 +#. "Pulling a branch means to fetch it and merge it."
 +msgid "pull"
 +msgstr "übernehmen (ziehen?)"
 +
 +#. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
 +msgid "push"
 +msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)"
 +
 +#. ""
 +msgid "redo"
 +msgstr "wiederholen"
 +
 +#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
 +msgid "remote"
 +msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)"
 +
 +#. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
 +msgid "repository"
 +msgstr "Projektarchiv"
 +
 +#. ""
 +msgid "reset"
 +msgstr "zurücksetzen (zurückkehren?)"
 +
 +#. ""
 +msgid "revert"
 +msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)"
 +
 +#. "A particular state of files and directories which was stored in the object database."
 +msgid "revision"
 +msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)"
 +
 +#. ""
 +msgid "sign off"
 +msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)"
 +
 +#. ""
 +msgid "staging area"
 +msgstr "Bereitstellung"
 +
 +#. ""
 +msgid "status"
 +msgstr "Status"
 +
 +#. "A ref pointing to a tag or commit object"
 +msgid "tag [noun]"
 +msgstr "Markierung"
 +
 +#. ""
 +msgid "tag [verb]"
 +msgstr "markieren"
 +
 +#. "A regular git branch that is used to follow changes from another repository."
 +msgid "tracking branch"
 +msgstr "Übernahmezweig"
 +
 +#. ""
 +msgid "undo"
 +msgstr "rückgängig"
 +
 +#. ""
 +msgid "update"
 +msgstr "aktualisieren"
 +
 +#. ""
 +msgid "verify"
 +msgstr "überprüfen"
 +
 +#. "The tree of actual checked out files."
 +msgid "working copy, working tree"
 +msgstr "Arbeitskopie"