merge with trunk

merge the trunk kovarex/Factorio_Translation_German in my branch and
update some translations to have the same wording and use some
translations from the forum.