rolling back
Added translation with I18n
Translate more stuff
Internationalization
fixing merge