Merge pull request #7237 from sniok/bring-back-translations-again