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

* git://git.kernel.org/pub/scm/gitk/gitk:
  gitk: Force the focus to the main window on Windows
  gitk: Allow unbalanced quotes/braces in commit headers
  gitk: Update German translation
  gitk: Mark forgotten strings (header sentence parts in color chooser) for translation
  gitk: Ensure that "Reset branch" menu entry is enabled
  gitk: Use check-buttons' -text property instead of separate labels
  gitk: Map / to focus the search box
  gitk: Fix bugs in blaming code

diff --cc gitk-git/gitk
index 64a873d2efae0496c0485a6051c4fdd21e190634,dc2a439618ffd92a92d9ca954a8597ba31875dab..dc2a439618ffd92a92d9ca954a8597ba31875dab
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk

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