Cleans a little part of english translations
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/eng/action.yml
Fixes previous forgotten conflicts
Fixes has_shape with indicators
Merge branch 'master' of github.com:ekylibre/ekylibre