Refactor translations

complete rebase?

(from redmine: issue id 532, created on 2018-01-22tgradl)