Merge pull request #938 from xhacker/update-translation