Merge git://git.kernel.org/pub/scm/gitk/gitk

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: initial Italian translation
  gitk: Default to using po2msg.sh if msgfmt doesn't grok --tcl, -l and -d
  gitk: Avoid Tcl error when switching views
  [PATCH] gitk: Don't show local changes when we there is no work tree
  [PATCH] gitk: Add horizontal scrollbar to the diff view
  [PATCH] gitk: make autoselect optional
  [PATCH] gitk: Mark another string for translation
  [PATCH] Add an --argscmd flag to get the list of refs to show
  gitk: Only restore window size from ~/.gitk, not position

diff --cc gitk-git/Makefile
index ae2b80b1083c18c6b0a15959fee304b6c43b3792,0000000000000000000000000000000000000000..f90dfabffa894741f500e513d5380c7752d0195c
mode 100644,000000..100644
--- 1/gitk-git/Makefile
--- /dev/null
+++ b/gitk-git/Makefile
@@@ -1,63 -1,0 +1,67 @@@
 +# The default target of this Makefile is...
 +all::
 +
 +prefix ?= $(HOME)
 +bindir ?= $(prefix)/bin
 +sharedir ?= $(prefix)/share
 +gitk_libdir   ?= $(sharedir)/gitk/lib
 +msgsdir    ?= $(gitk_libdir)/msgs
 +msgsdir_SQ  = $(subst ','\'',$(msgsdir))
 +
++TCL_PATH ?= tclsh
 +TCLTK_PATH ?= wish
 +INSTALL ?= install
 +RM ?= rm -f
 +
 +DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
 +bindir_SQ = $(subst ','\'',$(bindir))
 +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 +
 +## po-file creation rules
 +XGETTEXT   ?= xgettext
 +ifdef NO_MSGFMT
 +      MSGFMT ?= $(TCL_PATH) po/po2msg.sh
 +else
 +      MSGFMT ?= msgfmt
++      ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0)
++              MSGFMT := $(TCL_PATH) po/po2msg.sh
++      endif
 +endif
 +
 +PO_TEMPLATE = po/gitk.pot
 +ALL_POFILES = $(wildcard po/*.po)
 +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
 +
 +ifndef V
 +      QUIET          = @
 +      QUIET_GEN      = $(QUIET)echo '   ' GEN $@ &&
 +endif
 +
 +all:: gitk-wish $(ALL_MSGFILES)
 +
 +install:: all
 +      $(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +      $(INSTALL) -d '$(DESTDIR_SQ)$(msgsdir_SQ)'
 +      $(foreach p,$(ALL_MSGFILES), $(INSTALL) $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true
 +
 +uninstall::
 +      $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true
 +      $(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
 +
 +clean::
 +      $(RM) gitk-wish po/*.msg
 +
 +gitk-wish: gitk
 +      $(QUIET_GEN)$(RM) $@ $@+ && \
 +      sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
 +      chmod +x $@+ && \
 +      mv -f $@+ $@
 +
 +$(PO_TEMPLATE): gitk
 +      $(XGETTEXT) -kmc -LTcl -o $@ gitk
 +update-po:: $(PO_TEMPLATE)
 +      $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; )
 +$(ALL_MSGFILES): %.msg : %.po
 +      @echo Generating catalog $@
 +      $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@)
 +

diff --cc gitk-git/gitk
index f1f21e97bf5e89bd7609cf5b6d1f417e35a43b6c,84ab02e15f6bdecdd04e8835e3aefd0875efea44..84ab02e15f6bdecdd04e8835e3aefd0875efea44
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

diff --cc gitk-git/po/it.po
index 0000000000000000000000000000000000000000,d0f4c2e19ac15b10c01d6df968f823914cdbba4a..d0f4c2e19ac15b10c01d6df968f823914cdbba4a
mode 000000,100644..100644
--- /dev/null
--- 2/po/it.po
+++ b/gitk-git/po/it.po