Fix issue #2142, and add more translation support.