translation missing
Merge branch 'master' into quotes

Conflicts:
	config/locales/ca.yml
	config/locales/da.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
	config/locales/nl.yml
	config/locales/sv.yml