Fix template deletion blocking, update template names
fixes #3981 - add i18n support