Added more support for translations
Added more support for translations