Merge remote-tracking branch 'grunthos/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Grunthos/Book-Catalogue
German l10n for 5.0.9.
Merge branch 'master' of https://github.com/Grunthos/Book-Catalogue
German l10n for 5.0.9.
Merge branch 'l10n-de'

Conflicts:
	res/values-de/strings.xml
Merge remote-tracking branch 'upstream/master'
German l10n for 5.1.0.
Merge pull request #608 from rwetzlmayr/l10n-de

L10n de