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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Display dirty submodules correctly
  gitk: Fix display of copyright symbol
  gitk: Add emacs editor variable block
  gitk: Avoid calling tk_setPalette on Windows
  gitk: Don't clobber "Remember this view" setting
  gitk: Add comments to explain encode_view_opts and decode_view_opts
  gitk: Use consistent font for all text input fields
  gitk: Set the font for all listbox widgets
  gitk: Set the font for all spinbox widgets
  gitk: Remove forced use of sans-serif font
  gitk: Add Ctrl-W shortcut for closing the active window

diff --cc gitk-git/gitk
index 1f36a3e815865fcc72b171b497f5c4e341e148ee,1b0e09a561e01c51bdc6dbced052e0c753924618..1b0e09a561e01c51bdc6dbced052e0c753924618
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/fr.po
Simple merge

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

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

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

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

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