Update translation
Merge branch 'master' into orz