Minor fixes to translation.
Merge branch 'hotfix-translation'