manually applied translation from 2.2.x
Merge pull request #1085 from wm3/issues_865

manually applied translation from 2.2.x