manually applied translation from 2.2.x
Merge pull request #1086 from wm3/issues_757

manually applied translation from 2.2.x