* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
[PATCH] gitk: use user-configured background in view definition dialog
[PATCH] gitk: Update German translation
[PATCH] gitk: Update and fix Makefile
gitk: Restore some widget options whose defaults changed in Tk 8.5
gitk: Recode de.po to UTF-8
[PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8.
[PATCH] gitk i18n: More markup -- various options menus
[PATCH] gitk i18n: Initial German translation
[PATCH] gitk i18n: Markup several strings for translation
[PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs
[PATCH] gitk i18n: Add Makefile with rules for po file creation and installation