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

* git://repo.or.cz/git-gui:
  git-gui 0.12
  git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
  git-gui: Update Hungarian translation for 0.12
  git-gui: Fixed typos in Swedish translation.
  git-gui: Updated Swedish translation (515t0f0u).
  git gui: update Italian translation
  git-gui: Update Japanese translation for 0.12
  git-gui: Starting translation for Norwegian
  git-gui: Update German (completed) translation.
  git-gui: Update po template to include 'Mirroring %s' message
  git-gui: Fix commit encoding handling.
  git-gui: Fix handling of relative paths in blame.

diff --cc git-gui/GIT-VERSION-GEN
index 4e709ebe776f722ff5509c8bf1b9cfaf9d7923b4,0000000000000000000000000000000000000000..b3f937eace99ce1e25afbdbea678e9f6926dbc75
mode 100755,000000..100755
--- 1/git-gui/GIT-VERSION-GEN
--- /dev/null
+++ b/git-gui/GIT-VERSION-GEN
@@@ -1,80 -1,0 +1,80 @@@
- DEF_VER=0.11.GITGUI
 +#!/bin/sh
 +
 +GVF=GIT-VERSION-FILE
++DEF_VER=0.12.GITGUI
 +
 +LF='
 +'
 +
 +tree_search ()
 +{
 +      head=$1
 +      tree=$2
 +      for p in $(git rev-list --parents --max-count=1 $head 2>/dev/null)
 +      do
 +              test $tree = $(git rev-parse $p^{tree} 2>/dev/null) &&
 +              vn=$(git describe --abbrev=4 $p 2>/dev/null) &&
 +              case "$vn" in
 +              gitgui-[0-9]*) echo $vn; break;;
 +              esac
 +      done
 +}
 +
 +# Always use the tarball version file if found, just
 +# in case we are somehow contained in a larger git
 +# repository that doesn't actually track our state.
 +# (At least one package manager is doing this.)
 +#
 +# We may be a subproject, so try looking for the merge
 +# commit that supplied this directory content if we are
 +# not at the toplevel.  We probably will always be the
 +# second parent in the commit, but we shouldn't rely on
 +# that fact.
 +#
 +# If we are at the toplevel or the merge assumption fails
 +# try looking for a gitgui-* tag.
 +
 +if test -f version &&
 +   VN=$(cat version)
 +then
 +      : happy
 +elif prefix="$(git rev-parse --show-prefix 2>/dev/null)"
 +   test -n "$prefix" &&
 +   head=$(git rev-list --max-count=1 HEAD -- . 2>/dev/null) &&
 +   tree=$(git rev-parse --verify "HEAD:$prefix" 2>/dev/null) &&
 +   VN=$(tree_search $head $tree)
 +   case "$VN" in
 +   gitgui-[0-9]*) : happy ;;
 +   *) (exit 1) ;;
 +   esac
 +then
 +      VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 +elif VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
 +   case "$VN" in
 +   gitgui-[0-9]*) : happy ;;
 +   *) (exit 1) ;;
 +   esac
 +then
 +      VN=$(echo "$VN" | sed -e 's/^gitgui-//;s/-/./g');
 +else
 +      VN="$DEF_VER"
 +fi
 +
 +dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
 +case "$dirty" in
 +'')
 +      ;;
 +*)
 +      VN="$VN-dirty" ;;
 +esac
 +
 +if test -r $GVF
 +then
 +      VC=$(sed -e 's/^GITGUI_VERSION = //' <$GVF)
 +else
 +      VC=unset
 +fi
 +test "$VN" = "$VC" || {
 +      echo >&2 "GITGUI_VERSION = $VN"
 +      echo "GITGUI_VERSION = $VN" >$GVF
 +}

diff --cc git-gui/git-gui.sh
Simple merge

diff --cc git-gui/lib/blame.tcl
Simple merge

diff --cc git-gui/lib/commit.tcl
Simple merge

diff --cc git-gui/po/de.po
Simple merge

diff --cc git-gui/po/git-gui.pot
Simple merge

diff --cc git-gui/po/hu.po
Simple merge

diff --cc git-gui/po/it.po
Simple merge

diff --cc git-gui/po/ja.po
Simple merge

diff --cc git-gui/po/nb.po
index 0000000000000000000000000000000000000000,1c5137d84ca8797238dbcf1cbc6fd80218fbca5f..1c5137d84ca8797238dbcf1cbc6fd80218fbca5f
mode 000000,100644..100644
--- /dev/null
--- 2/po/nb.po
+++ b/git-gui/po/nb.po

diff --cc git-gui/po/sv.po
Simple merge