task #1458
Fixed translation
Merge remote-tracking branch 'upstream/master' into upmaster