i18N part II
i18N part II refactoring
Conflict in i18n en.properties solved