add missing translation
make translation key singular for consistency
clean up template#import
Merge branch 'refs/heads/master' into template_import

* refs/heads/master:
  make translation key singular for consistency
  add missing translation