Fix issue #2142, and add translation support.