Merge pull request #1 from joewing/master

merging from joe
translation update
Merge branch 'vmnlopes-master'; commit 'b463ad5'