i18n: Various german translation fixes
Merge branch 'german-i18n' into german-i18n-tmp