Small Translate refactoring
Merge pull request #173 from AntonShevchuk/master

Small Translate refactoring