Move stale flash messages to flash.yml
Merge ../x0y0

Conflicts:
	config/locales/flash.es.yml