Fixed some translate problems.
Merge remote-tracking branch 'origin/Bug#724', refs #724