Cherry german

cherry-picks of English tweaks from #1011 by @dertuxmalwieder