fix typos
Merge branch 'master' into german_translation
sync