Merge pull request #590 from viking1/translation