Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui:
  git-gui: fix typo in lib/spellcheck.tcl
  git-gui: Shorten Aspell version strings to just Aspell version number
  git-gui: Gracefully display non-aspell version errors to users
  git-gui: Catch and display aspell startup failures to the user
  git-gui: Only bind the spellcheck popup suggestion hook once
  git-gui: Remove explicit references to 'aspell' in message strings
  git-gui: Ensure all spellchecker 'class' variables are initialized
  git-gui: Update German translation.
  git-gui: (i18n) Add newly added translation strings to template.

diff --cc git-gui/lib/about.tcl
Simple merge

diff --cc git-gui/lib/spellcheck.tcl
Simple merge

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

diff --cc git-gui/po/git-gui.pot
Simple merge

diff --cc git-gui/po/glossary/de.po
Simple merge