From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Jan 2010 20:57:44 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/gitk/gitk
X-Git-Tag: v1.7.0-rc1~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc4b10cd2dd4f23443d1c639b9c38a604fff3aa3;p=git.git

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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Update German translation
  gitk: Add French translation
  gitk: update Italian translation
  gitk: Update Swedish translation
  gitk: Adjust two equal strings which differed in whitespace
  gitk: Display submodule diffs with appropriate encoding
  gitk: Fix display of newly-created tags
  gitk: Enable gitk to create tags with messages
  gitk: Update Hungarian translation
  gitk: Add Hungarian translation
  gitk: Add "--no-replace-objects" option
---

fc4b10cd2dd4f23443d1c639b9c38a604fff3aa3
diff --cc gitk-git/gitk
index 364c7a84c,48cfce3a0..48cfce3a0
mode 100644,100755..100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
diff --cc gitk-git/po/fr.po
index 000000000,cb0e1edc6..cb0e1edc6
mode 000000,100644..100644
--- a/gitk-git/po/fr.po
+++ b/gitk-git/po/fr.po
diff --cc gitk-git/po/hu.po
index 000000000,1df212e88..1df212e88
mode 000000,100644..100644
--- a/gitk-git/po/hu.po
+++ b/gitk-git/po/hu.po