From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 5 Jan 2008 06:03:42 +0000 (-0800)
Subject: Merge git://repo.or.cz/git-gui
X-Git-Tag: v1.5.4-rc3~49
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=144126abf99f2eac48e63b7ea85a8f3f99f814db;p=git.git

Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Make commit log messages end with a newline
  Added Swedish translation.
  git-gui: Unconditionally use absolute paths with Cygwin
  git-gui: Handle file mode changes (644->755) in diff viewer
  git-gui: Move frequently used commands to the top of the context menu.
---

144126abf99f2eac48e63b7ea85a8f3f99f814db
diff --cc git-gui/Makefile
index 26ac4b6bb,000000000..c109eab13
mode 100644,000000..100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@@ -1,309 -1,0 +1,307 @@@
 +all::
 +
 +# Define V=1 to have a more verbose compile.
 +#
 +# Define NO_MSGFMT if you do not have msgfmt from the GNU gettext
 +# package and want to use our rough pure Tcl po->msg translator.
 +# TCL_PATH must be vaild for this to work.
 +#
 +
 +GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 +	@$(SHELL_PATH) ./GIT-VERSION-GEN
 +-include GIT-VERSION-FILE
 +
 +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 +uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
 +
 +SCRIPT_SH = git-gui.sh
 +GITGUI_MAIN := git-gui
 +GITGUI_BUILT_INS = git-citool
 +ALL_LIBFILES = $(wildcard lib/*.tcl)
 +PRELOAD_FILES = lib/class.tcl
 +NONTCL_LIBFILES = \
 +	lib/git-gui.ico \
 +	$(wildcard lib/win32_*.js) \
 +#end NONTCL_LIBFILES
 +
 +ifndef SHELL_PATH
 +	SHELL_PATH = /bin/sh
 +endif
 +
 +ifndef gitexecdir
 +	gitexecdir := $(shell git --exec-path)
 +endif
 +
 +ifndef sharedir
 +	sharedir := $(dir $(gitexecdir))share
 +endif
 +
 +ifndef INSTALL
 +	INSTALL = install
 +endif
 +
 +RM_RF     ?= rm -rf
 +RMDIR     ?= rmdir
 +
 +INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
 +INSTALL_D1 =
 +INSTALL_R0 = $(INSTALL) -m 644 # space is required here
 +INSTALL_R1 =
 +INSTALL_X0 = $(INSTALL) -m 755 # space is required here
 +INSTALL_X1 =
 +INSTALL_A0 = find # space is required here
 +INSTALL_A1 = | cpio -pud
 +INSTALL_L0 = rm -f # space is required here
 +INSTALL_L1 = && ln # space is required here
 +INSTALL_L2 =
 +INSTALL_L3 =
 +
 +REMOVE_D0  = $(RMDIR) # space is required here
 +REMOVE_D1  = || true
 +REMOVE_F0  = $(RM_RF) # space is required here
 +REMOVE_F1  =
 +CLEAN_DST  = true
 +
 +ifndef V
 +	QUIET          = @
 +	QUIET_GEN      = $(QUIET)echo '   ' GEN '$@' &&
 +	QUIET_INDEX    = $(QUIET)echo '   ' INDEX $(dir $@) &&
 +	QUIET_MSGFMT0  = $(QUIET)printf '    MSGFMT %12s ' $@ && v=`
 +	QUIET_MSGFMT1  = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
 +	QUIET_2DEVNULL = 2>/dev/null
 +
 +	INSTALL_D0 = dir=
 +	INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir"
 +	INSTALL_R0 = src=
 +	INSTALL_R1 = && echo '   ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src
 +	INSTALL_X0 = src=
 +	INSTALL_X1 = && echo '   ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src
 +	INSTALL_A0 = src=
 +	INSTALL_A1 = && echo '   ' INSTALL '   ' `basename "$$src"` && find "$$src" | cpio -pud
 +
 +	INSTALL_L0 = dst=
 +	INSTALL_L1 = && src=
 +	INSTALL_L2 = && dst=
 +	INSTALL_L3 = && echo '   ' 'LINK       ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
 +
 +	CLEAN_DST = echo ' ' UNINSTALL
 +	REMOVE_D0 = dir=
 +	REMOVE_D1 = && echo ' ' REMOVE $$dir && test -d "$$dir" && $(RMDIR) "$$dir" || true
 +	REMOVE_F0 = dst=
 +	REMOVE_F1 = && echo '   ' REMOVE `basename "$$dst"` && $(RM_RF) "$$dst"
 +endif
 +
 +TCL_PATH   ?= tclsh
 +TCLTK_PATH ?= wish
 +TKFRAMEWORK = /Library/Frameworks/Tk.framework/Resources/Wish.app
 +
 +ifeq ($(findstring $(MAKEFLAGS),s),s)
 +QUIET_GEN =
 +endif
 +
 +-include config.mak
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
 +SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 +TCL_PATH_SQ = $(subst ','\'',$(TCL_PATH))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +TCLTK_PATH_SED = $(subst ','\'',$(subst \,\\,$(TCLTK_PATH)))
 +
 +gg_libdir ?= $(sharedir)/git-gui/lib
 +libdir_SQ  = $(subst ','\'',$(gg_libdir))
 +libdir_SED = $(subst ','\'',$(subst \,\\,$(gg_libdir)))
 +exedir     = $(dir $(gitexecdir))share/git-gui/lib
 +
 +GITGUI_SCRIPT   := $$0
 +GITGUI_RELATIVE :=
 +GITGUI_MACOSXAPP :=
 +
- ifeq ($(exedir),$(gg_libdir))
- 	GITGUI_RELATIVE := 1
- endif
- 
 +ifeq ($(uname_O),Cygwin)
 +	GITGUI_SCRIPT := `cygpath --windows --absolute "$(GITGUI_SCRIPT)"`
- 	ifeq ($(GITGUI_RELATIVE),)
- 		gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
++	gg_libdir := $(shell cygpath --windows --absolute "$(gg_libdir)")
++else
++	ifeq ($(exedir),$(gg_libdir))
++		GITGUI_RELATIVE := 1
 +	endif
 +endif
 +ifeq ($(uname_S),Darwin)
 +	ifeq ($(shell test -d $(TKFRAMEWORK) && echo y),y)
 +		GITGUI_MACOSXAPP := YesPlease
 +	endif
 +endif
 +ifneq (,$(findstring MINGW,$(uname_S)))
 +	NO_MSGFMT=1
 +	GITGUI_WINDOWS_WRAPPER := YesPlease
 +endif
 +
 +ifdef GITGUI_MACOSXAPP
 +GITGUI_MAIN := git-gui.tcl
 +
 +git-gui: GIT-VERSION-FILE GIT-GUI-VARS
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	echo '#!$(SHELL_PATH_SQ)' >$@+ && \
 +	echo 'if test "z$$*" = zversion ||' >>$@+ && \
 +	echo '   test "z$$*" = z--version' >>$@+ && \
 +	echo then >>$@+ && \
 +	echo '	'echo \'git-gui version '$(GITGUI_VERSION)'\' >>$@+ && \
 +	echo else >>$@+ && \
 +	echo '	'exec \''$(libdir_SQ)/Git Gui.app/Contents/MacOS/Wish'\' \
 +		'"$$0" "$$@"' >>$@+ && \
 +	echo fi >>$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
 +Git\ Gui.app: GIT-VERSION-FILE GIT-GUI-VARS \
 +		macosx/Info.plist \
 +		macosx/git-gui.icns \
 +		macosx/AppMain.tcl \
 +		$(TKFRAMEWORK)/Contents/MacOS/Wish
 +	$(QUIET_GEN)rm -rf '$@' '$@'+ && \
 +	mkdir -p '$@'+/Contents/MacOS && \
 +	mkdir -p '$@'+/Contents/Resources/Scripts && \
 +	cp '$(subst ','\'',$(TKFRAMEWORK))/Contents/MacOS/Wish' \
 +		'$@'+/Contents/MacOS && \
 +	cp macosx/git-gui.icns '$@'+/Contents/Resources && \
 +	sed -e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
 +		macosx/Info.plist \
 +		>'$@'+/Contents/Info.plist && \
 +	sed -e 's|@@gitexecdir@@|$(gitexecdir_SQ)|' \
 +		-e 's|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
 +		macosx/AppMain.tcl \
 +		>'$@'+/Contents/Resources/Scripts/AppMain.tcl && \
 +	mv '$@'+ '$@'
 +endif
 +
 +ifdef GITGUI_WINDOWS_WRAPPER
 +GITGUI_MAIN := git-gui.tcl
 +
 +git-gui: windows/git-gui.sh
 +	cp $< $@
 +endif
 +
 +$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
 +	$(QUIET_GEN)rm -f $@ $@+ && \
 +	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 +		-e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \
 +		-e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \
 +		-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
 +		-e 's|@@GITGUI_RELATIVE@@|$(GITGUI_RELATIVE)|' \
 +		-e '$(GITGUI_RELATIVE)s|@@GITGUI_LIBDIR@@|$(libdir_SED)|' \
 +		git-gui.sh >$@+ && \
 +	chmod +x $@+ && \
 +	mv $@+ $@
 +
 +XGETTEXT   ?= xgettext
 +ifdef NO_MSGFMT
 +	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 +else
 +	MSGFMT ?= msgfmt
 +endif
 +
 +msgsdir     = $(gg_libdir)/msgs
 +msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 +PO_TEMPLATE = po/git-gui.pot
 +ALL_POFILES = $(wildcard po/*.po)
 +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 +
 +$(PO_TEMPLATE): $(SCRIPT_SH) $(ALL_LIBFILES)
 +	$(XGETTEXT) -kmc -LTcl -o $@ $(SCRIPT_SH) $(ALL_LIBFILES)
 +update-po:: $(PO_TEMPLATE)
 +	$(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +$(ALL_MSGFILES): %.msg : %.po
 +	$(QUIET_MSGFMT0)$(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< $(QUIET_MSGFMT1)
 +
 +lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
 +	$(QUIET_INDEX)if echo \
 +	  $(foreach p,$(PRELOAD_FILES),source $p\;) \
 +	  auto_mkindex lib '*.tcl' \
 +	| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
 +	else \
 +	 echo 1>&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
 +	 rm -f $@ ; \
 +	 echo '# Autogenerated by git-gui Makefile' >$@ && \
 +	 echo >>$@ && \
 +	 $(foreach p,$(PRELOAD_FILES) $(ALL_LIBFILES),echo '$(subst lib/,,$p)' >>$@ &&) \
 +	 echo >>$@ ; \
 +	fi
 +
 +TRACK_VARS = \
 +	$(subst ','\'',SHELL_PATH='$(SHELL_PATH_SQ)') \
 +	$(subst ','\'',TCL_PATH='$(TCL_PATH_SQ)') \
 +	$(subst ','\'',TCLTK_PATH='$(TCLTK_PATH_SQ)') \
 +	$(subst ','\'',gitexecdir='$(gitexecdir_SQ)') \
 +	$(subst ','\'',gg_libdir='$(libdir_SQ)') \
 +	GITGUI_MACOSXAPP=$(GITGUI_MACOSXAPP) \
 +#end TRACK_VARS
 +
 +GIT-GUI-VARS: .FORCE-GIT-GUI-VARS
 +	@VARS='$(TRACK_VARS)'; \
 +	if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
 +		echo 1>&2 "    * new locations or Tcl/Tk interpreter"; \
 +		echo 1>$@ "$$VARS"; \
 +	fi
 +
 +ifdef GITGUI_MACOSXAPP
 +all:: git-gui Git\ Gui.app
 +endif
 +ifdef GITGUI_WINDOWS_WRAPPER
 +all:: git-gui
 +endif
 +all:: $(GITGUI_MAIN) lib/tclIndex $(ALL_MSGFILES)
 +
 +install: all
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(INSTALL_X0)git-gui $(INSTALL_X1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(INSTALL_L0)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L1)'$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' $(INSTALL_L2)'$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' $(INSTALL_L3) &&) true
 +ifdef GITGUI_WINDOWS_WRAPPER
 +	$(QUIET)$(INSTALL_R0)git-gui.tcl $(INSTALL_R1) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +endif
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(INSTALL_R0)lib/tclIndex $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +ifdef GITGUI_MACOSXAPP
 +	$(QUIET)$(INSTALL_A0)'Git Gui.app' $(INSTALL_A1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +	$(QUIET)$(INSTALL_X0)git-gui.tcl $(INSTALL_X1) '$(DESTDIR_SQ)$(libdir_SQ)'
 +endif
 +	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(libdir_SQ)' &&) true
 +	$(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(INSTALL_D1)
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(INSTALL_R0)$p $(INSTALL_R1) '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +uninstall:
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(gitexecdir_SQ)'
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui $(REMOVE_F1)
 +	$(QUIET)$(foreach p,$(GITGUI_BUILT_INS), $(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/$p $(REMOVE_F1) &&) true
 +ifdef GITGUI_WINDOWS_WRAPPER
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(gitexecdir_SQ)'/git-gui.tcl $(REMOVE_F1)
 +endif
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(libdir_SQ)'
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/tclIndex $(REMOVE_F1)
 +ifdef GITGUI_MACOSXAPP
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)/Git Gui.app' $(REMOVE_F1)
 +	$(QUIET)$(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/git-gui.tcl $(REMOVE_F1)
 +endif
 +	$(QUIET)$(foreach p,$(ALL_LIBFILES) $(NONTCL_LIBFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(libdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +	$(QUIET)$(CLEAN_DST) '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +	$(QUIET)$(foreach p,$(ALL_MSGFILES), $(REMOVE_F0)'$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) $(REMOVE_F1) &&) true
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(msgsdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)'$(DESTDIR_SQ)$(libdir_SQ)' $(REMOVE_D1)
 +	$(QUIET)$(REMOVE_D0)`dirname '$(DESTDIR_SQ)$(libdir_SQ)'` $(REMOVE_D1)
 +
 +dist-version:
 +	@mkdir -p $(TARDIR)
 +	@echo $(GITGUI_VERSION) > $(TARDIR)/version
 +
 +clean::
 +	$(RM_RF) $(GITGUI_MAIN) lib/tclIndex po/*.msg
 +	$(RM_RF) GIT-VERSION-FILE GIT-GUI-VARS
 +ifdef GITGUI_MACOSXAPP
 +	$(RM_RF) 'Git Gui.app'* git-gui
 +endif
 +ifdef GITGUI_WINDOWS_WRAPPER
 +	$(RM_RF) git-gui
 +endif
 +
 +.PHONY: all install uninstall dist-version clean
 +.PHONY: .FORCE-GIT-VERSION-FILE
 +.PHONY: .FORCE-GIT-GUI-VARS
diff --cc git-gui/git-gui.sh
index 1fca11f27,000000000..fcb2ab2fb
mode 100755,000000..100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@@ -1,2841 -1,0 +1,2841 @@@
 +#!/bin/sh
 +# Tcl ignores the next line -*- tcl -*- \
 + if test "z$*" = zversion \
 + || test "z$*" = z--version; \
 + then \
 +	echo 'git-gui version @@GITGUI_VERSION@@'; \
 +	exit; \
 + fi; \
 + argv0=$0; \
 + exec wish "$argv0" -- "$@"
 +
 +set appvers {@@GITGUI_VERSION@@}
 +set copyright [encoding convertfrom utf-8 {
 +Copyright © 2006, 2007 Shawn Pearce, et. al.
 +
 +This program is free software; you can redistribute it and/or modify
 +it under the terms of the GNU General Public License as published by
 +the Free Software Foundation; either version 2 of the License, or
 +(at your option) any later version.
 +
 +This program is distributed in the hope that it will be useful,
 +but WITHOUT ANY WARRANTY; without even the implied warranty of
 +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +GNU General Public License for more details.
 +
 +You should have received a copy of the GNU General Public License
 +along with this program; if not, write to the Free Software
 +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA}]
 +
 +######################################################################
 +##
 +## Tcl/Tk sanity check
 +
 +if {[catch {package require Tcl 8.4} err]
 + || [catch {package require Tk  8.4} err]
 +} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message $err
 +	exit 1
 +}
 +
 +catch {rename send {}} ; # What an evil concept...
 +
 +######################################################################
 +##
 +## locate our library
 +
 +set oguilib {@@GITGUI_LIBDIR@@}
 +set oguirel {@@GITGUI_RELATIVE@@}
 +if {$oguirel eq {1}} {
 +	set oguilib [file dirname [file dirname [file normalize $argv0]]]
 +	set oguilib [file join $oguilib share git-gui lib]
 +	set oguimsg [file join $oguilib msgs]
 +} elseif {[string match @@* $oguirel]} {
 +	set oguilib [file join [file dirname [file normalize $argv0]] lib]
 +	set oguimsg [file join [file dirname [file normalize $argv0]] po]
 +} else {
 +	set oguimsg [file join $oguilib msgs]
 +}
 +unset oguirel
 +
 +######################################################################
 +##
 +## enable verbose loading?
 +
 +if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
 +	unset _verbose
 +	rename auto_load real__auto_load
 +	proc auto_load {name args} {
 +		puts stderr "auto_load $name"
 +		return [uplevel 1 real__auto_load $name $args]
 +	}
 +	rename source real__source
 +	proc source {name} {
 +		puts stderr "source    $name"
 +		uplevel 1 real__source $name
 +	}
 +}
 +
 +######################################################################
 +##
 +## Internationalization (i18n) through msgcat and gettext. See
 +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
 +
 +package require msgcat
 +
 +proc _mc_trim {fmt} {
 +	set cmk [string first @@ $fmt]
 +	if {$cmk > 0} {
 +		return [string range $fmt 0 [expr {$cmk - 1}]]
 +	}
 +	return $fmt
 +}
 +
 +proc mc {en_fmt args} {
 +	set fmt [_mc_trim [::msgcat::mc $en_fmt]]
 +	if {[catch {set msg [eval [list format $fmt] $args]} err]} {
 +		set msg [eval [list format [_mc_trim $en_fmt]] $args]
 +	}
 +	return $msg
 +}
 +
 +proc strcat {args} {
 +	return [join $args {}]
 +}
 +
 +::msgcat::mcload $oguimsg
 +unset oguimsg
 +
 +######################################################################
 +##
 +## read only globals
 +
 +set _appname {Git Gui}
 +set _gitdir {}
 +set _gitexec {}
 +set _reponame {}
 +set _iscygwin {}
 +set _search_path {}
 +
 +proc appname {} {
 +	global _appname
 +	return $_appname
 +}
 +
 +proc gitdir {args} {
 +	global _gitdir
 +	if {$args eq {}} {
 +		return $_gitdir
 +	}
 +	return [eval [list file join $_gitdir] $args]
 +}
 +
 +proc gitexec {args} {
 +	global _gitexec
 +	if {$_gitexec eq {}} {
 +		if {[catch {set _gitexec [git --exec-path]} err]} {
 +			error "Git not installed?\n\n$err"
 +		}
 +		if {[is_Cygwin]} {
 +			set _gitexec [exec cygpath \
 +				--windows \
 +				--absolute \
 +				$_gitexec]
 +		} else {
 +			set _gitexec [file normalize $_gitexec]
 +		}
 +	}
 +	if {$args eq {}} {
 +		return $_gitexec
 +	}
 +	return [eval [list file join $_gitexec] $args]
 +}
 +
 +proc reponame {} {
 +	return $::_reponame
 +}
 +
 +proc is_MacOSX {} {
 +	if {[tk windowingsystem] eq {aqua}} {
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc is_Windows {} {
 +	if {$::tcl_platform(platform) eq {windows}} {
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc is_Cygwin {} {
 +	global _iscygwin
 +	if {$_iscygwin eq {}} {
 +		if {$::tcl_platform(platform) eq {windows}} {
 +			if {[catch {set p [exec cygpath --windir]} err]} {
 +				set _iscygwin 0
 +			} else {
 +				set _iscygwin 1
 +			}
 +		} else {
 +			set _iscygwin 0
 +		}
 +	}
 +	return $_iscygwin
 +}
 +
 +proc is_enabled {option} {
 +	global enabled_options
 +	if {[catch {set on $enabled_options($option)}]} {return 0}
 +	return $on
 +}
 +
 +proc enable_option {option} {
 +	global enabled_options
 +	set enabled_options($option) 1
 +}
 +
 +proc disable_option {option} {
 +	global enabled_options
 +	set enabled_options($option) 0
 +}
 +
 +######################################################################
 +##
 +## config
 +
 +proc is_many_config {name} {
 +	switch -glob -- $name {
 +	gui.recentrepo -
 +	remote.*.fetch -
 +	remote.*.push
 +		{return 1}
 +	*
 +		{return 0}
 +	}
 +}
 +
 +proc is_config_true {name} {
 +	global repo_config
 +	if {[catch {set v $repo_config($name)}]} {
 +		return 0
 +	} elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
 +		return 1
 +	} else {
 +		return 0
 +	}
 +}
 +
 +proc get_config {name} {
 +	global repo_config
 +	if {[catch {set v $repo_config($name)}]} {
 +		return {}
 +	} else {
 +		return $v
 +	}
 +}
 +
 +######################################################################
 +##
 +## handy utils
 +
 +proc _git_cmd {name} {
 +	global _git_cmd_path
 +
 +	if {[catch {set v $_git_cmd_path($name)}]} {
 +		switch -- $name {
 +		  version   -
 +		--version   -
 +		--exec-path { return [list $::_git $name] }
 +		}
 +
 +		set p [gitexec git-$name$::_search_exe]
 +		if {[file exists $p]} {
 +			set v [list $p]
 +		} elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
 +			# Try to determine what sort of magic will make
 +			# git-$name go and do its thing, because native
 +			# Tcl on Windows doesn't know it.
 +			#
 +			set p [gitexec git-$name]
 +			set f [open $p r]
 +			set s [gets $f]
 +			close $f
 +
 +			switch -glob -- [lindex $s 0] {
 +			#!*sh     { set i sh     }
 +			#!*perl   { set i perl   }
 +			#!*python { set i python }
 +			default   { error "git-$name is not supported: $s" }
 +			}
 +
 +			upvar #0 _$i interp
 +			if {![info exists interp]} {
 +				set interp [_which $i]
 +			}
 +			if {$interp eq {}} {
 +				error "git-$name requires $i (not in PATH)"
 +			}
 +			set v [concat [list $interp] [lrange $s 1 end] [list $p]]
 +		} else {
 +			# Assume it is builtin to git somehow and we
 +			# aren't actually able to see a file for it.
 +			#
 +			set v [list $::_git $name]
 +		}
 +		set _git_cmd_path($name) $v
 +	}
 +	return $v
 +}
 +
 +proc _which {what} {
 +	global env _search_exe _search_path
 +
 +	if {$_search_path eq {}} {
 +		if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
 +			set _search_path [split [exec cygpath \
 +				--windows \
 +				--path \
 +				--absolute \
 +				$env(PATH)] {;}]
 +			set _search_exe .exe
 +		} elseif {[is_Windows]} {
 +			set gitguidir [file dirname [info script]]
 +			regsub -all ";" $gitguidir "\\;" gitguidir
 +			set env(PATH) "$gitguidir;$env(PATH)"
 +			set _search_path [split $env(PATH) {;}]
 +			set _search_exe .exe
 +		} else {
 +			set _search_path [split $env(PATH) :]
 +			set _search_exe {}
 +		}
 +	}
 +
 +	foreach p $_search_path {
 +		set p [file join $p $what$_search_exe]
 +		if {[file exists $p]} {
 +			return [file normalize $p]
 +		}
 +	}
 +	return {}
 +}
 +
 +proc _lappend_nice {cmd_var} {
 +	global _nice
 +	upvar $cmd_var cmd
 +
 +	if {![info exists _nice]} {
 +		set _nice [_which nice]
 +	}
 +	if {$_nice ne {}} {
 +		lappend cmd $_nice
 +	}
 +}
 +
 +proc git {args} {
 +	set opt [list exec]
 +
 +	while {1} {
 +		switch -- [lindex $args 0] {
 +		--nice {
 +			_lappend_nice opt
 +		}
 +
 +		default {
 +			break
 +		}
 +
 +		}
 +
 +		set args [lrange $args 1 end]
 +	}
 +
 +	set cmdp [_git_cmd [lindex $args 0]]
 +	set args [lrange $args 1 end]
 +
 +	return [eval $opt $cmdp $args]
 +}
 +
 +proc _open_stdout_stderr {cmd} {
 +	if {[catch {
 +			set fd [open $cmd r]
 +		} err]} {
 +		if {   [lindex $cmd end] eq {2>@1}
 +		    && $err eq {can not find channel named "1"}
 +			} {
 +			# Older versions of Tcl 8.4 don't have this 2>@1 IO
 +			# redirect operator.  Fallback to |& cat for those.
 +			# The command was not actually started, so its safe
 +			# to try to start it a second time.
 +			#
 +			set fd [open [concat \
 +				[lrange $cmd 0 end-1] \
 +				[list |& cat] \
 +				] r]
 +		} else {
 +			error $err
 +		}
 +	}
 +	fconfigure $fd -eofchar {}
 +	return $fd
 +}
 +
 +proc git_read {args} {
 +	set opt [list |]
 +
 +	while {1} {
 +		switch -- [lindex $args 0] {
 +		--nice {
 +			_lappend_nice opt
 +		}
 +
 +		--stderr {
 +			lappend args 2>@1
 +		}
 +
 +		default {
 +			break
 +		}
 +
 +		}
 +
 +		set args [lrange $args 1 end]
 +	}
 +
 +	set cmdp [_git_cmd [lindex $args 0]]
 +	set args [lrange $args 1 end]
 +
 +	return [_open_stdout_stderr [concat $opt $cmdp $args]]
 +}
 +
 +proc git_write {args} {
 +	set opt [list |]
 +
 +	while {1} {
 +		switch -- [lindex $args 0] {
 +		--nice {
 +			_lappend_nice opt
 +		}
 +
 +		default {
 +			break
 +		}
 +
 +		}
 +
 +		set args [lrange $args 1 end]
 +	}
 +
 +	set cmdp [_git_cmd [lindex $args 0]]
 +	set args [lrange $args 1 end]
 +
 +	return [open [concat $opt $cmdp $args] w]
 +}
 +
 +proc sq {value} {
 +	regsub -all ' $value "'\\''" value
 +	return "'$value'"
 +}
 +
 +proc load_current_branch {} {
 +	global current_branch is_detached
 +
 +	set fd [open [gitdir HEAD] r]
 +	if {[gets $fd ref] < 1} {
 +		set ref {}
 +	}
 +	close $fd
 +
 +	set pfx {ref: refs/heads/}
 +	set len [string length $pfx]
 +	if {[string equal -length $len $pfx $ref]} {
 +		# We're on a branch.  It might not exist.  But
 +		# HEAD looks good enough to be a branch.
 +		#
 +		set current_branch [string range $ref $len end]
 +		set is_detached 0
 +	} else {
 +		# Assume this is a detached head.
 +		#
 +		set current_branch HEAD
 +		set is_detached 1
 +	}
 +}
 +
 +auto_load tk_optionMenu
 +rename tk_optionMenu real__tkOptionMenu
 +proc tk_optionMenu {w varName args} {
 +	set m [eval real__tkOptionMenu $w $varName $args]
 +	$m configure -font font_ui
 +	$w configure -font font_ui
 +	return $m
 +}
 +
 +proc rmsel_tag {text} {
 +	$text tag conf sel \
 +		-background [$text cget -background] \
 +		-foreground [$text cget -foreground] \
 +		-borderwidth 0
 +	$text tag conf in_sel -background lightgray
 +	bind $text <Motion> break
 +	return $text
 +}
 +
 +set root_exists 0
 +bind . <Visibility> {
 +	bind . <Visibility> {}
 +	set root_exists 1
 +}
 +
 +if {[is_Windows]} {
 +	wm iconbitmap . -default $oguilib/git-gui.ico
 +}
 +
 +######################################################################
 +##
 +## config defaults
 +
 +set cursor_ptr arrow
 +font create font_diff -family Courier -size 10
 +font create font_ui
 +catch {
 +	label .dummy
 +	eval font configure font_ui [font actual [.dummy cget -font]]
 +	destroy .dummy
 +}
 +
 +font create font_uiitalic
 +font create font_uibold
 +font create font_diffbold
 +font create font_diffitalic
 +
 +foreach class {Button Checkbutton Entry Label
 +		Labelframe Listbox Menu Message
 +		Radiobutton Spinbox Text} {
 +	option add *$class.font font_ui
 +}
 +unset class
 +
 +if {[is_Windows] || [is_MacOSX]} {
 +	option add *Menu.tearOff 0
 +}
 +
 +if {[is_MacOSX]} {
 +	set M1B M1
 +	set M1T Cmd
 +} else {
 +	set M1B Control
 +	set M1T Ctrl
 +}
 +
 +proc bind_button3 {w cmd} {
 +	bind $w <Any-Button-3> $cmd
 +	if {[is_MacOSX]} {
 +		# Mac OS X sends Button-2 on right click through three-button mouse,
 +		# or through trackpad right-clicking (two-finger touch + click).
 +		bind $w <Any-Button-2> $cmd
 +		bind $w <Control-Button-1> $cmd
 +	}
 +}
 +
 +proc apply_config {} {
 +	global repo_config font_descs
 +
 +	foreach option $font_descs {
 +		set name [lindex $option 0]
 +		set font [lindex $option 1]
 +		if {[catch {
 +			set need_weight 1
 +			foreach {cn cv} $repo_config(gui.$name) {
 +				if {$cn eq {-weight}} {
 +					set need_weight 0
 +				}
 +				font configure $font $cn $cv
 +			}
 +			if {$need_weight} {
 +				font configure $font -weight normal
 +			}
 +			} err]} {
 +			error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
 +		}
 +		foreach {cn cv} [font configure $font] {
 +			font configure ${font}bold $cn $cv
 +			font configure ${font}italic $cn $cv
 +		}
 +		font configure ${font}bold -weight bold
 +		font configure ${font}italic -slant italic
 +	}
 +}
 +
 +set default_config(merge.diffstat) true
 +set default_config(merge.summary) false
 +set default_config(merge.verbosity) 2
 +set default_config(user.name) {}
 +set default_config(user.email) {}
 +
 +set default_config(gui.matchtrackingbranch) false
 +set default_config(gui.pruneduringfetch) false
 +set default_config(gui.trustmtime) false
 +set default_config(gui.diffcontext) 5
 +set default_config(gui.newbranchtemplate) {}
 +set default_config(gui.fontui) [font configure font_ui]
 +set default_config(gui.fontdiff) [font configure font_diff]
 +set font_descs {
 +	{fontui   font_ui   {mc "Main Font"}}
 +	{fontdiff font_diff {mc "Diff/Console Font"}}
 +}
 +
 +######################################################################
 +##
 +## find git
 +
 +set _git  [_which git]
 +if {$_git eq {}} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message [mc "Cannot find git in PATH."]
 +	exit 1
 +}
 +
 +######################################################################
 +##
 +## version check
 +
 +if {[catch {set _git_version [git --version]} err]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message "Cannot determine Git version:
 +
 +$err
 +
 +[appname] requires Git 1.5.0 or later."
 +	exit 1
 +}
 +if {![regsub {^git version } $_git_version {} _git_version]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
 +	exit 1
 +}
 +
 +set _real_git_version $_git_version
 +regsub -- {-dirty$} $_git_version {} _git_version
 +regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
 +regsub {\.rc[0-9]+$} $_git_version {} _git_version
 +regsub {\.GIT$} $_git_version {} _git_version
 +regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
 +
 +if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
 +	catch {wm withdraw .}
 +	if {[tk_messageBox \
 +		-icon warning \
 +		-type yesno \
 +		-default no \
 +		-title "[appname]: warning" \
 +		 -message [mc "Git version cannot be determined.
 +
 +%s claims it is version '%s'.
 +
 +%s requires at least Git 1.5.0 or later.
 +
 +Assume '%s' is version 1.5.0?
 +" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
 +		set _git_version 1.5.0
 +	} else {
 +		exit 1
 +	}
 +}
 +unset _real_git_version
 +
 +proc git-version {args} {
 +	global _git_version
 +
 +	switch [llength $args] {
 +	0 {
 +		return $_git_version
 +	}
 +
 +	2 {
 +		set op [lindex $args 0]
 +		set vr [lindex $args 1]
 +		set cm [package vcompare $_git_version $vr]
 +		return [expr $cm $op 0]
 +	}
 +
 +	4 {
 +		set type [lindex $args 0]
 +		set name [lindex $args 1]
 +		set parm [lindex $args 2]
 +		set body [lindex $args 3]
 +
 +		if {($type ne {proc} && $type ne {method})} {
 +			error "Invalid arguments to git-version"
 +		}
 +		if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
 +			error "Last arm of $type $name must be default"
 +		}
 +
 +		foreach {op vr cb} [lrange $body 0 end-2] {
 +			if {[git-version $op $vr]} {
 +				return [uplevel [list $type $name $parm $cb]]
 +			}
 +		}
 +
 +		return [uplevel [list $type $name $parm [lindex $body end]]]
 +	}
 +
 +	default {
 +		error "git-version >= x"
 +	}
 +
 +	}
 +}
 +
 +if {[git-version < 1.5]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message "[appname] requires Git 1.5.0 or later.
 +
 +You are using [git-version]:
 +
 +[git --version]"
 +	exit 1
 +}
 +
 +######################################################################
 +##
 +## configure our library
 +
 +set idx [file join $oguilib tclIndex]
 +if {[catch {set fd [open $idx r]} err]} {
 +	catch {wm withdraw .}
 +	tk_messageBox \
 +		-icon error \
 +		-type ok \
 +		-title [mc "git-gui: fatal error"] \
 +		-message $err
 +	exit 1
 +}
 +if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
 +	set idx [list]
 +	while {[gets $fd n] >= 0} {
 +		if {$n ne {} && ![string match #* $n]} {
 +			lappend idx $n
 +		}
 +	}
 +} else {
 +	set idx {}
 +}
 +close $fd
 +
 +if {$idx ne {}} {
 +	set loaded [list]
 +	foreach p $idx {
 +		if {[lsearch -exact $loaded $p] >= 0} continue
 +		source [file join $oguilib $p]
 +		lappend loaded $p
 +	}
 +	unset loaded p
 +} else {
 +	set auto_path [concat [list $oguilib] $auto_path]
 +}
 +unset -nocomplain idx fd
 +
 +######################################################################
 +##
 +## config file parsing
 +
 +git-version proc _parse_config {arr_name args} {
 +	>= 1.5.3 {
 +		upvar $arr_name arr
 +		array unset arr
 +		set buf {}
 +		catch {
 +			set fd_rc [eval \
 +				[list git_read config] \
 +				$args \
 +				[list --null --list]]
 +			fconfigure $fd_rc -translation binary
 +			set buf [read $fd_rc]
 +			close $fd_rc
 +		}
 +		foreach line [split $buf "\0"] {
 +			if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
 +				if {[is_many_config $name]} {
 +					lappend arr($name) $value
 +				} else {
 +					set arr($name) $value
 +				}
 +			}
 +		}
 +	}
 +	default {
 +		upvar $arr_name arr
 +		array unset arr
 +		catch {
 +			set fd_rc [eval [list git_read config --list] $args]
 +			while {[gets $fd_rc line] >= 0} {
 +				if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
 +					if {[is_many_config $name]} {
 +						lappend arr($name) $value
 +					} else {
 +						set arr($name) $value
 +					}
 +				}
 +			}
 +			close $fd_rc
 +		}
 +	}
 +}
 +
 +proc load_config {include_global} {
 +	global repo_config global_config default_config
 +
 +	if {$include_global} {
 +		_parse_config global_config --global
 +	}
 +	_parse_config repo_config
 +
 +	foreach name [array names default_config] {
 +		if {[catch {set v $global_config($name)}]} {
 +			set global_config($name) $default_config($name)
 +		}
 +		if {[catch {set v $repo_config($name)}]} {
 +			set repo_config($name) $default_config($name)
 +		}
 +	}
 +}
 +
 +######################################################################
 +##
 +## feature option selection
 +
 +if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
 +	unset _junk
 +} else {
 +	set subcommand gui
 +}
 +if {$subcommand eq {gui.sh}} {
 +	set subcommand gui
 +}
 +if {$subcommand eq {gui} && [llength $argv] > 0} {
 +	set subcommand [lindex $argv 0]
 +	set argv [lrange $argv 1 end]
 +}
 +
 +enable_option multicommit
 +enable_option branch
 +enable_option transport
 +disable_option bare
 +
 +switch -- $subcommand {
 +browser -
 +blame {
 +	enable_option bare
 +
 +	disable_option multicommit
 +	disable_option branch
 +	disable_option transport
 +}
 +citool {
 +	enable_option singlecommit
 +
 +	disable_option multicommit
 +	disable_option branch
 +	disable_option transport
 +}
 +}
 +
 +######################################################################
 +##
 +## repository setup
 +
 +if {[catch {
 +		set _gitdir $env(GIT_DIR)
 +		set _prefix {}
 +		}]
 +	&& [catch {
 +		set _gitdir [git rev-parse --git-dir]
 +		set _prefix [git rev-parse --show-prefix]
 +	} err]} {
 +	load_config 1
 +	apply_config
 +	choose_repository::pick
 +}
 +if {![file isdirectory $_gitdir] && [is_Cygwin]} {
 +	catch {set _gitdir [exec cygpath --windows $_gitdir]}
 +}
 +if {![file isdirectory $_gitdir]} {
 +	catch {wm withdraw .}
 +	error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
 +	exit 1
 +}
 +if {$_prefix ne {}} {
 +	regsub -all {[^/]+/} $_prefix ../ cdup
 +	if {[catch {cd $cdup} err]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
 +		exit 1
 +	}
 +	unset cdup
 +} elseif {![is_enabled bare]} {
 +	if {[lindex [file split $_gitdir] end] ne {.git}} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
 +		exit 1
 +	}
 +	if {[catch {cd [file dirname $_gitdir]} err]} {
 +		catch {wm withdraw .}
 +		error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
 +		exit 1
 +	}
 +}
 +set _reponame [file split [file normalize $_gitdir]]
 +if {[lindex $_reponame end] eq {.git}} {
 +	set _reponame [lindex $_reponame end-1]
 +} else {
 +	set _reponame [lindex $_reponame end]
 +}
 +
 +######################################################################
 +##
 +## global init
 +
 +set current_diff_path {}
 +set current_diff_side {}
 +set diff_actions [list]
 +
 +set HEAD {}
 +set PARENT {}
 +set MERGE_HEAD [list]
 +set commit_type {}
 +set empty_tree {}
 +set current_branch {}
 +set is_detached 0
 +set current_diff_path {}
 +set is_3way_diff 0
 +set selected_commit_type new
 +
 +######################################################################
 +##
 +## task management
 +
 +set rescan_active 0
 +set diff_active 0
 +set last_clicked {}
 +
 +set disable_on_lock [list]
 +set index_lock_type none
 +
 +proc lock_index {type} {
 +	global index_lock_type disable_on_lock
 +
 +	if {$index_lock_type eq {none}} {
 +		set index_lock_type $type
 +		foreach w $disable_on_lock {
 +			uplevel #0 $w disabled
 +		}
 +		return 1
 +	} elseif {$index_lock_type eq "begin-$type"} {
 +		set index_lock_type $type
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc unlock_index {} {
 +	global index_lock_type disable_on_lock
 +
 +	set index_lock_type none
 +	foreach w $disable_on_lock {
 +		uplevel #0 $w normal
 +	}
 +}
 +
 +######################################################################
 +##
 +## status
 +
 +proc repository_state {ctvar hdvar mhvar} {
 +	global current_branch
 +	upvar $ctvar ct $hdvar hd $mhvar mh
 +
 +	set mh [list]
 +
 +	load_current_branch
 +	if {[catch {set hd [git rev-parse --verify HEAD]}]} {
 +		set hd {}
 +		set ct initial
 +		return
 +	}
 +
 +	set merge_head [gitdir MERGE_HEAD]
 +	if {[file exists $merge_head]} {
 +		set ct merge
 +		set fd_mh [open $merge_head r]
 +		while {[gets $fd_mh line] >= 0} {
 +			lappend mh $line
 +		}
 +		close $fd_mh
 +		return
 +	}
 +
 +	set ct normal
 +}
 +
 +proc PARENT {} {
 +	global PARENT empty_tree
 +
 +	set p [lindex $PARENT 0]
 +	if {$p ne {}} {
 +		return $p
 +	}
 +	if {$empty_tree eq {}} {
 +		set empty_tree [git mktree << {}]
 +	}
 +	return $empty_tree
 +}
 +
 +proc rescan {after {honor_trustmtime 1}} {
 +	global HEAD PARENT MERGE_HEAD commit_type
 +	global ui_index ui_workdir ui_comm
 +	global rescan_active file_states
 +	global repo_config
 +
 +	if {$rescan_active > 0 || ![lock_index read]} return
 +
 +	repository_state newType newHEAD newMERGE_HEAD
 +	if {[string match amend* $commit_type]
 +		&& $newType eq {normal}
 +		&& $newHEAD eq $HEAD} {
 +	} else {
 +		set HEAD $newHEAD
 +		set PARENT $newHEAD
 +		set MERGE_HEAD $newMERGE_HEAD
 +		set commit_type $newType
 +	}
 +
 +	array unset file_states
 +
 +	if {!$::GITGUI_BCK_exists &&
 +		(![$ui_comm edit modified]
 +		|| [string trim [$ui_comm get 0.0 end]] eq {})} {
 +		if {[string match amend* $commit_type]} {
 +		} elseif {[load_message GITGUI_MSG]} {
 +		} elseif {[load_message MERGE_MSG]} {
 +		} elseif {[load_message SQUASH_MSG]} {
 +		}
 +		$ui_comm edit reset
 +		$ui_comm edit modified false
 +	}
 +
 +	if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
 +		rescan_stage2 {} $after
 +	} else {
 +		set rescan_active 1
 +		ui_status [mc "Refreshing file status..."]
 +		set fd_rf [git_read update-index \
 +			-q \
 +			--unmerged \
 +			--ignore-missing \
 +			--refresh \
 +			]
 +		fconfigure $fd_rf -blocking 0 -translation binary
 +		fileevent $fd_rf readable \
 +			[list rescan_stage2 $fd_rf $after]
 +	}
 +}
 +
 +if {[is_Cygwin]} {
 +	set is_git_info_link {}
 +	set is_git_info_exclude {}
 +	proc have_info_exclude {} {
 +		global is_git_info_link is_git_info_exclude
 +
 +		if {$is_git_info_link eq {}} {
 +			set is_git_info_link [file isfile [gitdir info.lnk]]
 +		}
 +
 +		if {$is_git_info_link} {
 +			if {$is_git_info_exclude eq {}} {
 +				if {[catch {exec test -f [gitdir info exclude]}]} {
 +					set is_git_info_exclude 0
 +				} else {
 +					set is_git_info_exclude 1
 +				}
 +			}
 +			return $is_git_info_exclude
 +		} else {
 +			return [file readable [gitdir info exclude]]
 +		}
 +	}
 +} else {
 +	proc have_info_exclude {} {
 +		return [file readable [gitdir info exclude]]
 +	}
 +}
 +
 +proc rescan_stage2 {fd after} {
 +	global rescan_active buf_rdi buf_rdf buf_rlo
 +
 +	if {$fd ne {}} {
 +		read $fd
 +		if {![eof $fd]} return
 +		close $fd
 +	}
 +
 +	set ls_others [list --exclude-per-directory=.gitignore]
 +	if {[have_info_exclude]} {
 +		lappend ls_others "--exclude-from=[gitdir info exclude]"
 +	}
 +	set user_exclude [get_config core.excludesfile]
 +	if {$user_exclude ne {} && [file readable $user_exclude]} {
 +		lappend ls_others "--exclude-from=$user_exclude"
 +	}
 +
 +	set buf_rdi {}
 +	set buf_rdf {}
 +	set buf_rlo {}
 +
 +	set rescan_active 3
 +	ui_status [mc "Scanning for modified files ..."]
 +	set fd_di [git_read diff-index --cached -z [PARENT]]
 +	set fd_df [git_read diff-files -z]
 +	set fd_lo [eval git_read ls-files --others -z $ls_others]
 +
 +	fconfigure $fd_di -blocking 0 -translation binary -encoding binary
 +	fconfigure $fd_df -blocking 0 -translation binary -encoding binary
 +	fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
 +	fileevent $fd_di readable [list read_diff_index $fd_di $after]
 +	fileevent $fd_df readable [list read_diff_files $fd_df $after]
 +	fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
 +}
 +
 +proc load_message {file} {
 +	global ui_comm
 +
 +	set f [gitdir $file]
 +	if {[file isfile $f]} {
 +		if {[catch {set fd [open $f r]}]} {
 +			return 0
 +		}
 +		fconfigure $fd -eofchar {}
 +		set content [string trim [read $fd]]
 +		close $fd
 +		regsub -all -line {[ \r\t]+$} $content {} content
 +		$ui_comm delete 0.0 end
 +		$ui_comm insert end $content
 +		return 1
 +	}
 +	return 0
 +}
 +
 +proc read_diff_index {fd after} {
 +	global buf_rdi
 +
 +	append buf_rdi [read $fd]
 +	set c 0
 +	set n [string length $buf_rdi]
 +	while {$c < $n} {
 +		set z1 [string first "\0" $buf_rdi $c]
 +		if {$z1 == -1} break
 +		incr z1
 +		set z2 [string first "\0" $buf_rdi $z1]
 +		if {$z2 == -1} break
 +
 +		incr c
 +		set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
 +		set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
 +		merge_state \
 +			[encoding convertfrom $p] \
 +			[lindex $i 4]? \
 +			[list [lindex $i 0] [lindex $i 2]] \
 +			[list]
 +		set c $z2
 +		incr c
 +	}
 +	if {$c < $n} {
 +		set buf_rdi [string range $buf_rdi $c end]
 +	} else {
 +		set buf_rdi {}
 +	}
 +
 +	rescan_done $fd buf_rdi $after
 +}
 +
 +proc read_diff_files {fd after} {
 +	global buf_rdf
 +
 +	append buf_rdf [read $fd]
 +	set c 0
 +	set n [string length $buf_rdf]
 +	while {$c < $n} {
 +		set z1 [string first "\0" $buf_rdf $c]
 +		if {$z1 == -1} break
 +		incr z1
 +		set z2 [string first "\0" $buf_rdf $z1]
 +		if {$z2 == -1} break
 +
 +		incr c
 +		set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
 +		set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
 +		merge_state \
 +			[encoding convertfrom $p] \
 +			?[lindex $i 4] \
 +			[list] \
 +			[list [lindex $i 0] [lindex $i 2]]
 +		set c $z2
 +		incr c
 +	}
 +	if {$c < $n} {
 +		set buf_rdf [string range $buf_rdf $c end]
 +	} else {
 +		set buf_rdf {}
 +	}
 +
 +	rescan_done $fd buf_rdf $after
 +}
 +
 +proc read_ls_others {fd after} {
 +	global buf_rlo
 +
 +	append buf_rlo [read $fd]
 +	set pck [split $buf_rlo "\0"]
 +	set buf_rlo [lindex $pck end]
 +	foreach p [lrange $pck 0 end-1] {
 +		set p [encoding convertfrom $p]
 +		if {[string index $p end] eq {/}} {
 +			set p [string range $p 0 end-1]
 +		}
 +		merge_state $p ?O
 +	}
 +	rescan_done $fd buf_rlo $after
 +}
 +
 +proc rescan_done {fd buf after} {
 +	global rescan_active current_diff_path
 +	global file_states repo_config
 +	upvar $buf to_clear
 +
 +	if {![eof $fd]} return
 +	set to_clear {}
 +	close $fd
 +	if {[incr rescan_active -1] > 0} return
 +
 +	prune_selection
 +	unlock_index
 +	display_all_files
 +	if {$current_diff_path ne {}} reshow_diff
 +	uplevel #0 $after
 +}
 +
 +proc prune_selection {} {
 +	global file_states selected_paths
 +
 +	foreach path [array names selected_paths] {
 +		if {[catch {set still_here $file_states($path)}]} {
 +			unset selected_paths($path)
 +		}
 +	}
 +}
 +
 +######################################################################
 +##
 +## ui helpers
 +
 +proc mapicon {w state path} {
 +	global all_icons
 +
 +	if {[catch {set r $all_icons($state$w)}]} {
 +		puts "error: no icon for $w state={$state} $path"
 +		return file_plain
 +	}
 +	return $r
 +}
 +
 +proc mapdesc {state path} {
 +	global all_descs
 +
 +	if {[catch {set r $all_descs($state)}]} {
 +		puts "error: no desc for state={$state} $path"
 +		return $state
 +	}
 +	return $r
 +}
 +
 +proc ui_status {msg} {
 +	global main_status
 +	if {[info exists main_status]} {
 +		$main_status show $msg
 +	}
 +}
 +
 +proc ui_ready {{test {}}} {
 +	global main_status
 +	if {[info exists main_status]} {
 +		$main_status show [mc "Ready."] $test
 +	}
 +}
 +
 +proc escape_path {path} {
 +	regsub -all {\\} $path "\\\\" path
 +	regsub -all "\n" $path "\\n" path
 +	return $path
 +}
 +
 +proc short_path {path} {
 +	return [escape_path [lindex [file split $path] end]]
 +}
 +
 +set next_icon_id 0
 +set null_sha1 [string repeat 0 40]
 +
 +proc merge_state {path new_state {head_info {}} {index_info {}}} {
 +	global file_states next_icon_id null_sha1
 +
 +	set s0 [string index $new_state 0]
 +	set s1 [string index $new_state 1]
 +
 +	if {[catch {set info $file_states($path)}]} {
 +		set state __
 +		set icon n[incr next_icon_id]
 +	} else {
 +		set state [lindex $info 0]
 +		set icon [lindex $info 1]
 +		if {$head_info eq {}}  {set head_info  [lindex $info 2]}
 +		if {$index_info eq {}} {set index_info [lindex $info 3]}
 +	}
 +
 +	if     {$s0 eq {?}} {set s0 [string index $state 0]} \
 +	elseif {$s0 eq {_}} {set s0 _}
 +
 +	if     {$s1 eq {?}} {set s1 [string index $state 1]} \
 +	elseif {$s1 eq {_}} {set s1 _}
 +
 +	if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
 +		set head_info [list 0 $null_sha1]
 +	} elseif {$s0 ne {_} && [string index $state 0] eq {_}
 +		&& $head_info eq {}} {
 +		set head_info $index_info
 +	}
 +
 +	set file_states($path) [list $s0$s1 $icon \
 +		$head_info $index_info \
 +		]
 +	return $state
 +}
 +
 +proc display_file_helper {w path icon_name old_m new_m} {
 +	global file_lists
 +
 +	if {$new_m eq {_}} {
 +		set lno [lsearch -sorted -exact $file_lists($w) $path]
 +		if {$lno >= 0} {
 +			set file_lists($w) [lreplace $file_lists($w) $lno $lno]
 +			incr lno
 +			$w conf -state normal
 +			$w delete $lno.0 [expr {$lno + 1}].0
 +			$w conf -state disabled
 +		}
 +	} elseif {$old_m eq {_} && $new_m ne {_}} {
 +		lappend file_lists($w) $path
 +		set file_lists($w) [lsort -unique $file_lists($w)]
 +		set lno [lsearch -sorted -exact $file_lists($w) $path]
 +		incr lno
 +		$w conf -state normal
 +		$w image create $lno.0 \
 +			-align center -padx 5 -pady 1 \
 +			-name $icon_name \
 +			-image [mapicon $w $new_m $path]
 +		$w insert $lno.1 "[escape_path $path]\n"
 +		$w conf -state disabled
 +	} elseif {$old_m ne $new_m} {
 +		$w conf -state normal
 +		$w image conf $icon_name -image [mapicon $w $new_m $path]
 +		$w conf -state disabled
 +	}
 +}
 +
 +proc display_file {path state} {
 +	global file_states selected_paths
 +	global ui_index ui_workdir
 +
 +	set old_m [merge_state $path $state]
 +	set s $file_states($path)
 +	set new_m [lindex $s 0]
 +	set icon_name [lindex $s 1]
 +
 +	set o [string index $old_m 0]
 +	set n [string index $new_m 0]
 +	if {$o eq {U}} {
 +		set o _
 +	}
 +	if {$n eq {U}} {
 +		set n _
 +	}
 +	display_file_helper	$ui_index $path $icon_name $o $n
 +
 +	if {[string index $old_m 0] eq {U}} {
 +		set o U
 +	} else {
 +		set o [string index $old_m 1]
 +	}
 +	if {[string index $new_m 0] eq {U}} {
 +		set n U
 +	} else {
 +		set n [string index $new_m 1]
 +	}
 +	display_file_helper	$ui_workdir $path $icon_name $o $n
 +
 +	if {$new_m eq {__}} {
 +		unset file_states($path)
 +		catch {unset selected_paths($path)}
 +	}
 +}
 +
 +proc display_all_files_helper {w path icon_name m} {
 +	global file_lists
 +
 +	lappend file_lists($w) $path
 +	set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
 +	$w image create end \
 +		-align center -padx 5 -pady 1 \
 +		-name $icon_name \
 +		-image [mapicon $w $m $path]
 +	$w insert end "[escape_path $path]\n"
 +}
 +
 +proc display_all_files {} {
 +	global ui_index ui_workdir
 +	global file_states file_lists
 +	global last_clicked
 +
 +	$ui_index conf -state normal
 +	$ui_workdir conf -state normal
 +
 +	$ui_index delete 0.0 end
 +	$ui_workdir delete 0.0 end
 +	set last_clicked {}
 +
 +	set file_lists($ui_index) [list]
 +	set file_lists($ui_workdir) [list]
 +
 +	foreach path [lsort [array names file_states]] {
 +		set s $file_states($path)
 +		set m [lindex $s 0]
 +		set icon_name [lindex $s 1]
 +
 +		set s [string index $m 0]
 +		if {$s ne {U} && $s ne {_}} {
 +			display_all_files_helper $ui_index $path \
 +				$icon_name $s
 +		}
 +
 +		if {[string index $m 0] eq {U}} {
 +			set s U
 +		} else {
 +			set s [string index $m 1]
 +		}
 +		if {$s ne {_}} {
 +			display_all_files_helper $ui_workdir $path \
 +				$icon_name $s
 +		}
 +	}
 +
 +	$ui_index conf -state disabled
 +	$ui_workdir conf -state disabled
 +}
 +
 +######################################################################
 +##
 +## icons
 +
 +set filemask {
 +#define mask_width 14
 +#define mask_height 15
 +static unsigned char mask_bits[] = {
 +   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
 +   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
 +   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
 +}
 +
 +image create bitmap file_plain -background white -foreground black -data {
 +#define plain_width 14
 +#define plain_height 15
 +static unsigned char plain_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
 +   0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
 +   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_mod -background white -foreground blue -data {
 +#define mod_width 14
 +#define mod_height 15
 +static unsigned char mod_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_fulltick -background white -foreground "#007000" -data {
 +#define file_fulltick_width 14
 +#define file_fulltick_height 15
 +static unsigned char file_fulltick_bits[] = {
 +   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
 +   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
 +   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_parttick -background white -foreground "#005050" -data {
 +#define parttick_width 14
 +#define parttick_height 15
 +static unsigned char parttick_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
 +   0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
 +   0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_question -background white -foreground black -data {
 +#define file_question_width 14
 +#define file_question_height 15
 +static unsigned char file_question_bits[] = {
 +   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
 +   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
 +   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_removed -background white -foreground red -data {
 +#define file_removed_width 14
 +#define file_removed_height 15
 +static unsigned char file_removed_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
 +   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
 +   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +image create bitmap file_merge -background white -foreground blue -data {
 +#define file_merge_width 14
 +#define file_merge_height 15
 +static unsigned char file_merge_bits[] = {
 +   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
 +   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
 +   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 +} -maskdata $filemask
 +
 +set ui_index .vpane.files.index.list
 +set ui_workdir .vpane.files.workdir.list
 +
 +set all_icons(_$ui_index)   file_plain
 +set all_icons(A$ui_index)   file_fulltick
 +set all_icons(M$ui_index)   file_fulltick
 +set all_icons(D$ui_index)   file_removed
 +set all_icons(U$ui_index)   file_merge
 +
 +set all_icons(_$ui_workdir) file_plain
 +set all_icons(M$ui_workdir) file_mod
 +set all_icons(D$ui_workdir) file_question
 +set all_icons(U$ui_workdir) file_merge
 +set all_icons(O$ui_workdir) file_plain
 +
 +set max_status_desc 0
 +foreach i {
 +		{__ {mc "Unmodified"}}
 +
 +		{_M {mc "Modified, not staged"}}
 +		{M_ {mc "Staged for commit"}}
 +		{MM {mc "Portions staged for commit"}}
 +		{MD {mc "Staged for commit, missing"}}
 +
 +		{_O {mc "Untracked, not staged"}}
 +		{A_ {mc "Staged for commit"}}
 +		{AM {mc "Portions staged for commit"}}
 +		{AD {mc "Staged for commit, missing"}}
 +
 +		{_D {mc "Missing"}}
 +		{D_ {mc "Staged for removal"}}
 +		{DO {mc "Staged for removal, still present"}}
 +
 +		{U_ {mc "Requires merge resolution"}}
 +		{UU {mc "Requires merge resolution"}}
 +		{UM {mc "Requires merge resolution"}}
 +		{UD {mc "Requires merge resolution"}}
 +	} {
 +	set text [eval [lindex $i 1]]
 +	if {$max_status_desc < [string length $text]} {
 +		set max_status_desc [string length $text]
 +	}
 +	set all_descs([lindex $i 0]) $text
 +}
 +unset i
 +
 +######################################################################
 +##
 +## util
 +
 +proc scrollbar2many {list mode args} {
 +	foreach w $list {eval $w $mode $args}
 +}
 +
 +proc many2scrollbar {list mode sb top bottom} {
 +	$sb set $top $bottom
 +	foreach w $list {$w $mode moveto $top}
 +}
 +
 +proc incr_font_size {font {amt 1}} {
 +	set sz [font configure $font -size]
 +	incr sz $amt
 +	font configure $font -size $sz
 +	font configure ${font}bold -size $sz
 +	font configure ${font}italic -size $sz
 +}
 +
 +######################################################################
 +##
 +## ui commands
 +
 +set starting_gitk_msg [mc "Starting gitk... please wait..."]
 +
 +proc do_gitk {revs} {
 +	# -- Always start gitk through whatever we were loaded with.  This
 +	#    lets us bypass using shell process on Windows systems.
 +	#
 +	set exe [file join [file dirname $::_git] gitk]
 +	set cmd [list [info nameofexecutable] $exe]
 +	if {! [file exists $exe]} {
 +		error_popup [mc "Unable to start gitk:\n\n%s does not exist" $exe]
 +	} else {
 +		global env
 +
 +		if {[info exists env(GIT_DIR)]} {
 +			set old_GIT_DIR $env(GIT_DIR)
 +		} else {
 +			set old_GIT_DIR {}
 +		}
 +
 +		set pwd [pwd]
 +		cd [file dirname [gitdir]]
 +		set env(GIT_DIR) [file tail [gitdir]]
 +
 +		eval exec $cmd $revs &
 +
 +		if {$old_GIT_DIR eq {}} {
 +			unset env(GIT_DIR)
 +		} else {
 +			set env(GIT_DIR) $old_GIT_DIR
 +		}
 +		cd $pwd
 +
 +		ui_status $::starting_gitk_msg
 +		after 10000 {
 +			ui_ready $starting_gitk_msg
 +		}
 +	}
 +}
 +
 +set is_quitting 0
 +
 +proc do_quit {} {
 +	global ui_comm is_quitting repo_config commit_type
 +	global GITGUI_BCK_exists GITGUI_BCK_i
 +
 +	if {$is_quitting} return
 +	set is_quitting 1
 +
 +	if {[winfo exists $ui_comm]} {
 +		# -- Stash our current commit buffer.
 +		#
 +		set save [gitdir GITGUI_MSG]
 +		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
 +			file rename -force [gitdir GITGUI_BCK] $save
 +			set GITGUI_BCK_exists 0
 +		} else {
 +			set msg [string trim [$ui_comm get 0.0 end]]
 +			regsub -all -line {[ \r\t]+$} $msg {} msg
 +			if {(![string match amend* $commit_type]
 +				|| [$ui_comm edit modified])
 +				&& $msg ne {}} {
 +				catch {
 +					set fd [open $save w]
 +					puts -nonewline $fd $msg
 +					close $fd
 +				}
 +			} else {
 +				catch {file delete $save}
 +			}
 +		}
 +
 +		# -- Remove our editor backup, its not needed.
 +		#
 +		after cancel $GITGUI_BCK_i
 +		if {$GITGUI_BCK_exists} {
 +			catch {file delete [gitdir GITGUI_BCK]}
 +		}
 +
 +		# -- Stash our current window geometry into this repository.
 +		#
 +		set cfg_geometry [list]
 +		lappend cfg_geometry [wm geometry .]
 +		lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
 +		lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
 +		if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
 +			set rc_geometry {}
 +		}
 +		if {$cfg_geometry ne $rc_geometry} {
 +			catch {git config gui.geometry $cfg_geometry}
 +		}
 +	}
 +
 +	destroy .
 +}
 +
 +proc do_rescan {} {
 +	rescan ui_ready
 +}
 +
 +proc do_commit {} {
 +	commit_tree
 +}
 +
 +proc toggle_or_diff {w x y} {
 +	global file_states file_lists current_diff_path ui_index ui_workdir
 +	global last_clicked selected_paths
 +
 +	set pos [split [$w index @$x,$y] .]
 +	set lno [lindex $pos 0]
 +	set col [lindex $pos 1]
 +	set path [lindex $file_lists($w) [expr {$lno - 1}]]
 +	if {$path eq {}} {
 +		set last_clicked {}
 +		return
 +	}
 +
 +	set last_clicked [list $w $lno]
 +	array unset selected_paths
 +	$ui_index tag remove in_sel 0.0 end
 +	$ui_workdir tag remove in_sel 0.0 end
 +
 +	if {$col == 0} {
 +		if {$current_diff_path eq $path} {
 +			set after {reshow_diff;}
 +		} else {
 +			set after {}
 +		}
 +		if {$w eq $ui_index} {
 +			update_indexinfo \
 +				"Unstaging [short_path $path] from commit" \
 +				[list $path] \
 +				[concat $after [list ui_ready]]
 +		} elseif {$w eq $ui_workdir} {
 +			update_index \
 +				"Adding [short_path $path]" \
 +				[list $path] \
 +				[concat $after [list ui_ready]]
 +		}
 +	} else {
 +		show_diff $path $w $lno
 +	}
 +}
 +
 +proc add_one_to_selection {w x y} {
 +	global file_lists last_clicked selected_paths
 +
 +	set lno [lindex [split [$w index @$x,$y] .] 0]
 +	set path [lindex $file_lists($w) [expr {$lno - 1}]]
 +	if {$path eq {}} {
 +		set last_clicked {}
 +		return
 +	}
 +
 +	if {$last_clicked ne {}
 +		&& [lindex $last_clicked 0] ne $w} {
 +		array unset selected_paths
 +		[lindex $last_clicked 0] tag remove in_sel 0.0 end
 +	}
 +
 +	set last_clicked [list $w $lno]
 +	if {[catch {set in_sel $selected_paths($path)}]} {
 +		set in_sel 0
 +	}
 +	if {$in_sel} {
 +		unset selected_paths($path)
 +		$w tag remove in_sel $lno.0 [expr {$lno + 1}].0
 +	} else {
 +		set selected_paths($path) 1
 +		$w tag add in_sel $lno.0 [expr {$lno + 1}].0
 +	}
 +}
 +
 +proc add_range_to_selection {w x y} {
 +	global file_lists last_clicked selected_paths
 +
 +	if {[lindex $last_clicked 0] ne $w} {
 +		toggle_or_diff $w $x $y
 +		return
 +	}
 +
 +	set lno [lindex [split [$w index @$x,$y] .] 0]
 +	set lc [lindex $last_clicked 1]
 +	if {$lc < $lno} {
 +		set begin $lc
 +		set end $lno
 +	} else {
 +		set begin $lno
 +		set end $lc
 +	}
 +
 +	foreach path [lrange $file_lists($w) \
 +		[expr {$begin - 1}] \
 +		[expr {$end - 1}]] {
 +		set selected_paths($path) 1
 +	}
 +	$w tag add in_sel $begin.0 [expr {$end + 1}].0
 +}
 +
 +######################################################################
 +##
 +## ui construction
 +
 +load_config 0
 +apply_config
 +set ui_comm {}
 +
 +# -- Menu Bar
 +#
 +menu .mbar -tearoff 0
 +.mbar add cascade -label [mc Repository] -menu .mbar.repository
 +.mbar add cascade -label [mc Edit] -menu .mbar.edit
 +if {[is_enabled branch]} {
 +	.mbar add cascade -label [mc Branch] -menu .mbar.branch
 +}
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	.mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
 +}
 +if {[is_enabled transport]} {
 +	.mbar add cascade -label [mc Merge] -menu .mbar.merge
 +	.mbar add cascade -label [mc Remote] -menu .mbar.remote
 +}
 +. configure -menu .mbar
 +
 +# -- Repository Menu
 +#
 +menu .mbar.repository
 +
 +.mbar.repository add command \
 +	-label [mc "Browse Current Branch's Files"] \
 +	-command {browser::new $current_branch}
 +set ui_browse_current [.mbar.repository index last]
 +.mbar.repository add command \
 +	-label [mc "Browse Branch Files..."] \
 +	-command browser_open::dialog
 +.mbar.repository add separator
 +
 +.mbar.repository add command \
 +	-label [mc "Visualize Current Branch's History"] \
 +	-command {do_gitk $current_branch}
 +set ui_visualize_current [.mbar.repository index last]
 +.mbar.repository add command \
 +	-label [mc "Visualize All Branch History"] \
 +	-command {do_gitk --all}
 +.mbar.repository add separator
 +
 +proc current_branch_write {args} {
 +	global current_branch
 +	.mbar.repository entryconf $::ui_browse_current \
 +		-label [mc "Browse %s's Files" $current_branch]
 +	.mbar.repository entryconf $::ui_visualize_current \
 +		-label [mc "Visualize %s's History" $current_branch]
 +}
 +trace add variable current_branch write current_branch_write
 +
 +if {[is_enabled multicommit]} {
 +	.mbar.repository add command -label [mc "Database Statistics"] \
 +		-command do_stats
 +
 +	.mbar.repository add command -label [mc "Compress Database"] \
 +		-command do_gc
 +
 +	.mbar.repository add command -label [mc "Verify Database"] \
 +		-command do_fsck_objects
 +
 +	.mbar.repository add separator
 +
 +	if {[is_Cygwin]} {
 +		.mbar.repository add command \
 +			-label [mc "Create Desktop Icon"] \
 +			-command do_cygwin_shortcut
 +	} elseif {[is_Windows]} {
 +		.mbar.repository add command \
 +			-label [mc "Create Desktop Icon"] \
 +			-command do_windows_shortcut
 +	} elseif {[is_MacOSX]} {
 +		.mbar.repository add command \
 +			-label [mc "Create Desktop Icon"] \
 +			-command do_macosx_app
 +	}
 +}
 +
 +.mbar.repository add command -label [mc Quit] \
 +	-command do_quit \
 +	-accelerator $M1T-Q
 +
 +# -- Edit Menu
 +#
 +menu .mbar.edit
 +.mbar.edit add command -label [mc Undo] \
 +	-command {catch {[focus] edit undo}} \
 +	-accelerator $M1T-Z
 +.mbar.edit add command -label [mc Redo] \
 +	-command {catch {[focus] edit redo}} \
 +	-accelerator $M1T-Y
 +.mbar.edit add separator
 +.mbar.edit add command -label [mc Cut] \
 +	-command {catch {tk_textCut [focus]}} \
 +	-accelerator $M1T-X
 +.mbar.edit add command -label [mc Copy] \
 +	-command {catch {tk_textCopy [focus]}} \
 +	-accelerator $M1T-C
 +.mbar.edit add command -label [mc Paste] \
 +	-command {catch {tk_textPaste [focus]; [focus] see insert}} \
 +	-accelerator $M1T-V
 +.mbar.edit add command -label [mc Delete] \
 +	-command {catch {[focus] delete sel.first sel.last}} \
 +	-accelerator Del
 +.mbar.edit add separator
 +.mbar.edit add command -label [mc "Select All"] \
 +	-command {catch {[focus] tag add sel 0.0 end}} \
 +	-accelerator $M1T-A
 +
 +# -- Branch Menu
 +#
 +if {[is_enabled branch]} {
 +	menu .mbar.branch
 +
 +	.mbar.branch add command -label [mc "Create..."] \
 +		-command branch_create::dialog \
 +		-accelerator $M1T-N
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Checkout..."] \
 +		-command branch_checkout::dialog \
 +		-accelerator $M1T-O
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Rename..."] \
 +		-command branch_rename::dialog
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Delete..."] \
 +		-command branch_delete::dialog
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +
 +	.mbar.branch add command -label [mc "Reset..."] \
 +		-command merge::reset_hard
 +	lappend disable_on_lock [list .mbar.branch entryconf \
 +		[.mbar.branch index last] -state]
 +}
 +
 +# -- Commit Menu
 +#
 +if {[is_enabled multicommit] || [is_enabled singlecommit]} {
 +	menu .mbar.commit
 +
 +	.mbar.commit add radiobutton \
 +		-label [mc "New Commit"] \
 +		-command do_select_commit_type \
 +		-variable selected_commit_type \
 +		-value new
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add radiobutton \
 +		-label [mc "Amend Last Commit"] \
 +		-command do_select_commit_type \
 +		-variable selected_commit_type \
 +		-value amend
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add separator
 +
 +	.mbar.commit add command -label [mc Rescan] \
 +		-command do_rescan \
 +		-accelerator F5
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Stage To Commit"] \
 +		-command do_add_selection \
 +		-accelerator $M1T-T
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
 +		-command do_add_all \
 +		-accelerator $M1T-I
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Unstage From Commit"] \
 +		-command do_unstage_selection
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add command -label [mc "Revert Changes"] \
 +		-command do_revert_selection
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +
 +	.mbar.commit add separator
 +
 +	.mbar.commit add command -label [mc "Sign Off"] \
 +		-command do_signoff \
 +		-accelerator $M1T-S
 +
 +	.mbar.commit add command -label [mc Commit@@verb] \
 +		-command do_commit \
 +		-accelerator $M1T-Return
 +	lappend disable_on_lock \
 +		[list .mbar.commit entryconf [.mbar.commit index last] -state]
 +}
 +
 +# -- Merge Menu
 +#
 +if {[is_enabled branch]} {
 +	menu .mbar.merge
 +	.mbar.merge add command -label [mc "Local Merge..."] \
 +		-command merge::dialog \
 +		-accelerator $M1T-M
 +	lappend disable_on_lock \
 +		[list .mbar.merge entryconf [.mbar.merge index last] -state]
 +	.mbar.merge add command -label [mc "Abort Merge..."] \
 +		-command merge::reset_hard
 +	lappend disable_on_lock \
 +		[list .mbar.merge entryconf [.mbar.merge index last] -state]
 +}
 +
 +# -- Transport Menu
 +#
 +if {[is_enabled transport]} {
 +	menu .mbar.remote
 +
 +	.mbar.remote add command \
 +		-label [mc "Push..."] \
 +		-command do_push_anywhere \
 +		-accelerator $M1T-P
 +	.mbar.remote add command \
 +		-label [mc "Delete..."] \
 +		-command remote_branch_delete::dialog
 +}
 +
 +if {[is_MacOSX]} {
 +	# -- Apple Menu (Mac OS X only)
 +	#
 +	.mbar add cascade -label [mc Apple] -menu .mbar.apple
 +	menu .mbar.apple
 +
 +	.mbar.apple add command -label [mc "About %s" [appname]] \
 +		-command do_about
 +	.mbar.apple add separator
 +	.mbar.apple add command \
 +		-label [mc "Preferences..."] \
 +		-command do_options \
 +		-accelerator $M1T-,
 +	bind . <$M1B-,> do_options
 +} else {
 +	# -- Edit Menu
 +	#
 +	.mbar.edit add separator
 +	.mbar.edit add command -label [mc "Options..."] \
 +		-command do_options
 +}
 +
 +# -- Help Menu
 +#
 +.mbar add cascade -label [mc Help] -menu .mbar.help
 +menu .mbar.help
 +
 +if {![is_MacOSX]} {
 +	.mbar.help add command -label [mc "About %s" [appname]] \
 +		-command do_about
 +}
 +
 +set browser {}
 +catch {set browser $repo_config(instaweb.browser)}
 +set doc_path [file dirname [gitexec]]
 +set doc_path [file join $doc_path Documentation index.html]
 +
 +if {[is_Cygwin]} {
 +	set doc_path [exec cygpath --mixed $doc_path]
 +}
 +
 +if {$browser eq {}} {
 +	if {[is_MacOSX]} {
 +		set browser open
 +	} elseif {[is_Cygwin]} {
 +		set program_files [file dirname [exec cygpath --windir]]
 +		set program_files [file join $program_files {Program Files}]
 +		set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
 +		set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
 +		if {[file exists $firefox]} {
 +			set browser $firefox
 +		} elseif {[file exists $ie]} {
 +			set browser $ie
 +		}
 +		unset program_files firefox ie
 +	}
 +}
 +
 +if {[file isfile $doc_path]} {
 +	set doc_url "file:$doc_path"
 +} else {
 +	set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
 +}
 +
 +if {$browser ne {}} {
 +	.mbar.help add command -label [mc "Online Documentation"] \
 +		-command [list exec $browser $doc_url &]
 +}
 +unset browser doc_path doc_url
 +
 +# -- Standard bindings
 +#
 +wm protocol . WM_DELETE_WINDOW do_quit
 +bind all <$M1B-Key-q> do_quit
 +bind all <$M1B-Key-Q> do_quit
 +bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
 +bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
 +
 +set subcommand_args {}
 +proc usage {} {
 +	puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
 +	exit 1
 +}
 +
 +# -- Not a normal commit type invocation?  Do that instead!
 +#
 +switch -- $subcommand {
 +browser -
 +blame {
 +	set subcommand_args {rev? path}
 +	if {$argv eq {}} usage
 +	set head {}
 +	set path {}
 +	set is_path 0
 +	foreach a $argv {
 +		if {$is_path || [file exists $_prefix$a]} {
 +			if {$path ne {}} usage
 +			set path $_prefix$a
 +			break
 +		} elseif {$a eq {--}} {
 +			if {$path ne {}} {
 +				if {$head ne {}} usage
 +				set head $path
 +				set path {}
 +			}
 +			set is_path 1
 +		} elseif {$head eq {}} {
 +			if {$head ne {}} usage
 +			set head $a
 +			set is_path 1
 +		} else {
 +			usage
 +		}
 +	}
 +	unset is_path
 +
 +	if {$head ne {} && $path eq {}} {
 +		set path $_prefix$head
 +		set head {}
 +	}
 +
 +	if {$head eq {}} {
 +		load_current_branch
 +	} else {
 +		if {[regexp {^[0-9a-f]{1,39}$} $head]} {
 +			if {[catch {
 +					set head [git rev-parse --verify $head]
 +				} err]} {
 +				puts stderr $err
 +				exit 1
 +			}
 +		}
 +		set current_branch $head
 +	}
 +
 +	switch -- $subcommand {
 +	browser {
 +		if {$head eq {}} {
 +			if {$path ne {} && [file isdirectory $path]} {
 +				set head $current_branch
 +			} else {
 +				set head $path
 +				set path {}
 +			}
 +		}
 +		browser::new $head $path
 +	}
 +	blame   {
 +		if {$head eq {} && ![file exists $path]} {
 +			puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
 +			exit 1
 +		}
 +		blame::new $head $path
 +	}
 +	}
 +	return
 +}
 +citool -
 +gui {
 +	if {[llength $argv] != 0} {
 +		puts -nonewline stderr "usage: $argv0"
 +		if {$subcommand ne {gui}
 +			&& [file tail $argv0] ne "git-$subcommand"} {
 +			puts -nonewline stderr " $subcommand"
 +		}
 +		puts stderr {}
 +		exit 1
 +	}
 +	# fall through to setup UI for commits
 +}
 +default {
 +	puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
 +	exit 1
 +}
 +}
 +
 +# -- Branch Control
 +#
 +frame .branch \
 +	-borderwidth 1 \
 +	-relief sunken
 +label .branch.l1 \
 +	-text [mc "Current Branch:"] \
 +	-anchor w \
 +	-justify left
 +label .branch.cb \
 +	-textvariable current_branch \
 +	-anchor w \
 +	-justify left
 +pack .branch.l1 -side left
 +pack .branch.cb -side left -fill x
 +pack .branch -side top -fill x
 +
 +# -- Main Window Layout
 +#
 +panedwindow .vpane -orient horizontal
 +panedwindow .vpane.files -orient vertical
 +.vpane add .vpane.files -sticky nsew -height 100 -width 200
 +pack .vpane -anchor n -side top -fill both -expand 1
 +
 +# -- Index File List
 +#
 +frame .vpane.files.index -height 100 -width 200
 +label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
 +	-background lightgreen
 +text $ui_index -background white -borderwidth 0 \
 +	-width 20 -height 10 \
 +	-wrap none \
 +	-cursor $cursor_ptr \
 +	-xscrollcommand {.vpane.files.index.sx set} \
 +	-yscrollcommand {.vpane.files.index.sy set} \
 +	-state disabled
 +scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
 +scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
 +pack .vpane.files.index.title -side top -fill x
 +pack .vpane.files.index.sx -side bottom -fill x
 +pack .vpane.files.index.sy -side right -fill y
 +pack $ui_index -side left -fill both -expand 1
 +
 +# -- Working Directory File List
 +#
 +frame .vpane.files.workdir -height 100 -width 200
 +label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 +	-background lightsalmon
 +text $ui_workdir -background white -borderwidth 0 \
 +	-width 20 -height 10 \
 +	-wrap none \
 +	-cursor $cursor_ptr \
 +	-xscrollcommand {.vpane.files.workdir.sx set} \
 +	-yscrollcommand {.vpane.files.workdir.sy set} \
 +	-state disabled
 +scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
 +scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
 +pack .vpane.files.workdir.title -side top -fill x
 +pack .vpane.files.workdir.sx -side bottom -fill x
 +pack .vpane.files.workdir.sy -side right -fill y
 +pack $ui_workdir -side left -fill both -expand 1
 +
 +.vpane.files add .vpane.files.workdir -sticky nsew
 +.vpane.files add .vpane.files.index -sticky nsew
 +
 +foreach i [list $ui_index $ui_workdir] {
 +	rmsel_tag $i
 +	$i tag conf in_diff -background [$i tag cget in_sel -background]
 +}
 +unset i
 +
 +# -- Diff and Commit Area
 +#
 +frame .vpane.lower -height 300 -width 400
 +frame .vpane.lower.commarea
 +frame .vpane.lower.diff -relief sunken -borderwidth 1
 +pack .vpane.lower.diff -fill both -expand 1
 +pack .vpane.lower.commarea -side bottom -fill x
 +.vpane add .vpane.lower -sticky nsew
 +
 +# -- Commit Area Buttons
 +#
 +frame .vpane.lower.commarea.buttons
 +label .vpane.lower.commarea.buttons.l -text {} \
 +	-anchor w \
 +	-justify left
 +pack .vpane.lower.commarea.buttons.l -side top -fill x
 +pack .vpane.lower.commarea.buttons -side left -fill y
 +
 +button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
 +	-command do_rescan
 +pack .vpane.lower.commarea.buttons.rescan -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.rescan conf -state}
 +
 +button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
 +	-command do_add_all
 +pack .vpane.lower.commarea.buttons.incall -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.incall conf -state}
 +
 +button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
 +	-command do_signoff
 +pack .vpane.lower.commarea.buttons.signoff -side top -fill x
 +
 +button .vpane.lower.commarea.buttons.commit -text [mc Commit@@verb] \
 +	-command do_commit
 +pack .vpane.lower.commarea.buttons.commit -side top -fill x
 +lappend disable_on_lock \
 +	{.vpane.lower.commarea.buttons.commit conf -state}
 +
 +button .vpane.lower.commarea.buttons.push -text [mc Push] \
 +	-command do_push_anywhere
 +pack .vpane.lower.commarea.buttons.push -side top -fill x
 +
 +# -- Commit Message Buffer
 +#
 +frame .vpane.lower.commarea.buffer
 +frame .vpane.lower.commarea.buffer.header
 +set ui_comm .vpane.lower.commarea.buffer.t
 +set ui_coml .vpane.lower.commarea.buffer.header.l
 +radiobutton .vpane.lower.commarea.buffer.header.new \
 +	-text [mc "New Commit"] \
 +	-command do_select_commit_type \
 +	-variable selected_commit_type \
 +	-value new
 +lappend disable_on_lock \
 +	[list .vpane.lower.commarea.buffer.header.new conf -state]
 +radiobutton .vpane.lower.commarea.buffer.header.amend \
 +	-text [mc "Amend Last Commit"] \
 +	-command do_select_commit_type \
 +	-variable selected_commit_type \
 +	-value amend
 +lappend disable_on_lock \
 +	[list .vpane.lower.commarea.buffer.header.amend conf -state]
 +label $ui_coml \
 +	-anchor w \
 +	-justify left
 +proc trace_commit_type {varname args} {
 +	global ui_coml commit_type
 +	switch -glob -- $commit_type {
 +	initial       {set txt [mc "Initial Commit Message:"]}
 +	amend         {set txt [mc "Amended Commit Message:"]}
 +	amend-initial {set txt [mc "Amended Initial Commit Message:"]}
 +	amend-merge   {set txt [mc "Amended Merge Commit Message:"]}
 +	merge         {set txt [mc "Merge Commit Message:"]}
 +	*             {set txt [mc "Commit Message:"]}
 +	}
 +	$ui_coml conf -text $txt
 +}
 +trace add variable commit_type write trace_commit_type
 +pack $ui_coml -side left -fill x
 +pack .vpane.lower.commarea.buffer.header.amend -side right
 +pack .vpane.lower.commarea.buffer.header.new -side right
 +
 +text $ui_comm -background white -borderwidth 1 \
 +	-undo true \
 +	-maxundo 20 \
 +	-autoseparators true \
 +	-relief sunken \
 +	-width 75 -height 9 -wrap none \
 +	-font font_diff \
 +	-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 +scrollbar .vpane.lower.commarea.buffer.sby \
 +	-command [list $ui_comm yview]
 +pack .vpane.lower.commarea.buffer.header -side top -fill x
 +pack .vpane.lower.commarea.buffer.sby -side right -fill y
 +pack $ui_comm -side left -fill y
 +pack .vpane.lower.commarea.buffer -side left -fill y
 +
 +# -- Commit Message Buffer Context Menu
 +#
 +set ctxm .vpane.lower.commarea.buffer.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +	-label [mc Cut] \
 +	-command {tk_textCut $ui_comm}
 +$ctxm add command \
 +	-label [mc Copy] \
 +	-command {tk_textCopy $ui_comm}
 +$ctxm add command \
 +	-label [mc Paste] \
 +	-command {tk_textPaste $ui_comm}
 +$ctxm add command \
 +	-label [mc Delete] \
 +	-command {$ui_comm delete sel.first sel.last}
 +$ctxm add separator
 +$ctxm add command \
 +	-label [mc "Select All"] \
 +	-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
 +$ctxm add command \
 +	-label [mc "Copy All"] \
 +	-command {
 +		$ui_comm tag add sel 0.0 end
 +		tk_textCopy $ui_comm
 +		$ui_comm tag remove sel 0.0 end
 +	}
 +$ctxm add separator
 +$ctxm add command \
 +	-label [mc "Sign Off"] \
 +	-command do_signoff
 +bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
 +
 +# -- Diff Header
 +#
 +proc trace_current_diff_path {varname args} {
 +	global current_diff_path diff_actions file_states
 +	if {$current_diff_path eq {}} {
 +		set s {}
 +		set f {}
 +		set p {}
 +		set o disabled
 +	} else {
 +		set p $current_diff_path
 +		set s [mapdesc [lindex $file_states($p) 0] $p]
 +		set f [mc "File:"]
 +		set p [escape_path $p]
 +		set o normal
 +	}
 +
 +	.vpane.lower.diff.header.status configure -text $s
 +	.vpane.lower.diff.header.file configure -text $f
 +	.vpane.lower.diff.header.path configure -text $p
 +	foreach w $diff_actions {
 +		uplevel #0 $w $o
 +	}
 +}
 +trace add variable current_diff_path write trace_current_diff_path
 +
 +frame .vpane.lower.diff.header -background gold
 +label .vpane.lower.diff.header.status \
 +	-background gold \
 +	-width $max_status_desc \
 +	-anchor w \
 +	-justify left
 +label .vpane.lower.diff.header.file \
 +	-background gold \
 +	-anchor w \
 +	-justify left
 +label .vpane.lower.diff.header.path \
 +	-background gold \
 +	-anchor w \
 +	-justify left
 +pack .vpane.lower.diff.header.status -side left
 +pack .vpane.lower.diff.header.file -side left
 +pack .vpane.lower.diff.header.path -fill x
 +set ctxm .vpane.lower.diff.header.ctxm
 +menu $ctxm -tearoff 0
 +$ctxm add command \
 +	-label [mc Copy] \
 +	-command {
 +		clipboard clear
 +		clipboard append \
 +			-format STRING \
 +			-type STRING \
 +			-- $current_diff_path
 +	}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
 +
 +# -- Diff Body
 +#
 +frame .vpane.lower.diff.body
 +set ui_diff .vpane.lower.diff.body.t
 +text $ui_diff -background white -borderwidth 0 \
 +	-width 80 -height 15 -wrap none \
 +	-font font_diff \
 +	-xscrollcommand {.vpane.lower.diff.body.sbx set} \
 +	-yscrollcommand {.vpane.lower.diff.body.sby set} \
 +	-state disabled
 +scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
 +	-command [list $ui_diff xview]
 +scrollbar .vpane.lower.diff.body.sby -orient vertical \
 +	-command [list $ui_diff yview]
 +pack .vpane.lower.diff.body.sbx -side bottom -fill x
 +pack .vpane.lower.diff.body.sby -side right -fill y
 +pack $ui_diff -side left -fill both -expand 1
 +pack .vpane.lower.diff.header -side top -fill x
 +pack .vpane.lower.diff.body -side bottom -fill both -expand 1
 +
 +$ui_diff tag conf d_cr -elide true
 +$ui_diff tag conf d_@ -foreground blue -font font_diffbold
 +$ui_diff tag conf d_+ -foreground {#00a000}
 +$ui_diff tag conf d_- -foreground red
 +
 +$ui_diff tag conf d_++ -foreground {#00a000}
 +$ui_diff tag conf d_-- -foreground red
 +$ui_diff tag conf d_+s \
 +	-foreground {#00a000} \
 +	-background {#e2effa}
 +$ui_diff tag conf d_-s \
 +	-foreground red \
 +	-background {#e2effa}
 +$ui_diff tag conf d_s+ \
 +	-foreground {#00a000} \
 +	-background ivory1
 +$ui_diff tag conf d_s- \
 +	-foreground red \
 +	-background ivory1
 +
 +$ui_diff tag conf d<<<<<<< \
 +	-foreground orange \
 +	-font font_diffbold
 +$ui_diff tag conf d======= \
 +	-foreground orange \
 +	-font font_diffbold
 +$ui_diff tag conf d>>>>>>> \
 +	-foreground orange \
 +	-font font_diffbold
 +
 +$ui_diff tag raise sel
 +
 +# -- Diff Body Context Menu
 +#
 +set ctxm .vpane.lower.diff.body.ctxm
 +menu $ctxm -tearoff 0
++$ctxm add command \
++	-label [mc "Apply/Reverse Hunk"] \
++	-command {apply_hunk $cursorX $cursorY}
++set ui_diff_applyhunk [$ctxm index last]
++lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
++$ctxm add separator
++$ctxm add command \
++	-label [mc "Show Less Context"] \
++	-command {if {$repo_config(gui.diffcontext) >= 1} {
++		incr repo_config(gui.diffcontext) -1
++		reshow_diff
++	}}
++lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
++$ctxm add command \
++	-label [mc "Show More Context"] \
++	-command {if {$repo_config(gui.diffcontext) < 99} {
++		incr repo_config(gui.diffcontext)
++		reshow_diff
++	}}
++lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
++$ctxm add separator
 +$ctxm add command \
 +	-label [mc Refresh] \
 +	-command reshow_diff
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +	-label [mc Copy] \
 +	-command {tk_textCopy $ui_diff}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +	-label [mc "Select All"] \
 +	-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +	-label [mc "Copy All"] \
 +	-command {
 +		$ui_diff tag add sel 0.0 end
 +		tk_textCopy $ui_diff
 +		$ui_diff tag remove sel 0.0 end
 +	}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add separator
- $ctxm add command \
- 	-label [mc "Apply/Reverse Hunk"] \
- 	-command {apply_hunk $cursorX $cursorY}
- set ui_diff_applyhunk [$ctxm index last]
- lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
- $ctxm add separator
 +$ctxm add command \
 +	-label [mc "Decrease Font Size"] \
 +	-command {incr_font_size font_diff -1}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add command \
 +	-label [mc "Increase Font Size"] \
 +	-command {incr_font_size font_diff 1}
 +lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 +$ctxm add separator
- $ctxm add command \
- 	-label [mc "Show Less Context"] \
- 	-command {if {$repo_config(gui.diffcontext) >= 1} {
- 		incr repo_config(gui.diffcontext) -1
- 		reshow_diff
- 	}}
- lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
- $ctxm add command \
- 	-label [mc "Show More Context"] \
- 	-command {if {$repo_config(gui.diffcontext) < 99} {
- 		incr repo_config(gui.diffcontext)
- 		reshow_diff
- 	}}
- lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
- $ctxm add separator
 +$ctxm add command -label [mc "Options..."] \
 +	-command do_options
 +proc popup_diff_menu {ctxm x y X Y} {
 +	global current_diff_path file_states
 +	set ::cursorX $x
 +	set ::cursorY $y
 +	if {$::ui_index eq $::current_diff_side} {
 +		set l [mc "Unstage Hunk From Commit"]
 +	} else {
 +		set l [mc "Stage Hunk For Commit"]
 +	}
 +	if {$::is_3way_diff
 +		|| $current_diff_path eq {}
 +		|| ![info exists file_states($current_diff_path)]
 +		|| {_O} eq [lindex $file_states($current_diff_path) 0]} {
 +		set s disabled
 +	} else {
 +		set s normal
 +	}
 +	$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
 +	tk_popup $ctxm $X $Y
 +}
 +bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y]
 +
 +# -- Status Bar
 +#
 +set main_status [::status_bar::new .status]
 +pack .status -anchor w -side bottom -fill x
 +$main_status show [mc "Initializing..."]
 +
 +# -- Load geometry
 +#
 +catch {
 +set gm $repo_config(gui.geometry)
 +wm geometry . [lindex $gm 0]
 +.vpane sash place 0 \
 +	[lindex $gm 1] \
 +	[lindex [.vpane sash coord 0] 1]
 +.vpane.files sash place 0 \
 +	[lindex [.vpane.files sash coord 0] 0] \
 +	[lindex $gm 2]
 +unset gm
 +}
 +
 +# -- Key Bindings
 +#
 +bind $ui_comm <$M1B-Key-Return> {do_commit;break}
 +bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
 +bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
 +bind $ui_comm <$M1B-Key-i> {do_add_all;break}
 +bind $ui_comm <$M1B-Key-I> {do_add_all;break}
 +bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
 +bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
 +bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
 +bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
 +bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
 +bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
 +bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
 +bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
 +
 +bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
 +bind $ui_diff <$M1B-Key-v> {break}
 +bind $ui_diff <$M1B-Key-V> {break}
 +bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
 +bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
 +bind $ui_diff <Key-Up>     {catch {%W yview scroll -1 units};break}
 +bind $ui_diff <Key-Down>   {catch {%W yview scroll  1 units};break}
 +bind $ui_diff <Key-Left>   {catch {%W xview scroll -1 units};break}
 +bind $ui_diff <Key-Right>  {catch {%W xview scroll  1 units};break}
 +bind $ui_diff <Key-k>         {catch {%W yview scroll -1 units};break}
 +bind $ui_diff <Key-j>         {catch {%W yview scroll  1 units};break}
 +bind $ui_diff <Key-h>         {catch {%W xview scroll -1 units};break}
 +bind $ui_diff <Key-l>         {catch {%W xview scroll  1 units};break}
 +bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
 +bind $ui_diff <Control-Key-f> {catch {%W yview scroll  1 pages};break}
 +bind $ui_diff <Button-1>   {focus %W}
 +
 +if {[is_enabled branch]} {
 +	bind . <$M1B-Key-n> branch_create::dialog
 +	bind . <$M1B-Key-N> branch_create::dialog
 +	bind . <$M1B-Key-o> branch_checkout::dialog
 +	bind . <$M1B-Key-O> branch_checkout::dialog
 +	bind . <$M1B-Key-m> merge::dialog
 +	bind . <$M1B-Key-M> merge::dialog
 +}
 +if {[is_enabled transport]} {
 +	bind . <$M1B-Key-p> do_push_anywhere
 +	bind . <$M1B-Key-P> do_push_anywhere
 +}
 +
 +bind .   <Key-F5>     do_rescan
 +bind .   <$M1B-Key-r> do_rescan
 +bind .   <$M1B-Key-R> do_rescan
 +bind .   <$M1B-Key-s> do_signoff
 +bind .   <$M1B-Key-S> do_signoff
 +bind .   <$M1B-Key-t> do_add_selection
 +bind .   <$M1B-Key-T> do_add_selection
 +bind .   <$M1B-Key-i> do_add_all
 +bind .   <$M1B-Key-I> do_add_all
 +bind .   <$M1B-Key-Return> do_commit
 +foreach i [list $ui_index $ui_workdir] {
 +	bind $i <Button-1>       "toggle_or_diff         $i %x %y; break"
 +	bind $i <$M1B-Button-1>  "add_one_to_selection   $i %x %y; break"
 +	bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
 +}
 +unset i
 +
 +set file_lists($ui_index) [list]
 +set file_lists($ui_workdir) [list]
 +
 +wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
 +focus -force $ui_comm
 +
 +# -- Warn the user about environmental problems.  Cygwin's Tcl
 +#    does *not* pass its env array onto any processes it spawns.
 +#    This means that git processes get none of our environment.
 +#
 +if {[is_Cygwin]} {
 +	set ignored_env 0
 +	set suggest_user {}
 +	set msg [mc "Possible environment issues exist.
 +
 +The following environment variables are probably
 +going to be ignored by any Git subprocess run
 +by %s:
 +
 +" [appname]]
 +	foreach name [array names env] {
 +		switch -regexp -- $name {
 +		{^GIT_INDEX_FILE$} -
 +		{^GIT_OBJECT_DIRECTORY$} -
 +		{^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
 +		{^GIT_DIFF_OPTS$} -
 +		{^GIT_EXTERNAL_DIFF$} -
 +		{^GIT_PAGER$} -
 +		{^GIT_TRACE$} -
 +		{^GIT_CONFIG$} -
 +		{^GIT_CONFIG_LOCAL$} -
 +		{^GIT_(AUTHOR|COMMITTER)_DATE$} {
 +			append msg " - $name\n"
 +			incr ignored_env
 +		}
 +		{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
 +			append msg " - $name\n"
 +			incr ignored_env
 +			set suggest_user $name
 +		}
 +		}
 +	}
 +	if {$ignored_env > 0} {
 +		append msg [mc "
 +This is due to a known issue with the
 +Tcl binary distributed by Cygwin."]
 +
 +		if {$suggest_user ne {}} {
 +			append msg [mc "
 +
 +A good replacement for %s
 +is placing values for the user.name and
 +user.email settings into your personal
 +~/.gitconfig file.
 +" $suggest_user]
 +		}
 +		warn_popup $msg
 +	}
 +	unset ignored_env msg suggest_user name
 +}
 +
 +# -- Only initialize complex UI if we are going to stay running.
 +#
 +if {[is_enabled transport]} {
 +	load_all_remotes
 +
 +	set n [.mbar.remote index end]
 +	populate_push_menu
 +	populate_fetch_menu
 +	set n [expr {[.mbar.remote index end] - $n}]
 +	if {$n > 0} {
 +		.mbar.remote insert $n separator
 +	}
 +	unset n
 +}
 +
 +if {[winfo exists $ui_comm]} {
 +	set GITGUI_BCK_exists [load_message GITGUI_BCK]
 +
 +	# -- If both our backup and message files exist use the
 +	#    newer of the two files to initialize the buffer.
 +	#
 +	if {$GITGUI_BCK_exists} {
 +		set m [gitdir GITGUI_MSG]
 +		if {[file isfile $m]} {
 +			if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
 +				catch {file delete [gitdir GITGUI_MSG]}
 +			} else {
 +				$ui_comm delete 0.0 end
 +				$ui_comm edit reset
 +				$ui_comm edit modified false
 +				catch {file delete [gitdir GITGUI_BCK]}
 +				set GITGUI_BCK_exists 0
 +			}
 +		}
 +		unset m
 +	}
 +
 +	proc backup_commit_buffer {} {
 +		global ui_comm GITGUI_BCK_exists
 +
 +		set m [$ui_comm edit modified]
 +		if {$m || $GITGUI_BCK_exists} {
 +			set msg [string trim [$ui_comm get 0.0 end]]
 +			regsub -all -line {[ \r\t]+$} $msg {} msg
 +
 +			if {$msg eq {}} {
 +				if {$GITGUI_BCK_exists} {
 +					catch {file delete [gitdir GITGUI_BCK]}
 +					set GITGUI_BCK_exists 0
 +				}
 +			} elseif {$m} {
 +				catch {
 +					set fd [open [gitdir GITGUI_BCK] w]
 +					puts -nonewline $fd $msg
 +					close $fd
 +					set GITGUI_BCK_exists 1
 +				}
 +			}
 +
 +			$ui_comm edit modified false
 +		}
 +
 +		set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
 +	}
 +
 +	backup_commit_buffer
 +}
 +
 +lock_index begin-read
 +if {![winfo ismapped .]} {
 +	wm deiconify .
 +}
 +after 1 do_rescan
 +if {[is_enabled multicommit]} {
 +	after 1000 hint_gc
 +}
diff --cc git-gui/lib/commit.tcl
index b2d2d5308,000000000..1c0586c40
mode 100644,000000..100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@@ -1,431 -1,0 +1,431 @@@
 +# git-gui misc. commit reading/writing support
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc load_last_commit {} {
 +	global HEAD PARENT MERGE_HEAD commit_type ui_comm
 +	global repo_config
 +
 +	if {[llength $PARENT] == 0} {
 +		error_popup [mc "There is nothing to amend.
 +
 +You are about to create the initial commit.  There is no commit before this to amend.
 +"]
 +		return
 +	}
 +
 +	repository_state curType curHEAD curMERGE_HEAD
 +	if {$curType eq {merge}} {
 +		error_popup [mc "Cannot amend while merging.
 +
 +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.
 +"]
 +		return
 +	}
 +
 +	set msg {}
 +	set parents [list]
 +	if {[catch {
 +			set fd [git_read cat-file commit $curHEAD]
 +			fconfigure $fd -encoding binary -translation lf
 +			if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 +				set enc utf-8
 +			}
 +			while {[gets $fd line] > 0} {
 +				if {[string match {parent *} $line]} {
 +					lappend parents [string range $line 7 end]
 +				} elseif {[string match {encoding *} $line]} {
 +					set enc [string tolower [string range $line 9 end]]
 +				}
 +			}
 +			set msg [read $fd]
 +			close $fd
 +
 +			set enc [tcl_encoding $enc]
 +			if {$enc ne {}} {
 +				set msg [encoding convertfrom $enc $msg]
 +			}
 +			set msg [string trim $msg]
 +		} err]} {
 +		error_popup [strcat [mc "Error loading commit data for amend:"] "\n\n$err"]
 +		return
 +	}
 +
 +	set HEAD $curHEAD
 +	set PARENT $parents
 +	set MERGE_HEAD [list]
 +	switch -- [llength $parents] {
 +	0       {set commit_type amend-initial}
 +	1       {set commit_type amend}
 +	default {set commit_type amend-merge}
 +	}
 +
 +	$ui_comm delete 0.0 end
 +	$ui_comm insert end $msg
 +	$ui_comm edit reset
 +	$ui_comm edit modified false
 +	rescan ui_ready
 +}
 +
 +set GIT_COMMITTER_IDENT {}
 +
 +proc committer_ident {} {
 +	global GIT_COMMITTER_IDENT
 +
 +	if {$GIT_COMMITTER_IDENT eq {}} {
 +		if {[catch {set me [git var GIT_COMMITTER_IDENT]} err]} {
 +			error_popup [strcat [mc "Unable to obtain your identity:"] "\n\n$err"]
 +			return {}
 +		}
 +		if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
 +			$me me GIT_COMMITTER_IDENT]} {
 +			error_popup [strcat [mc "Invalid GIT_COMMITTER_IDENT:"] "\n\n$me"]
 +			return {}
 +		}
 +	}
 +
 +	return $GIT_COMMITTER_IDENT
 +}
 +
 +proc do_signoff {} {
 +	global ui_comm
 +
 +	set me [committer_ident]
 +	if {$me eq {}} return
 +
 +	set sob "Signed-off-by: $me"
 +	set last [$ui_comm get {end -1c linestart} {end -1c}]
 +	if {$last ne $sob} {
 +		$ui_comm edit separator
 +		if {$last ne {}
 +			&& ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
 +			$ui_comm insert end "\n"
 +		}
 +		$ui_comm insert end "\n$sob"
 +		$ui_comm edit separator
 +		$ui_comm see end
 +	}
 +}
 +
 +proc create_new_commit {} {
 +	global commit_type ui_comm
 +
 +	set commit_type normal
 +	$ui_comm delete 0.0 end
 +	$ui_comm edit reset
 +	$ui_comm edit modified false
 +	rescan ui_ready
 +}
 +
 +proc commit_tree {} {
 +	global HEAD commit_type file_states ui_comm repo_config
 +	global pch_error
 +
 +	if {[committer_ident] eq {}} return
 +	if {![lock_index update]} return
 +
 +	# -- Our in memory state should match the repository.
 +	#
 +	repository_state curType curHEAD curMERGE_HEAD
 +	if {[string match amend* $commit_type]
 +		&& $curType eq {normal}
 +		&& $curHEAD eq $HEAD} {
 +	} elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
 +		info_popup [mc "Last scanned state does not match repository state.
 +
 +Another Git program has modified this repository since the last scan.  A rescan must be performed before another commit can be created.
 +
 +The rescan will be automatically started now.
 +"]
 +		unlock_index
 +		rescan ui_ready
 +		return
 +	}
 +
 +	# -- At least one file should differ in the index.
 +	#
 +	set files_ready 0
 +	foreach path [array names file_states] {
 +		switch -glob -- [lindex $file_states($path) 0] {
 +		_? {continue}
 +		A? -
 +		D? -
 +		M? {set files_ready 1}
 +		U? {
 +			error_popup [mc "Unmerged files cannot be committed.
 +
 +File %s has merge conflicts.  You must resolve them and stage the file before committing.
 +" [short_path $path]]
 +			unlock_index
 +			return
 +		}
 +		default {
 +			error_popup [mc "Unknown file state %s detected.
 +
 +File %s cannot be committed by this program.
 +" [lindex $s 0] [short_path $path]]
 +		}
 +		}
 +	}
 +	if {!$files_ready && ![string match *merge $curType]} {
 +		info_popup [mc "No changes to commit.
 +
 +You must stage at least 1 file before you can commit.
 +"]
 +		unlock_index
 +		return
 +	}
 +
 +	# -- A message is required.
 +	#
 +	set msg [string trim [$ui_comm get 1.0 end]]
 +	regsub -all -line {[ \t\r]+$} $msg {} msg
 +	if {$msg eq {}} {
 +		error_popup [mc "Please supply a commit message.
 +
 +A good commit message has the following format:
 +
 +- First line: Describe in one sentence what you did.
 +- Second line: Blank
 +- Remaining lines: Describe why this change is good.
 +"]
 +		unlock_index
 +		return
 +	}
 +
 +	# -- Run the pre-commit hook.
 +	#
 +	set pchook [gitdir hooks pre-commit]
 +
 +	# On Cygwin [file executable] might lie so we need to ask
 +	# the shell if the hook is executable.  Yes that's annoying.
 +	#
 +	if {[is_Cygwin] && [file isfile $pchook]} {
 +		set pchook [list sh -c [concat \
 +			"if test -x \"$pchook\";" \
 +			"then exec \"$pchook\" 2>&1;" \
 +			"fi"]]
 +	} elseif {[file executable $pchook]} {
 +		set pchook [list $pchook |& cat]
 +	} else {
 +		commit_writetree $curHEAD $msg
 +		return
 +	}
 +
 +	ui_status {Calling pre-commit hook...}
 +	set pch_error {}
 +	set fd_ph [open "| $pchook" r]
 +	fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
 +	fileevent $fd_ph readable \
 +		[list commit_prehook_wait $fd_ph $curHEAD $msg]
 +}
 +
 +proc commit_prehook_wait {fd_ph curHEAD msg} {
 +	global pch_error
 +
 +	append pch_error [read $fd_ph]
 +	fconfigure $fd_ph -blocking 1
 +	if {[eof $fd_ph]} {
 +		if {[catch {close $fd_ph}]} {
 +			ui_status {Commit declined by pre-commit hook.}
 +			hook_failed_popup pre-commit $pch_error
 +			unlock_index
 +		} else {
 +			commit_writetree $curHEAD $msg
 +		}
 +		set pch_error {}
 +		return
 +	}
 +	fconfigure $fd_ph -blocking 0
 +}
 +
 +proc commit_writetree {curHEAD msg} {
 +	ui_status {Committing changes...}
 +	set fd_wt [git_read write-tree]
 +	fileevent $fd_wt readable \
 +		[list commit_committree $fd_wt $curHEAD $msg]
 +}
 +
 +proc commit_committree {fd_wt curHEAD msg} {
 +	global HEAD PARENT MERGE_HEAD commit_type
 +	global current_branch
 +	global ui_comm selected_commit_type
 +	global file_states selected_paths rescan_active
 +	global repo_config
 +
 +	gets $fd_wt tree_id
 +	if {[catch {close $fd_wt} err]} {
 +		error_popup [strcat [mc "write-tree failed:"] "\n\n$err"]
 +		ui_status {Commit failed.}
 +		unlock_index
 +		return
 +	}
 +
 +	# -- Verify this wasn't an empty change.
 +	#
 +	if {$commit_type eq {normal}} {
 +		set fd_ot [git_read cat-file commit $PARENT]
 +		fconfigure $fd_ot -encoding binary -translation lf
 +		set old_tree [gets $fd_ot]
 +		close $fd_ot
 +
 +		if {[string equal -length 5 {tree } $old_tree]
 +			&& [string length $old_tree] == 45} {
 +			set old_tree [string range $old_tree 5 end]
 +		} else {
 +			error [mc "Commit %s appears to be corrupt" $PARENT]
 +		}
 +
 +		if {$tree_id eq $old_tree} {
 +			info_popup [mc "No changes to commit.
 +
 +No files were modified by this commit and it was not a merge commit.
 +
 +A rescan will be automatically started now.
 +"]
 +			unlock_index
 +			rescan {ui_status [mc "No changes to commit."]}
 +			return
 +		}
 +	}
 +
 +	# -- Build the message.
 +	#
 +	set msg_p [gitdir COMMIT_EDITMSG]
 +	set msg_wt [open $msg_p w]
 +	fconfigure $msg_wt -translation lf
 +	if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
 +		set enc utf-8
 +	}
 +	set use_enc [tcl_encoding $enc]
 +	if {$use_enc ne {}} {
 +		fconfigure $msg_wt -encoding $use_enc
 +	} else {
 +		puts stderr [mc "warning: Tcl does not support encoding '%s'." $enc]
 +		fconfigure $msg_wt -encoding utf-8
 +	}
- 	puts -nonewline $msg_wt $msg
++	puts $msg_wt $msg
 +	close $msg_wt
 +
 +	# -- Create the commit.
 +	#
 +	set cmd [list commit-tree $tree_id]
 +	foreach p [concat $PARENT $MERGE_HEAD] {
 +		lappend cmd -p $p
 +	}
 +	lappend cmd <$msg_p
 +	if {[catch {set cmt_id [eval git $cmd]} err]} {
 +		error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"]
 +		ui_status {Commit failed.}
 +		unlock_index
 +		return
 +	}
 +
 +	# -- Update the HEAD ref.
 +	#
 +	set reflogm commit
 +	if {$commit_type ne {normal}} {
 +		append reflogm " ($commit_type)"
 +	}
 +	set i [string first "\n" $msg]
 +	if {$i >= 0} {
 +		set subject [string range $msg 0 [expr {$i - 1}]]
 +	} else {
 +		set subject $msg
 +	}
 +	append reflogm {: } $subject
 +	if {[catch {
 +			git update-ref -m $reflogm HEAD $cmt_id $curHEAD
 +		} err]} {
 +		error_popup [strcat [mc "update-ref failed:"] "\n\n$err"]
 +		ui_status {Commit failed.}
 +		unlock_index
 +		return
 +	}
 +
 +	# -- Cleanup after ourselves.
 +	#
 +	catch {file delete $msg_p}
 +	catch {file delete [gitdir MERGE_HEAD]}
 +	catch {file delete [gitdir MERGE_MSG]}
 +	catch {file delete [gitdir SQUASH_MSG]}
 +	catch {file delete [gitdir GITGUI_MSG]}
 +
 +	# -- Let rerere do its thing.
 +	#
 +	if {[get_config rerere.enabled] eq {}} {
 +		set rerere [file isdirectory [gitdir rr-cache]]
 +	} else {
 +		set rerere [is_config_true rerere.enabled]
 +	}
 +	if {$rerere} {
 +		catch {git rerere}
 +	}
 +
 +	# -- Run the post-commit hook.
 +	#
 +	set pchook [gitdir hooks post-commit]
 +	if {[is_Cygwin] && [file isfile $pchook]} {
 +		set pchook [list sh -c [concat \
 +			"if test -x \"$pchook\";" \
 +			"then exec \"$pchook\";" \
 +			"fi"]]
 +	} elseif {![file executable $pchook]} {
 +		set pchook {}
 +	}
 +	if {$pchook ne {}} {
 +		catch {exec $pchook &}
 +	}
 +
 +	$ui_comm delete 0.0 end
 +	$ui_comm edit reset
 +	$ui_comm edit modified false
 +	if {$::GITGUI_BCK_exists} {
 +		catch {file delete [gitdir GITGUI_BCK]}
 +		set ::GITGUI_BCK_exists 0
 +	}
 +
 +	if {[is_enabled singlecommit]} do_quit
 +
 +	# -- Update in memory status
 +	#
 +	set selected_commit_type new
 +	set commit_type normal
 +	set HEAD $cmt_id
 +	set PARENT $cmt_id
 +	set MERGE_HEAD [list]
 +
 +	foreach path [array names file_states] {
 +		set s $file_states($path)
 +		set m [lindex $s 0]
 +		switch -glob -- $m {
 +		_O -
 +		_M -
 +		_D {continue}
 +		__ -
 +		A_ -
 +		M_ -
 +		D_ {
 +			unset file_states($path)
 +			catch {unset selected_paths($path)}
 +		}
 +		DO {
 +			set file_states($path) [list _O [lindex $s 1] {} {}]
 +		}
 +		AM -
 +		AD -
 +		MM -
 +		MD {
 +			set file_states($path) [list \
 +				_[string index $m 1] \
 +				[lindex $s 1] \
 +				[lindex $s 3] \
 +				{}]
 +		}
 +		}
 +	}
 +
 +	display_all_files
 +	unlock_index
 +	reshow_diff
 +	ui_status [mc "Created commit %s: %s" [string range $cmt_id 0 7] $subject]
 +}
diff --cc git-gui/lib/diff.tcl
index 43565e412,000000000..18aba3eae
mode 100644,000000..100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@@ -1,361 -1,0 +1,362 @@@
 +# git-gui diff viewer
 +# Copyright (C) 2006, 2007 Shawn Pearce
 +
 +proc clear_diff {} {
 +	global ui_diff current_diff_path current_diff_header
 +	global ui_index ui_workdir
 +
 +	$ui_diff conf -state normal
 +	$ui_diff delete 0.0 end
 +	$ui_diff conf -state disabled
 +
 +	set current_diff_path {}
 +	set current_diff_header {}
 +
 +	$ui_index tag remove in_diff 0.0 end
 +	$ui_workdir tag remove in_diff 0.0 end
 +}
 +
 +proc reshow_diff {} {
 +	global file_states file_lists
 +	global current_diff_path current_diff_side
 +
 +	set p $current_diff_path
 +	if {$p eq {}} {
 +		# No diff is being shown.
 +	} elseif {$current_diff_side eq {}
 +		|| [catch {set s $file_states($p)}]
 +		|| [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
 +		clear_diff
 +	} else {
 +		show_diff $p $current_diff_side
 +	}
 +}
 +
 +proc handle_empty_diff {} {
 +	global current_diff_path file_states file_lists
 +
 +	set path $current_diff_path
 +	set s $file_states($path)
 +	if {[lindex $s 0] ne {_M}} return
 +
 +	info_popup [mc "No differences detected.
 +
 +%s has no changes.
 +
 +The modification date of this file was updated by another application, but the content within the file was not changed.
 +
 +A rescan will be automatically started to find other files which may have the same state." [short_path $path]]
 +
 +	clear_diff
 +	display_file $path __
 +	rescan ui_ready 0
 +}
 +
 +proc show_diff {path w {lno {}}} {
 +	global file_states file_lists
 +	global is_3way_diff diff_active repo_config
 +	global ui_diff ui_index ui_workdir
 +	global current_diff_path current_diff_side current_diff_header
 +
 +	if {$diff_active || ![lock_index read]} return
 +
 +	clear_diff
 +	if {$lno == {}} {
 +		set lno [lsearch -sorted -exact $file_lists($w) $path]
 +		if {$lno >= 0} {
 +			incr lno
 +		}
 +	}
 +	if {$lno >= 1} {
 +		$w tag add in_diff $lno.0 [expr {$lno + 1}].0
 +	}
 +
 +	set s $file_states($path)
 +	set m [lindex $s 0]
 +	set is_3way_diff 0
 +	set diff_active 1
 +	set current_diff_path $path
 +	set current_diff_side $w
 +	set current_diff_header {}
 +	ui_status [mc "Loading diff of %s..." [escape_path $path]]
 +
 +	# - Git won't give us the diff, there's nothing to compare to!
 +	#
 +	if {$m eq {_O}} {
 +		set max_sz [expr {128 * 1024}]
 +		set type unknown
 +		if {[catch {
 +				set type [file type $path]
 +				switch -- $type {
 +				directory {
 +					set type submodule
 +					set content {}
 +					set sz 0
 +				}
 +				link {
 +					set content [file readlink $path]
 +					set sz [string length $content]
 +				}
 +				file {
 +					set fd [open $path r]
 +					fconfigure $fd -eofchar {}
 +					set content [read $fd $max_sz]
 +					close $fd
 +					set sz [file size $path]
 +				}
 +				default {
 +					error "'$type' not supported"
 +				}
 +				}
 +			} err ]} {
 +			set diff_active 0
 +			unlock_index
 +			ui_status [mc "Unable to display %s" [escape_path $path]]
 +			error_popup [strcat [mc "Error loading file:"] "\n\n$err"]
 +			return
 +		}
 +		$ui_diff conf -state normal
 +		if {$type eq {submodule}} {
 +			$ui_diff insert end [append \
 +				"* " \
 +				[mc "Git Repository (subproject)"] \
 +				"\n"] d_@
 +		} elseif {![catch {set type [exec file $path]}]} {
 +			set n [string length $path]
 +			if {[string equal -length $n $path $type]} {
 +				set type [string range $type $n end]
 +				regsub {^:?\s*} $type {} type
 +			}
 +			$ui_diff insert end "* $type\n" d_@
 +		}
 +		if {[string first "\0" $content] != -1} {
 +			$ui_diff insert end \
 +				[mc "* Binary file (not showing content)."] \
 +				d_@
 +		} else {
 +			if {$sz > $max_sz} {
 +				$ui_diff insert end \
 +"* Untracked file is $sz bytes.
 +* Showing only first $max_sz bytes.
 +" d_@
 +			}
 +			$ui_diff insert end $content
 +			if {$sz > $max_sz} {
 +				$ui_diff insert end "
 +* Untracked file clipped here by [appname].
 +* To see the entire file, use an external editor.
 +" d_@
 +			}
 +		}
 +		$ui_diff conf -state disabled
 +		set diff_active 0
 +		unlock_index
 +		ui_ready
 +		return
 +	}
 +
 +	set cmd [list]
 +	if {$w eq $ui_index} {
 +		lappend cmd diff-index
 +		lappend cmd --cached
 +	} elseif {$w eq $ui_workdir} {
 +		if {[string index $m 0] eq {U}} {
 +			lappend cmd diff
 +		} else {
 +			lappend cmd diff-files
 +		}
 +	}
 +
 +	lappend cmd -p
 +	lappend cmd --no-color
 +	if {$repo_config(gui.diffcontext) >= 0} {
 +		lappend cmd "-U$repo_config(gui.diffcontext)"
 +	}
 +	if {$w eq $ui_index} {
 +		lappend cmd [PARENT]
 +	}
 +	lappend cmd --
 +	lappend cmd $path
 +
 +	if {[catch {set fd [eval git_read --nice $cmd]} err]} {
 +		set diff_active 0
 +		unlock_index
 +		ui_status [mc "Unable to display %s" [escape_path $path]]
 +		error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 +		return
 +	}
 +
 +	fconfigure $fd \
 +		-blocking 0 \
 +		-encoding binary \
 +		-translation binary
 +	fileevent $fd readable [list read_diff $fd]
 +}
 +
 +proc read_diff {fd} {
 +	global ui_diff diff_active
 +	global is_3way_diff current_diff_header
 +
 +	$ui_diff conf -state normal
 +	while {[gets $fd line] >= 0} {
 +		# -- Cleanup uninteresting diff header lines.
 +		#
 +		if {   [string match {diff --git *}      $line]
 +			|| [string match {diff --cc *}       $line]
 +			|| [string match {diff --combined *} $line]
 +			|| [string match {--- *}             $line]
 +			|| [string match {+++ *}             $line]} {
 +			append current_diff_header $line "\n"
 +			continue
 +		}
 +		if {[string match {index *} $line]} continue
 +		if {$line eq {deleted file mode 120000}} {
 +			set line "deleted symlink"
 +		}
 +
 +		# -- Automatically detect if this is a 3 way diff.
 +		#
 +		if {[string match {@@@ *} $line]} {set is_3way_diff 1}
 +
 +		if {[string match {mode *} $line]
 +			|| [string match {new file *} $line]
++			|| [regexp {^(old|new) mode *} $line]
 +			|| [string match {deleted file *} $line]
 +			|| [string match {deleted symlink} $line]
 +			|| [string match {Binary files * and * differ} $line]
 +			|| $line eq {\ No newline at end of file}
 +			|| [regexp {^\* Unmerged path } $line]} {
 +			set tags {}
 +		} elseif {$is_3way_diff} {
 +			set op [string range $line 0 1]
 +			switch -- $op {
 +			{  } {set tags {}}
 +			{@@} {set tags d_@}
 +			{ +} {set tags d_s+}
 +			{ -} {set tags d_s-}
 +			{+ } {set tags d_+s}
 +			{- } {set tags d_-s}
 +			{--} {set tags d_--}
 +			{++} {
 +				if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
 +					set line [string replace $line 0 1 {  }]
 +					set tags d$op
 +				} else {
 +					set tags d_++
 +				}
 +			}
 +			default {
 +				puts "error: Unhandled 3 way diff marker: {$op}"
 +				set tags {}
 +			}
 +			}
 +		} else {
 +			set op [string index $line 0]
 +			switch -- $op {
 +			{ } {set tags {}}
 +			{@} {set tags d_@}
 +			{-} {set tags d_-}
 +			{+} {
 +				if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
 +					set line [string replace $line 0 0 { }]
 +					set tags d$op
 +				} else {
 +					set tags d_+
 +				}
 +			}
 +			default {
 +				puts "error: Unhandled 2 way diff marker: {$op}"
 +				set tags {}
 +			}
 +			}
 +		}
 +		$ui_diff insert end $line $tags
 +		if {[string index $line end] eq "\r"} {
 +			$ui_diff tag add d_cr {end - 2c}
 +		}
 +		$ui_diff insert end "\n" $tags
 +	}
 +	$ui_diff conf -state disabled
 +
 +	if {[eof $fd]} {
 +		close $fd
 +		set diff_active 0
 +		unlock_index
 +		ui_ready
 +
 +		if {[$ui_diff index end] eq {2.0}} {
 +			handle_empty_diff
 +		}
 +	}
 +}
 +
 +proc apply_hunk {x y} {
 +	global current_diff_path current_diff_header current_diff_side
 +	global ui_diff ui_index file_states
 +
 +	if {$current_diff_path eq {} || $current_diff_header eq {}} return
 +	if {![lock_index apply_hunk]} return
 +
 +	set apply_cmd {apply --cached --whitespace=nowarn}
 +	set mi [lindex $file_states($current_diff_path) 0]
 +	if {$current_diff_side eq $ui_index} {
 +		set failed_msg [mc "Failed to unstage selected hunk."]
 +		lappend apply_cmd --reverse
 +		if {[string index $mi 0] ne {M}} {
 +			unlock_index
 +			return
 +		}
 +	} else {
 +		set failed_msg [mc "Failed to stage selected hunk."]
 +		if {[string index $mi 1] ne {M}} {
 +			unlock_index
 +			return
 +		}
 +	}
 +
 +	set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
 +	set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
 +	if {$s_lno eq {}} {
 +		unlock_index
 +		return
 +	}
 +
 +	set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
 +	if {$e_lno eq {}} {
 +		set e_lno end
 +	}
 +
 +	if {[catch {
 +		set p [eval git_write $apply_cmd]
 +		fconfigure $p -translation binary -encoding binary
 +		puts -nonewline $p $current_diff_header
 +		puts -nonewline $p [$ui_diff get $s_lno $e_lno]
 +		close $p} err]} {
 +		error_popup [append $failed_msg "\n\n$err"]
 +		unlock_index
 +		return
 +	}
 +
 +	$ui_diff conf -state normal
 +	$ui_diff delete $s_lno $e_lno
 +	$ui_diff conf -state disabled
 +
 +	if {[$ui_diff get 1.0 end] eq "\n"} {
 +		set o _
 +	} else {
 +		set o ?
 +	}
 +
 +	if {$current_diff_side eq $ui_index} {
 +		set mi ${o}M
 +	} elseif {[string index $mi 0] eq {_}} {
 +		set mi M$o
 +	} else {
 +		set mi ?$o
 +	}
 +	unlock_index
 +	display_file $current_diff_path $mi
 +	if {$o eq {_}} {
 +		clear_diff
 +	}
 +}
diff --cc git-gui/po/sv.po
index 000000000,000000000..58c96c85d
new file mode 100644
--- /dev/null
+++ b/git-gui/po/sv.po
@@@ -1,0 -1,0 +1,1895 @@@
++# Swedish translation of git-gui.
++# Copyright (C) 2007 Shawn Pearce, et al.
++# This file is distributed under the same license as the git-gui package.
++#
++# Peter Karlsson <peter@softwolves.pp.se>, 2007.
++msgid ""
++msgstr ""
++"Project-Id-Version: sv\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2007-11-24 10:36+0100\n"
++"PO-Revision-Date: 2007-12-27 13:31CET-1\n"
++"Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
++"Language-Team: Swedish <sv@li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\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: ödesdigert fel"
++
++#: git-gui.sh:565
++#, tcl-format
++msgid "Invalid font specified in %s:"
++msgstr "Ogiltigt teckensnitt angivet i %s:"
++
++#: git-gui.sh:590
++msgid "Main Font"
++msgstr "Huvudteckensnitt"
++
++#: git-gui.sh:591
++msgid "Diff/Console Font"
++msgstr "Diff/konsolteckensnitt"
++
++#: git-gui.sh:605
++msgid "Cannot find git in PATH."
++msgstr "Hittar inte git i PATH."
++
++#: git-gui.sh:632
++msgid "Cannot parse Git version string:"
++msgstr "Kan inte tolka versionssträng från Git:"
++
++#: 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 ""
++"Kan inte avgöra Gits version.\n"
++"\n"
++"%s säger att dess version är \"%s\".\n"
++"\n"
++"%s kräver minst Git 1.5.0 eller senare.\n"
++"\n"
++"Anta att \"%s\" är version 1.5.0?\n"
++
++#: git-gui.sh:888
++msgid "Git directory not found:"
++msgstr "Git-katalogen hittades inte:"
++
++#: git-gui.sh:895
++msgid "Cannot move to top of working directory:"
++msgstr "Kunde inte gå till början på arbetskatalogen:"
++
++#: git-gui.sh:902
++msgid "Cannot use funny .git directory:"
++msgstr "Kunde inte använda underlig .git-katalog:"
++
++#: git-gui.sh:907
++msgid "No working directory"
++msgstr "Ingen arbetskatalog"
++
++#: git-gui.sh:1054
++msgid "Refreshing file status..."
++msgstr "Uppdaterar filstatus..."
++
++#: git-gui.sh:1119
++msgid "Scanning for modified files ..."
++msgstr "Söker efter ändrade filer..."
++
++#: git-gui.sh:1294 lib/browser.tcl:245
++msgid "Ready."
++msgstr "Redo."
++
++#: git-gui.sh:1560
++msgid "Unmodified"
++msgstr "Oförändrade"
++
++#: git-gui.sh:1562
++msgid "Modified, not staged"
++msgstr "Förändrade, ej köade"
++
++#: git-gui.sh:1563 git-gui.sh:1568
++msgid "Staged for commit"
++msgstr "Köade för incheckning"
++
++#: git-gui.sh:1564 git-gui.sh:1569
++msgid "Portions staged for commit"
++msgstr "Delar köade för incheckning"
++
++#: git-gui.sh:1565 git-gui.sh:1570
++msgid "Staged for commit, missing"
++msgstr "Köade för incheckning, saknade"
++
++#: git-gui.sh:1567
++msgid "Untracked, not staged"
++msgstr "Ej spårade, ej köade"
++
++#: git-gui.sh:1572
++msgid "Missing"
++msgstr "Saknade"
++
++#: git-gui.sh:1573
++msgid "Staged for removal"
++msgstr "Köade för borttagning"
++
++#: git-gui.sh:1574
++msgid "Staged for removal, still present"
++msgstr "Köade för borttagning, fortfarande närvarande"
++
++#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
++msgid "Requires merge resolution"
++msgstr "Kräver avgörande efter sammanslagning"
++
++#: git-gui.sh:1614
++msgid "Starting gitk... please wait..."
++msgstr "Startar gitk... vänta..."
++
++#: git-gui.sh:1623
++#, tcl-format
++msgid ""
++"Unable to start gitk:\n"
++"\n"
++"%s does not exist"
++msgstr ""
++"Kan inte starta gitk:\n"
++"\n"
++"%s finns inte"
++
++#: git-gui.sh:1823 lib/choose_repository.tcl:35
++msgid "Repository"
++msgstr "Arkiv"
++
++#: git-gui.sh:1824
++msgid "Edit"
++msgstr "Redigera"
++
++#: git-gui.sh:1826 lib/choose_rev.tcl:560
++msgid "Branch"
++msgstr "Gren"
++
++#: git-gui.sh:1829 lib/choose_rev.tcl:547
++msgid "Commit@@noun"
++msgstr "Incheckning"
++
++#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
++msgid "Merge"
++msgstr "Slå ihop"
++
++#: git-gui.sh:1833 lib/choose_rev.tcl:556
++msgid "Remote"
++msgstr "Fjärr"
++
++#: git-gui.sh:1842
++msgid "Browse Current Branch's Files"
++msgstr "Bläddra i grenens filer"
++
++#: git-gui.sh:1846
++msgid "Browse Branch Files..."
++msgstr "Bläddra filer på gren..."
++
++#: git-gui.sh:1851
++msgid "Visualize Current Branch's History"
++msgstr "Visualisera grenens historik"
++
++#: git-gui.sh:1855
++msgid "Visualize All Branch History"
++msgstr "Visualisera alla grenars historik"
++
++#: git-gui.sh:1862
++#, tcl-format
++msgid "Browse %s's Files"
++msgstr "Bläddra i filer för %s"
++
++#: git-gui.sh:1864
++#, tcl-format
++msgid "Visualize %s's History"
++msgstr "Visualisera historik för %s"
++
++#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
++msgid "Database Statistics"
++msgstr "Databasstatistik"
++
++#: git-gui.sh:1872 lib/database.tcl:34
++msgid "Compress Database"
++msgstr "Komprimera databas"
++
++#: git-gui.sh:1875
++msgid "Verify Database"
++msgstr "Verifiera databas"
++
++#: 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 "Skapa skrivbordsikon"
++
++#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
++msgid "Quit"
++msgstr "Avsluta"
++
++#: git-gui.sh:1902
++msgid "Undo"
++msgstr "Ångra"
++
++#: git-gui.sh:1905
++msgid "Redo"
++msgstr "Gör om"
++
++#: git-gui.sh:1909 git-gui.sh:2403
++msgid "Cut"
++msgstr "Klipp ut"
++
++#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
++#: lib/console.tcl:67
++msgid "Copy"
++msgstr "Kopiera"
++
++#: git-gui.sh:1915 git-gui.sh:2409
++msgid "Paste"
++msgstr "Klistra in"
++
++#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
++#: lib/remote_branch_delete.tcl:38
++msgid "Delete"
++msgstr "Ta bort"
++
++#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
++msgid "Select All"
++msgstr "Markera alla"
++
++#: git-gui.sh:1931
++msgid "Create..."
++msgstr "Skapa..."
++
++#: git-gui.sh:1937
++msgid "Checkout..."
++msgstr "Checka ut..."
++
++#: git-gui.sh:1943
++msgid "Rename..."
++msgstr "Byt namn..."
++
++#: git-gui.sh:1948 git-gui.sh:2048
++msgid "Delete..."
++msgstr "Ta bort..."
++
++#: git-gui.sh:1953
++msgid "Reset..."
++msgstr "Återställ..."
++
++#: git-gui.sh:1965 git-gui.sh:2350
++msgid "New Commit"
++msgstr "Ny incheckning"
++
++#: git-gui.sh:1973 git-gui.sh:2357
++msgid "Amend Last Commit"
++msgstr "Lägg till föregående incheckning"
++
++#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
++msgid "Rescan"
++msgstr "Sök på nytt"
++
++#: git-gui.sh:1988
++msgid "Stage To Commit"
++msgstr "Köa för incheckning"
++
++#: git-gui.sh:1994
++msgid "Stage Changed Files To Commit"
++msgstr "Köa ändrade filer för incheckning"
++
++#: git-gui.sh:2000
++msgid "Unstage From Commit"
++msgstr "Ta bort från incheckningskö"
++
++#: git-gui.sh:2005 lib/index.tcl:393
++msgid "Revert Changes"
++msgstr "Återställ ändringar"
++
++#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
++msgid "Sign Off"
++msgstr "Skriv under"
++
++#: git-gui.sh:2016 git-gui.sh:2333
++msgid "Commit@@verb"
++msgstr "Checka in"
++
++#: git-gui.sh:2027
++msgid "Local Merge..."
++msgstr "Lokal sammanslagning..."
++
++#: git-gui.sh:2032
++msgid "Abort Merge..."
++msgstr "Avbryt sammanslagning..."
++
++#: git-gui.sh:2044
++msgid "Push..."
++msgstr "Sänd..."
++
++#: git-gui.sh:2055 lib/choose_repository.tcl:40
++msgid "Apple"
++msgstr "Äpple"
++
++#: 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 "Om %s"
++
++#: git-gui.sh:2062
++msgid "Preferences..."
++msgstr "Inställningar..."
++
++#: git-gui.sh:2070 git-gui.sh:2595
++msgid "Options..."
++msgstr "Alternativ..."
++
++#: git-gui.sh:2076 lib/choose_repository.tcl:46
++msgid "Help"
++msgstr "Hjälp"
++
++#: git-gui.sh:2117
++msgid "Online Documentation"
++msgstr "Webbdokumentation"
++
++#: git-gui.sh:2201
++#, tcl-format
++msgid "fatal: cannot stat path %s: No such file or directory"
++msgstr "ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
++
++#: git-gui.sh:2234
++msgid "Current Branch:"
++msgstr "Aktuell gren:"
++
++#: git-gui.sh:2255
++msgid "Staged Changes (Will Commit)"
++msgstr "Köade ändringar (kommer att checkas in)"
++
++#: git-gui.sh:2274
++msgid "Unstaged Changes"
++msgstr "Oköade ändringar"
++
++#: git-gui.sh:2323
++msgid "Stage Changed"
++msgstr "Köa ändrade"
++
++#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
++msgid "Push"
++msgstr "Sänd"
++
++#: git-gui.sh:2369
++msgid "Initial Commit Message:"
++msgstr "Inledande incheckningsmeddelande:"
++
++#: git-gui.sh:2370
++msgid "Amended Commit Message:"
++msgstr "Utökat incheckningsmeddelande:"
++
++#: git-gui.sh:2371
++msgid "Amended Initial Commit Message:"
++msgstr "Utökat inledande incheckningsmeddelande:"
++
++#: git-gui.sh:2372
++msgid "Amended Merge Commit Message:"
++msgstr "Utökat incheckningsmeddelande för sammanslagning:"
++
++#: git-gui.sh:2373
++msgid "Merge Commit Message:"
++msgstr "Incheckningsmeddelande för sammanslagning:"
++
++#: git-gui.sh:2374
++msgid "Commit Message:"
++msgstr "Incheckningsmeddelande:"
++
++#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
++msgid "Copy All"
++msgstr "Kopiera alla"
++
++#: git-gui.sh:2443 lib/blame.tcl:104
++msgid "File:"
++msgstr "Fil:"
++
++#: git-gui.sh:2545
++msgid "Refresh"
++msgstr "Uppdatera"
++
++#: git-gui.sh:2566
++msgid "Apply/Reverse Hunk"
++msgstr "Använd/återställ del"
++
++#: git-gui.sh:2572
++msgid "Decrease Font Size"
++msgstr "Minska teckensnittsstorlek"
++
++#: git-gui.sh:2576
++msgid "Increase Font Size"
++msgstr "Öka teckensnittsstorlek"
++
++#: git-gui.sh:2581
++msgid "Show Less Context"
++msgstr "Visa mindre sammanhang"
++
++#: git-gui.sh:2588
++msgid "Show More Context"
++msgstr "Visa mer sammanhang"
++
++#: git-gui.sh:2602
++msgid "Unstage Hunk From Commit"
++msgstr "Ta bort del ur incheckningskö"
++
++#: git-gui.sh:2604
++msgid "Stage Hunk For Commit"
++msgstr "Ställ del i incheckningskö"
++
++#: git-gui.sh:2623
++msgid "Initializing..."
++msgstr "Initierar..."
++
++#: 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 ""
++"Det finns möjliga problem med miljövariabler.\n"
++"\n"
++"Följande miljövariabler kommer troligen att\n"
++"ignoreras av alla Git-underprocesser som körs\n"
++"av %s:\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"
++"Detta beror på ett känt problem med\n"
++"Tcl-binären som följer med Cygwin."
++
++#: 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"
++"Du kan ersätta %s\n"
++"med att lägga in värden för inställningarna\n"
++"user.name och user.email i din personliga\n"
++"~/.gitconfig-fil.\n"
++
++#: lib/about.tcl:25
++msgid "git-gui - a graphical user interface for Git."
++msgstr "git-gui - ett grafiskt användargränssnitt för Git."
++
++#: lib/blame.tcl:77
++msgid "File Viewer"
++msgstr "Filvisare"
++
++#: lib/blame.tcl:81
++msgid "Commit:"
++msgstr "Incheckning:"
++
++#: lib/blame.tcl:249
++msgid "Copy Commit"
++msgstr "Kopiera incheckning"
++
++#: lib/blame.tcl:369
++#, tcl-format
++msgid "Reading %s..."
++msgstr "Läser %s..."
++
++#: lib/blame.tcl:473
++msgid "Loading copy/move tracking annotations..."
++msgstr "Läser spårningsanteckningar för kopiering/flyttning..."
++
++#: lib/blame.tcl:493
++msgid "lines annotated"
++msgstr "rader spårade"
++
++#: lib/blame.tcl:674
++msgid "Loading original location annotations..."
++msgstr "Läser in spårning av originalplacering..."
++
++#: lib/blame.tcl:677
++msgid "Annotation complete."
++msgstr "Spårning fullbordad."
++
++#: lib/blame.tcl:731
++msgid "Loading annotation..."
++msgstr "Läser in spårning..."
++
++#: lib/blame.tcl:787
++msgid "Author:"
++msgstr "Författare:"
++
++#: lib/blame.tcl:791
++msgid "Committer:"
++msgstr "Incheckare:"
++
++#: lib/blame.tcl:796
++msgid "Original File:"
++msgstr "Ursprunglig fil:"
++
++#: lib/blame.tcl:910
++msgid "Originally By:"
++msgstr "Ursprungligen av:"
++
++#: lib/blame.tcl:916
++msgid "In File:"
++msgstr "I filen:"
++
++#: lib/blame.tcl:921
++msgid "Copied Or Moved Here By:"
++msgstr "Kopierad eller flyttad hit av:"
++
++#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
++msgid "Checkout Branch"
++msgstr "Checka ut gren"
++
++#: lib/branch_checkout.tcl:23
++msgid "Checkout"
++msgstr "Checka ut"
++
++#: 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 "Avbryt"
++
++#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
++msgid "Revision"
++msgstr "Revision"
++
++#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
++msgid "Options"
++msgstr "Alternativ"
++
++#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
++msgid "Fetch Tracking Branch"
++msgstr "Hämta spårande gren"
++
++#: lib/branch_checkout.tcl:44
++msgid "Detach From Local Branch"
++msgstr "Koppla bort från lokal gren"
++
++#: lib/branch_create.tcl:22
++msgid "Create Branch"
++msgstr "Skapa gren"
++
++#: lib/branch_create.tcl:27
++msgid "Create New Branch"
++msgstr "Skapa ny gren"
++
++#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
++msgid "Create"
++msgstr "Skapa"
++
++#: lib/branch_create.tcl:40
++msgid "Branch Name"
++msgstr "Namn på gren"
++
++#: lib/branch_create.tcl:43
++msgid "Name:"
++msgstr "Namn:"
++
++#: lib/branch_create.tcl:58
++msgid "Match Tracking Branch Name"
++msgstr "Använd namn på spårad gren"
++
++#: lib/branch_create.tcl:66
++msgid "Starting Revision"
++msgstr "Inledande revision"
++
++#: lib/branch_create.tcl:72
++msgid "Update Existing Branch:"
++msgstr "Uppdatera befintlig gren:"
++
++#: lib/branch_create.tcl:75
++msgid "No"
++msgstr "Nej"
++
++#: lib/branch_create.tcl:80
++msgid "Fast Forward Only"
++msgstr "Endast snabbspolning"
++
++#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
++msgid "Reset"
++msgstr "Återställ"
++
++#: lib/branch_create.tcl:97
++msgid "Checkout After Creation"
++msgstr "Checka ut när skapad"
++
++#: lib/branch_create.tcl:131
++msgid "Please select a tracking branch."
++msgstr "Välj en gren att spåra."
++
++#: lib/branch_create.tcl:140
++#, tcl-format
++msgid "Tracking branch %s is not a branch in the remote repository."
++msgstr "Den spårade grenen %s är inte en gren i fjärrarkivet."
++
++#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
++msgid "Please supply a branch name."
++msgstr "Ange ett namn för grenen."
++
++#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
++#, tcl-format
++msgid "'%s' is not an acceptable branch name."
++msgstr "\"%s\" kan inte användas som namn på grenen."
++
++#: lib/branch_delete.tcl:15
++msgid "Delete Branch"
++msgstr "Ta bort gren"
++
++#: lib/branch_delete.tcl:20
++msgid "Delete Local Branch"
++msgstr "Ta bort lokal gren"
++
++#: lib/branch_delete.tcl:37
++msgid "Local Branches"
++msgstr "Lokala grenar"
++
++#: lib/branch_delete.tcl:52
++msgid "Delete Only If Merged Into"
++msgstr "Ta bara bort om sammanslagen med"
++
++#: lib/branch_delete.tcl:54
++msgid "Always (Do not perform merge test.)"
++msgstr "Alltid (utför inte sammanslagningstest)."
++
++#: lib/branch_delete.tcl:103
++#, tcl-format
++msgid "The following branches are not completely merged into %s:"
++msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
++
++#: lib/branch_delete.tcl:115
++msgid ""
++"Recovering deleted branches is difficult. \n"
++"\n"
++" Delete the selected branches?"
++msgstr ""
++"Det är svårt att återställa borttagna grenar.\n"
++"\n"
++" Ta bort valda grenar?"
++
++#: lib/branch_delete.tcl:141
++#, tcl-format
++msgid ""
++"Failed to delete branches:\n"
++"%s"
++msgstr ""
++"Kunde inte ta bort grenar:\n"
++"%s"
++
++#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
++msgid "Rename Branch"
++msgstr "Byt namn på gren"
++
++#: lib/branch_rename.tcl:26
++msgid "Rename"
++msgstr "Byt namn"
++
++#: lib/branch_rename.tcl:36
++msgid "Branch:"
++msgstr "Gren:"
++
++#: lib/branch_rename.tcl:39
++msgid "New Name:"
++msgstr "Nytt namn:"
++
++#: lib/branch_rename.tcl:75
++msgid "Please select a branch to rename."
++msgstr "Välj en gren att byta namn på."
++
++#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
++#, tcl-format
++msgid "Branch '%s' already exists."
++msgstr "Grenen \"%s\" finns redan."
++
++#: lib/branch_rename.tcl:117
++#, tcl-format
++msgid "Failed to rename '%s'."
++msgstr "Kunde inte byta namn på \"%s\"."
++
++#: lib/browser.tcl:17
++msgid "Starting..."
++msgstr "Startar..."
++
++#: lib/browser.tcl:26
++msgid "File Browser"
++msgstr "Filbläddrare"
++
++#: lib/browser.tcl:125 lib/browser.tcl:142
++#, tcl-format
++msgid "Loading %s..."
++msgstr "Läser %s..."
++
++#: lib/browser.tcl:186
++msgid "[Up To Parent]"
++msgstr "[Upp till förälder]"
++
++#: lib/browser.tcl:266 lib/browser.tcl:272
++msgid "Browse Branch Files"
++msgstr "Bläddra filer på grenen"
++
++#: 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äddra"
++
++#: lib/checkout_op.tcl:79
++#, tcl-format
++msgid "Fetching %s from %s"
++msgstr "Hämtar %s från %s"
++
++#: lib/checkout_op.tcl:127
++#, tcl-format
++msgid "fatal: Cannot resolve %s"
++msgstr "ödesdigert: Kunde inte slå upp %s"
++
++#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
++msgid "Close"
++msgstr "Stäng"
++
++#: lib/checkout_op.tcl:169
++#, tcl-format
++msgid "Branch '%s' does not exist."
++msgstr "Grenen \"%s\" finns inte."
++
++#: 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 ""
++"Grenen \"%s\" finns redan.\n"
++"\n"
++"Den kan inte snabbspolas till %s.\n"
++"En sammanslagning krävs."
++
++#: lib/checkout_op.tcl:220
++#, tcl-format
++msgid "Merge strategy '%s' not supported."
++msgstr "Sammanslagningsstrategin \"%s\" stöds inte."
++
++#: lib/checkout_op.tcl:239
++#, tcl-format
++msgid "Failed to update '%s'."
++msgstr "Misslyckades med att uppdatera \"%s\"."
++
++#: lib/checkout_op.tcl:251
++msgid "Staging area (index) is already locked."
++msgstr "Köområdet (index) är redan låst."
++
++#: 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 ""
++"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
++"\n"
++"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du "
++"måste utföra en ny sökning innan den aktuella grenen kan ändras.\n"
++"\n"
++"Sökningen kommer att startas automatiskt nu.\n"
++
++#: lib/checkout_op.tcl:322
++#, tcl-format
++msgid "Updating working directory to '%s'..."
++msgstr "Uppdaterar arbetskatalogen till \"%s\"..."
++
++#: lib/checkout_op.tcl:353
++#, tcl-format
++msgid "Aborted checkout of '%s' (file level merging is required)."
++msgstr "Avbryter utcheckning av \"%s\" (sammanslagning på filnivå krävs)."
++
++#: lib/checkout_op.tcl:354
++msgid "File level merge required."
++msgstr "Sammanslagning på filnivå krävs."
++
++#: lib/checkout_op.tcl:358
++#, tcl-format
++msgid "Staying on branch '%s'."
++msgstr "Stannar på grenen \"%s\"."
++
++#: 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 ""
++"Du är inte längre på en lokal gren.\n"
++"\n"
++"Om du ville vara på en gren skapar du en nu, baserad på \"Denna "
++"frånkopplade utcheckning\"."
++
++#: lib/checkout_op.tcl:446
++#, tcl-format
++msgid "Checked out '%s'."
++msgstr "Checkade ut \"%s\"."
++
++#: lib/checkout_op.tcl:478
++#, tcl-format
++msgid "Resetting '%s' to '%s' will lose the following commits:"
++msgstr "Om du återställer \"%s\" till \"%s\" får följande incheckningar förlorade:"
++
++#: lib/checkout_op.tcl:500
++msgid "Recovering lost commits may not be easy."
++msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar."
++
++#: lib/checkout_op.tcl:505
++#, tcl-format
++msgid "Reset '%s'?"
++msgstr "Återställa \"%s\"?"
++
++#: lib/checkout_op.tcl:510 lib/merge.tcl:164
++msgid "Visualize"
++msgstr "Visualisera"
++
++#: 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 ""
++"Kunde inte ställa in aktuell gren.\n"
++"\n"
++"Arbetskatalogen har bara växlats delvis. Vi uppdaterade filerna "
++"utan problem, men kunde inte uppdatera en intern fil i Git.\n"
++"\n"
++"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp."
++
++#: lib/choose_font.tcl:39
++msgid "Select"
++msgstr "Välj"
++
++#: lib/choose_font.tcl:53
++msgid "Font Family"
++msgstr "Teckensnittsfamilj"
++
++#: lib/choose_font.tcl:73
++msgid "Font Size"
++msgstr "Storlek"
++
++#: lib/choose_font.tcl:90
++msgid "Font Example"
++msgstr "Exempel"
++
++#: lib/choose_font.tcl:101
++msgid ""
++"This is example text.\n"
++"If you like this text, it can be your font."
++msgstr ""
++"Detta är en exempeltext.\n"
++"Om du tycker om den här texten kan den vara ditt teckensnitt."
++
++#: 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 "Skapa nytt arkiv"
++
++#: lib/choose_repository.tcl:86
++msgid "New..."
++msgstr "Nytt..."
++
++#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
++msgid "Clone Existing Repository"
++msgstr "Klona befintligt arkiv"
++
++#: lib/choose_repository.tcl:99
++msgid "Clone..."
++msgstr "Klona..."
++
++#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
++msgid "Open Existing Repository"
++msgstr "Öppna befintligt arkiv"
++
++#: lib/choose_repository.tcl:112
++msgid "Open..."
++msgstr "Öppna..."
++
++#: lib/choose_repository.tcl:125
++msgid "Recent Repositories"
++msgstr "Senaste arkiven"
++
++#: lib/choose_repository.tcl:131
++msgid "Open Recent Repository:"
++msgstr "Öppna tidigare arkiv:"
++
++#: lib/choose_repository.tcl:294
++#, tcl-format
++msgid "Location %s already exists."
++msgstr "Platsen %s finns redan."
++
++#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
++#: lib/choose_repository.tcl:314
++#, tcl-format
++msgid "Failed to create repository %s:"
++msgstr "Kunde inte skapa arkivet %s:"
++
++#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
++msgid "Directory:"
++msgstr "Katalog:"
++
++#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
++#: lib/choose_repository.tcl:1013
++msgid "Git Repository"
++msgstr "Gitarkiv"
++
++#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
++#, tcl-format
++msgid "Directory %s already exists."
++msgstr "Katalogen %s finns redan."
++
++#: lib/choose_repository.tcl:442
++#, tcl-format
++msgid "File %s already exists."
++msgstr "Filen %s finns redan."
++
++#: lib/choose_repository.tcl:463
++msgid "Clone"
++msgstr "Klona"
++
++#: lib/choose_repository.tcl:476
++msgid "URL:"
++msgstr "Webbadress:"
++
++#: lib/choose_repository.tcl:496
++msgid "Clone Type:"
++msgstr "Typ av klon:"
++
++#: lib/choose_repository.tcl:502
++msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
++msgstr "Standard (snabb, semiredundant, hårda länkar)"
++
++#: lib/choose_repository.tcl:508
++msgid "Full Copy (Slower, Redundant Backup)"
++msgstr "Full kopia (långsammare, redundant säkerhetskopia)"
++
++#: lib/choose_repository.tcl:514
++msgid "Shared (Fastest, Not Recommended, No Backup)"
++msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)"
++
++#: 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 "Inte ett Gitarkiv: %s"
++
++#: lib/choose_repository.tcl:586
++msgid "Standard only available for local repository."
++msgstr "Standard är endast tillgängligt för lokala arkiv."
++
++#: lib/choose_repository.tcl:590
++msgid "Shared only available for local repository."
++msgstr "Delat är endast tillgängligt för lokala arkiv."
++
++#: lib/choose_repository.tcl:617
++msgid "Failed to configure origin"
++msgstr "Kunde inte konfigurera ursprung"
++
++#: lib/choose_repository.tcl:629
++msgid "Counting objects"
++msgstr "Räknar objekt"
++
++#: lib/choose_repository.tcl:630
++msgid "buckets"
++msgstr "hinkar"
++
++#: lib/choose_repository.tcl:654
++#, tcl-format
++msgid "Unable to copy objects/info/alternates: %s"
++msgstr "Kunde inte kopiera objekt/info/alternativ: %s"
++
++#: lib/choose_repository.tcl:690
++#, tcl-format
++msgid "Nothing to clone from %s."
++msgstr "Ingenting att klona från %s."
++
++#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
++#: lib/choose_repository.tcl:918
++msgid "The 'master' branch has not been initialized."
++msgstr "Grenen \"master\" har inte initierats."
++
++#: lib/choose_repository.tcl:705
++msgid "Hardlinks are unavailable.  Falling back to copying."
++msgstr "Hårda länkar är inte tillgängliga. Faller tillbaka på kopiering."
++
++#: lib/choose_repository.tcl:717
++#, tcl-format
++msgid "Cloning from %s"
++msgstr "Klonar från %s"
++
++#: lib/choose_repository.tcl:748
++msgid "Copying objects"
++msgstr "Kopierar objekt"
++
++#: lib/choose_repository.tcl:749
++msgid "KiB"
++msgstr "KiB"
++
++#: lib/choose_repository.tcl:773
++#, tcl-format
++msgid "Unable to copy object: %s"
++msgstr "Kunde inte kopiera objekt: %s"
++
++#: lib/choose_repository.tcl:783
++msgid "Linking objects"
++msgstr "Länkar objekt"
++
++#: lib/choose_repository.tcl:784
++msgid "objects"
++msgstr "objekt"
++
++#: lib/choose_repository.tcl:792
++#, tcl-format
++msgid "Unable to hardlink object: %s"
++msgstr "Kunde inte hårdlänka objekt: %s"
++
++#: lib/choose_repository.tcl:847
++msgid "Cannot fetch branches and objects.  See console output for details."
++msgstr "Kunde inte hämta grenar och objekt. Se konsolutdata för detaljer."
++
++#: lib/choose_repository.tcl:858
++msgid "Cannot fetch tags.  See console output for details."
++msgstr "Kunde inte hämta taggar. Se konsolutdata för detaljer."
++
++#: lib/choose_repository.tcl:882
++msgid "Cannot determine HEAD.  See console output for details."
++msgstr "Kunde inte avgöra HEAD. Se konsolutdata för detaljer."
++
++#: lib/choose_repository.tcl:891
++#, tcl-format
++msgid "Unable to cleanup %s"
++msgstr "Kunde inte städa upp %s"
++
++#: lib/choose_repository.tcl:897
++msgid "Clone failed."
++msgstr "Kloning misslyckades."
++
++#: lib/choose_repository.tcl:904
++msgid "No default branch obtained."
++msgstr "Hämtade ingen standardgren."
++
++#: lib/choose_repository.tcl:915
++#, tcl-format
++msgid "Cannot resolve %s as a commit."
++msgstr "Kunde inte slå upp %s till någon incheckning."
++
++#: lib/choose_repository.tcl:927
++msgid "Creating working directory"
++msgstr "Skapar arbetskatalog"
++
++#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
++#: lib/index.tcl:193
++msgid "files"
++msgstr "filer"
++
++#: lib/choose_repository.tcl:957
++msgid "Initial file checkout failed."
++msgstr "Inledande filutcheckning misslyckades."
++
++#: lib/choose_repository.tcl:973
++msgid "Open"
++msgstr "Öppna"
++
++#: lib/choose_repository.tcl:983
++msgid "Repository:"
++msgstr "Arkiv:"
++
++#: lib/choose_repository.tcl:1033
++#, tcl-format
++msgid "Failed to open repository %s:"
++msgstr "Kunde inte öppna arkivet %s:"
++
++#: lib/choose_rev.tcl:53
++msgid "This Detached Checkout"
++msgstr "Denna frånkopplade utcheckning"
++
++#: lib/choose_rev.tcl:60
++msgid "Revision Expression:"
++msgstr "Revisionsuttryck:"
++
++#: lib/choose_rev.tcl:74
++msgid "Local Branch"
++msgstr "Lokal gren"
++
++#: lib/choose_rev.tcl:79
++msgid "Tracking Branch"
++msgstr "Spårande gren"
++
++#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
++msgid "Tag"
++msgstr "Tagg"
++
++#: lib/choose_rev.tcl:317
++#, tcl-format
++msgid "Invalid revision: %s"
++msgstr "Ogiltig revision: %s"
++
++#: lib/choose_rev.tcl:338
++msgid "No revision selected."
++msgstr "Ingen revision vald."
++
++#: lib/choose_rev.tcl:346
++msgid "Revision expression is empty."
++msgstr "Revisionsuttrycket är tomt."
++
++#: lib/choose_rev.tcl:530
++msgid "Updated"
++msgstr "Uppdaterad"
++
++#: lib/choose_rev.tcl:558
++msgid "URL"
++msgstr "Webbadress"
++
++#: 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 ""
++"Det finns ingenting att utöka.\n"
++"\n"
++"Du håller på att skapa den inledande incheckningen. Det finns ingen tidigare "
++"incheckning att utöka.\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 ""
++"Kan inte utöka vid sammanslagning.\n"
++"\n"
++"Du är i mitten av en sammanslagning som inte är fullbordad. Du kan "
++"inte utöka tidigare incheckningar om du inte först avbryter den "
++"pågående sammanslagningen.\n"
++
++#: lib/commit.tcl:49
++msgid "Error loading commit data for amend:"
++msgstr "Fel vid inläsning av incheckningsdata för utökning:"
++
++#: lib/commit.tcl:76
++msgid "Unable to obtain your identity:"
++msgstr "Kunde inte hämta din identitet:"
++
++#: lib/commit.tcl:81
++msgid "Invalid GIT_COMMITTER_IDENT:"
++msgstr "Felaktig GIT_COMMITTER_IDENT:"
++
++#: 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 ""
++"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
++"\n"
++"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du "
++"måste utföra en ny sökning innan du kan göra en ny incheckning.\n"
++"\n"
++"Sökningen kommer att startas automatiskt nu.\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 ""
++"Osammanslagna filer kan inte checkas in.\n"
++"\n"
++"Filen %s har sammanslagningskonflikter. Du måste lösa dem och köa filen "
++"innan du checkar in den.\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 ""
++"Okänd filstatus %s upptäckt.\n"
++"\n"
++"Filen %s kan inte checkas in av programmet.\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 ""
++"Inga ändringar att checka in.\n"
++"\n"
++"Du måste köa åtminstone en fil innan du kan checka in.\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 ""
++"Ange ett incheckningsmeddelande.\n"
++"\n"
++"Ett bra incheckningsmeddelande har följande format:\n"
++"\n"
++"- Första raden: Beskriv i en mening vad du gjorde.\n"
++"- Andra raden: Tom\n"
++"- Följande rader: Beskriv varför det här är en bra ändring.\n"
++
++#: lib/commit.tcl:257
++msgid "write-tree failed:"
++msgstr "write-tree misslyckades:"
++
++#: lib/commit.tcl:275
++#, tcl-format
++msgid "Commit %s appears to be corrupt"
++msgstr "Incheckningen %s verkar vara trasig"
++
++#: 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 ""
++"Inga ändringar att checka in.\n"
++"\n"
++"Inga filer ändrades av incheckningen och det var inte en sammanslagning.\n"
++"\n"
++"En sökning kommer att startas automatiskt nu.\n"
++
++#: lib/commit.tcl:286
++msgid "No changes to commit."
++msgstr "Inga ändringar att checka in."
++
++#: lib/commit.tcl:303
++#, tcl-format
++msgid "warning: Tcl does not support encoding '%s'."
++msgstr "varning: Tcl stöder inte teckenkodningen \"%s\"."
++
++#: lib/commit.tcl:317
++msgid "commit-tree failed:"
++msgstr "commit-tree misslyckades:"
++
++#: lib/commit.tcl:339
++msgid "update-ref failed:"
++msgstr "update-ref misslyckades:"
++
++#: lib/commit.tcl:430
++#, tcl-format
++msgid "Created commit %s: %s"
++msgstr "Skapade incheckningen %s: %s"
++
++#: lib/console.tcl:57
++msgid "Working... please wait..."
++msgstr "Arbetar... vänta..."
++
++#: lib/console.tcl:183
++msgid "Success"
++msgstr "Lyckades"
++
++#: lib/console.tcl:196
++msgid "Error: Command Failed"
++msgstr "Fel: Kommando misslyckades"
++
++#: lib/database.tcl:43
++msgid "Number of loose objects"
++msgstr "Antal lösa objekt"
++
++#: lib/database.tcl:44
++msgid "Disk space used by loose objects"
++msgstr "Diskutrymme använt av lösa objekt"
++
++#: lib/database.tcl:45
++msgid "Number of packed objects"
++msgstr "Antal packade objekt"
++
++#: lib/database.tcl:46
++msgid "Number of packs"
++msgstr "Antal paket"
++
++#: lib/database.tcl:47
++msgid "Disk space used by packed objects"
++msgstr "Diskutrymme använt av packade objekt"
++
++#: lib/database.tcl:48
++msgid "Packed objects waiting for pruning"
++msgstr "Packade objekt som väntar på städning"
++
++#: lib/database.tcl:49
++msgid "Garbage files"
++msgstr "Skräpfiler"
++
++#: lib/database.tcl:72
++msgid "Compressing the object database"
++msgstr "Komprimerar objektdatabasen"
++
++#: lib/database.tcl:83
++msgid "Verifying the object database with fsck-objects"
++msgstr "Verifierar objektdatabasen med fsck-objects"
++
++#: 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 ""
++"Arkivet har för närvarande omkring %i lösa objekt.\n"
++"\n"
++"För att bibehålla optimal prestanda rekommenderas det å det bestämdaste att "
++"du komprimerar databasen när den innehåller mer än %i lösa objekt.\n"
++"\n"
++"Komprimera databasen nu?"
++
++#: lib/date.tcl:25
++#, tcl-format
++msgid "Invalid date from Git: %s"
++msgstr "Ogiltigt datum från 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 ""
++"Hittade inga skillnader.\n"
++"\n"
++"%s innehåller inga ändringar.\n"
++"\n"
++"Modifieringsdatum för filen uppdaterades av ett annat program, men innehållet "
++"i filen har inte ändrats.\n"
++"\n"
++"En sökning kommer automatiskt att startas för att hitta andra filer som kan "
++"vara i samma tillstånd."
++
++#: lib/diff.tcl:81
++#, tcl-format
++msgid "Loading diff of %s..."
++msgstr "Läser differens för %s..."
++
++#: lib/diff.tcl:114 lib/diff.tcl:184
++#, tcl-format
++msgid "Unable to display %s"
++msgstr "Kan inte visa %s"
++
++#: lib/diff.tcl:115
++msgid "Error loading file:"
++msgstr "Fel vid läsning av fil:"
++
++#: lib/diff.tcl:122
++msgid "Git Repository (subproject)"
++msgstr "Gitarkiv (underprojekt)"
++
++#: lib/diff.tcl:134
++msgid "* Binary file (not showing content)."
++msgstr "* Binärfil (visar inte innehållet)."
++
++#: lib/diff.tcl:185
++msgid "Error loading diff:"
++msgstr "Fel vid inläsning av differens:"
++
++#: lib/diff.tcl:302
++msgid "Failed to unstage selected hunk."
++msgstr "Kunde inte ta bort den valda delen från kön."
++
++#: lib/diff.tcl:309
++msgid "Failed to stage selected hunk."
++msgstr "Kunde inte lägga till den valda delen till kön."
++
++#: lib/error.tcl:12 lib/error.tcl:102
++msgid "error"
++msgstr "fel"
++
++#: lib/error.tcl:28
++msgid "warning"
++msgstr "varning"
++
++#: lib/error.tcl:81
++msgid "You must correct the above errors before committing."
++msgstr "Du måste rätta till felen ovan innan du checkar in."
++
++#: lib/index.tcl:6
++msgid "Unable to unlock the index."
++msgstr "Kunde inte låsa upp indexet."
++
++#: lib/index.tcl:15
++msgid "Index Error"
++msgstr "Indexfel"
++
++#: lib/index.tcl:21
++msgid ""
++"Updating the Git index failed.  A rescan will be automatically started to "
++"resynchronize git-gui."
++msgstr ""
++"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas "
++"automatiskt för att synkronisera om git-gui."
++
++#: lib/index.tcl:27
++msgid "Continue"
++msgstr "Forstätt"
++
++#: lib/index.tcl:31
++msgid "Unlock Index"
++msgstr "LÃ¥s upp index"
++
++#: lib/index.tcl:282
++#, tcl-format
++msgid "Unstaging %s from commit"
++msgstr "Tar bort %s för incheckningskön"
++
++#: lib/index.tcl:326
++#, tcl-format
++msgid "Adding %s"
++msgstr "Lägger till %s"
++
++#: lib/index.tcl:381
++#, tcl-format
++msgid "Revert changes in file %s?"
++msgstr "Återställ ändringarna i filen %s?"
++
++#: lib/index.tcl:383
++#, tcl-format
++msgid "Revert changes in these %i files?"
++msgstr "Återställ ändringarna i dessa %i filer?"
++
++#: lib/index.tcl:389
++msgid "Any unstaged changes will be permanently lost by the revert."
++msgstr "Alla oköade ändringar kommer permanent gå förlorade vid återställningen."
++
++#: lib/index.tcl:392
++msgid "Do Nothing"
++msgstr "Gör ingenting"
++
++#: 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 ""
++"Kan inte slå ihop vid utökning.\n"
++"\n"
++"Du måste föra färdig utökningen av incheckningen innan du påbörjar någon "
++"slags sammanslagning.\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 ""
++"Det senaste inlästa tillståndet motsvarar inte tillståndet i arkivet.\n"
++"\n"
++"Ett annat Git-program har ändrat arkivet sedan senaste avsökningen. Du "
++"måste utföra en ny sökning innan du kan utföra en sammanslagning.\n"
++"\n"
++"Sökningen kommer att startas automatiskt nu.\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 ""
++"Du är mitt i en sammanslagning med konflikter.\n"
++"\n"
++"Filen %s har sammanslagningskonflikter.\n"
++"\n"
++"Du måste lösa dem, köa filen och checka in för att fullborda den aktuella "
++"sammanslagningen. När du gjort det kan du påbörja en ny sammanslagning.\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 ""
++"Du är mitt i en ändring.\n"
++"\n"
++"Filen %s har ändringar.\n"
++"\n"
++"Du bör fullborda den aktuella incheckningen innan du påbörjar en "
++"sammanslagning. Om du gör det blir det enklare att avbryta en misslyckad "
++"sammanslagning, om det skulle vara nödvändigt.\n"
++
++#: lib/merge.tcl:106
++#, tcl-format
++msgid "%s of %s"
++msgstr "%s av %s"
++
++#: lib/merge.tcl:119
++#, tcl-format
++msgid "Merging %s and %s"
++msgstr "Slår ihop %s och %s"
++
++#: lib/merge.tcl:131
++msgid "Merge completed successfully."
++msgstr "Sammanslagningen avslutades framgångsrikt."
++
++#: lib/merge.tcl:133
++msgid "Merge failed.  Conflict resolution is required."
++msgstr "Sammanslagningen misslyckades. Du måste lösa konflikterna."
++
++#: lib/merge.tcl:158
++#, tcl-format
++msgid "Merge Into %s"
++msgstr "Slå ihop i %s"
++
++#: lib/merge.tcl:177
++msgid "Revision To Merge"
++msgstr "Revisioner att slå ihop"
++
++#: lib/merge.tcl:212
++msgid ""
++"Cannot abort while amending.\n"
++"\n"
++"You must finish amending this commit.\n"
++msgstr ""
++"Kan inte avbryta vid utökning.\n"
++"\n"
++"Du måste göra dig färdig med att utöka incheckningen.\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 ""
++"Avbryt sammanslagning?\n"
++"\n"
++"Om du avbryter sammanslagningen kommer *ALLA* ej incheckade ändringar att "
++"gå förlorade.\n"
++"\n"
++"GÃ¥ vidare med att avbryta den aktuella sammanslagningen?"
++
++#: 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 ""
++"Återställ ändringar?\n"
++"\n"
++"Om du återställer ändringarna kommer *ALLA* ej incheckade ändringar att "
++"gå förlorade.\n"
++"\n"
++"Gå vidare med att återställa de aktuella ändringarna?"
++
++#: lib/merge.tcl:239
++msgid "Aborting"
++msgstr "Avbryter"
++
++#: lib/merge.tcl:266
++msgid "Abort failed."
++msgstr "Misslyckades avbryta."
++
++#: lib/merge.tcl:268
++msgid "Abort completed.  Ready."
++msgstr "Avbrytning fullbordad. Redo."
++
++#: lib/option.tcl:82
++msgid "Restore Defaults"
++msgstr "Återställ standardvärden"
++
++#: lib/option.tcl:86
++msgid "Save"
++msgstr "Spara"
++
++#: lib/option.tcl:96
++#, tcl-format
++msgid "%s Repository"
++msgstr "Arkivet %s"
++
++#: lib/option.tcl:97
++msgid "Global (All Repositories)"
++msgstr "Globalt (alla arkiv)"
++
++#: lib/option.tcl:103
++msgid "User Name"
++msgstr "Användarnamn"
++
++#: lib/option.tcl:104
++msgid "Email Address"
++msgstr "E-postadress"
++
++#: lib/option.tcl:106
++msgid "Summarize Merge Commits"
++msgstr "Summera sammanslagningsincheckningar"
++
++#: lib/option.tcl:107
++msgid "Merge Verbosity"
++msgstr "Pratsamhet för sammanslagningar"
++
++#: lib/option.tcl:108
++msgid "Show Diffstat After Merge"
++msgstr "Visa diffstatistik efter sammanslagning"
++
++#: lib/option.tcl:110
++msgid "Trust File Modification Timestamps"
++msgstr "Lita på filändringstidsstämplar"
++
++#: lib/option.tcl:111
++msgid "Prune Tracking Branches During Fetch"
++msgstr "Städa spårade grenar vid hämtning"
++
++#: lib/option.tcl:112
++msgid "Match Tracking Branches"
++msgstr "Matcha spårade grenar"
++
++#: lib/option.tcl:113
++msgid "Number of Diff Context Lines"
++msgstr "Antal rader sammanhang i differenser"
++
++#: lib/option.tcl:114
++msgid "New Branch Name Template"
++msgstr "Mall för namn på nya grenar"
++
++#: lib/option.tcl:176
++msgid "Change Font"
++msgstr "Byt teckensnitt"
++
++#: lib/option.tcl:180
++#, tcl-format
++msgid "Choose %s"
++msgstr "Välj %s"
++
++#: lib/option.tcl:186
++msgid "pt."
++msgstr "p."
++
++#: lib/option.tcl:200
++msgid "Preferences"
++msgstr "Inställningar"
++
++#: lib/option.tcl:235
++msgid "Failed to completely save options:"
++msgstr "Misslyckades med att helt spara alternativ:"
++
++#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
++msgid "Delete Remote Branch"
++msgstr "Ta bort fjärrgren"
++
++#: lib/remote_branch_delete.tcl:47
++msgid "From Repository"
++msgstr "Från arkiv"
++
++#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
++msgid "Remote:"
++msgstr "Fjärr:"
++
++#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
++msgid "Arbitrary URL:"
++msgstr "Godtycklig webbadress:"
++
++#: lib/remote_branch_delete.tcl:84
++msgid "Branches"
++msgstr "Grenar"
++
++#: lib/remote_branch_delete.tcl:109
++msgid "Delete Only If"
++msgstr "Ta endast bort om"
++
++#: lib/remote_branch_delete.tcl:111
++msgid "Merged Into:"
++msgstr "Sammanslagen i:"
++
++#: lib/remote_branch_delete.tcl:119
++msgid "Always (Do not perform merge checks)"
++msgstr "Alltid (utför inte sammanslagningstest)"
++
++#: lib/remote_branch_delete.tcl:152
++msgid "A branch is required for 'Merged Into'."
++msgstr "En gren krävs för \"Sammanslagen i\"."
++
++#: lib/remote_branch_delete.tcl:184
++#, tcl-format
++msgid ""
++"The following branches are not completely merged into %s:\n"
++"\n"
++" - %s"
++msgstr ""
++"Följande grenar har inte helt slagits samman i %s:\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 ""
++"En eller flera av sammanslagningstesterna misslyckades eftersom du inte "
++"har hämtat de nödvändiga incheckningarna. Försök hämta från %s först."
++
++#: lib/remote_branch_delete.tcl:207
++msgid "Please select one or more branches to delete."
++msgstr "Välj en eller flera grenar att ta bort."
++
++#: lib/remote_branch_delete.tcl:216
++msgid ""
++"Recovering deleted branches is difficult.\n"
++"\n"
++"Delete the selected branches?"
++msgstr ""
++"Det kan vara svårt att återställa grenar.\n"
++"\n"
++"Ta bort de valda grenarna?"
++
++#: lib/remote_branch_delete.tcl:226
++#, tcl-format
++msgid "Deleting branches from %s"
++msgstr "Tar bort grenar från %s"
++
++#: lib/remote_branch_delete.tcl:286
++msgid "No repository selected."
++msgstr "Inget arkiv markerat."
++
++#: lib/remote_branch_delete.tcl:291
++#, tcl-format
++msgid "Scanning %s..."
++msgstr "Söker %s..."
++
++#: lib/remote.tcl:165
++msgid "Prune from"
++msgstr "Ta bort från"
++
++#: lib/remote.tcl:170
++msgid "Fetch from"
++msgstr "Hämta från"
++
++#: lib/remote.tcl:213
++msgid "Push to"
++msgstr "Sänd till"
++
++#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
++msgid "Cannot write shortcut:"
++msgstr "Kan inte skriva genväg:"
++
++#: lib/shortcut.tcl:136
++msgid "Cannot write icon:"
++msgstr "Kan inte skriva ikon:"
++
++#: lib/status_bar.tcl:83
++#, tcl-format
++msgid "%s ... %*i of %*i %s (%3i%%)"
++msgstr "%s... %*i av %*i %s (%3i%%)"
++
++#: lib/transport.tcl:6
++#, tcl-format
++msgid "fetch %s"
++msgstr "hämta %s"
++
++#: lib/transport.tcl:7
++#, tcl-format
++msgid "Fetching new changes from %s"
++msgstr "Hämtar nya ändringar från %s"
++
++#: lib/transport.tcl:18
++#, tcl-format
++msgid "remote prune %s"
++msgstr "fjärrborttagning %s"
++
++#: lib/transport.tcl:19
++#, tcl-format
++msgid "Pruning tracking branches deleted from %s"
++msgstr "Tar bort spårande grenar som tagits bort från %s"
++
++#: lib/transport.tcl:25 lib/transport.tcl:71
++#, tcl-format
++msgid "push %s"
++msgstr "sänd %s"
++
++#: lib/transport.tcl:26
++#, tcl-format
++msgid "Pushing changes to %s"
++msgstr "Sänder ändringar till %s"
++
++#: lib/transport.tcl:72
++#, tcl-format
++msgid "Pushing %s %s to %s"
++msgstr "Sänder %s %s till %s"
++
++#: lib/transport.tcl:89
++msgid "Push Branches"
++msgstr "Sänder grenar"
++
++#: lib/transport.tcl:103
++msgid "Source Branches"
++msgstr "Källgrenar"
++
++#: lib/transport.tcl:120
++msgid "Destination Repository"
++msgstr "Destinationsarkiv"
++
++#: lib/transport.tcl:158
++msgid "Transfer Options"
++msgstr "Överföringsalternativ"
++
++#: lib/transport.tcl:160
++msgid "Force overwrite existing branch (may discard changes)"
++msgstr "Tvinga överskrivning av befintlig gren (kan kasta bort ändringar)"
++
++#: lib/transport.tcl:164
++msgid "Use thin pack (for slow network connections)"
++msgstr "Använd tunt paket (för långsamma nätverksanslutningar)"
++
++#: lib/transport.tcl:168
++msgid "Include tags"
++msgstr "Ta med taggar"
++