Issue #21480: Fixed translation problems
Merge pull request #830 from lynnaloo/21480

Issue #21480: Fixed translation problems