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

diff --cc gitk-git/gitk
index 364c7a8,48cfce3..48cfce3
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

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

diff --cc gitk-git/po/fr.po
index 0000000,cb0e1ed..cb0e1ed
mode 000000,100644..100644
--- /dev/null
--- 2/po/fr.po
+++ b/gitk-git/po/fr.po

diff --cc gitk-git/po/hu.po
index 0000000,1df212e..1df212e
mode 000000,100644..100644
--- /dev/null
--- 2/po/hu.po
+++ b/gitk-git/po/hu.po

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

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