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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Fix selection of tags
  gitk: Default to the system colours on Windows
  gitk: Update Japanese translation
  gitk: Fix "git gui blame" invocation when called from top-level directory
  gitk: Disable checkout of remote branches
  gitk: Improve appearance of radiobuttons and checkbuttons
  gitk: Skip translation of "wrong Tcl version" message
  gitk: Add Japanese translation
  gitk: Use the --submodule option for displaying diffs when available
  gitk: Fix diffing committed -> staged (typo in diffcmd)
  gitk: Add configuration for UI colour scheme
  gitk: Don't compare fake children when comparing commits
  gitk: Show diff of commits at end of compare-commits output
  gitk: Add a user preference to enable/disable use of themed widgets
  gitk: Fix errors in the theme patch
  gitk: Use themed tk widgets
  gitk: Restore scrolling position of diff pane on back/forward in history

diff --cc gitk-git/gitk
index a0214b7004f141b7c918a5360d85f8f9e2db285c,364c7a84cbcf923deb72c2a91b4ec5f5d75bf4c3..364c7a84cbcf923deb72c2a91b4ec5f5d75bf4c3
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

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