inserted tag i18n to html files
merge conflict solved