i18n update, fixed templates for translation parser
template fixes