Moved locale setting into Translate class
Added more translation keys