Translation improvements
Merge pull request #812 from wuleicanada/patch-2

Translation improvements