more template updates for i18n