how to set preferences without generating new key, also fixed minor typos, style.
German version now up-to-date with English original from master changeset fcabf0f
Merge remote-tracking branch 'upstream/master'
removed extra spaces
Merge branch 'der-gabe-master'