Support for translation of GUI text
Merge branch 'translation'