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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Turn short SHA1 names into links too
  gitk: Regenerate .po files
  gitk: New way of constructing menus that allows for Alt+letter accelerators
  gitk: Bind Key-Return to create on new branch dialog
  gitk: Fix binding for <Return> in sha1 entry field
  gitk: Clean up file encoding code and add enable/disable option
  gitk: Implement batch lookup and caching of encoding attrs
  gitk: Enhance file encoding support
  gitk: Add untranslated error messages to translation
  gitk: Fix a bug in collapsing deeply nested trees
  gitk: Use <Button-2> for context menus on OSX

diff --cc gitk-git/gitk
index 2eaa2ae7d6f692f6063ebbd211eaab30212c2eae,bcebc87f7d3800c20108ab1ae9aec0577e7c2cc7..bcebc87f7d3800c20108ab1ae9aec0577e7c2cc7
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/es.po
Simple merge

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

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