Translate?
Refactoring... yay

Fixed dialogs
...
Merge branch 'Translate-test'