spanglish fixes
Merge branch 'rsolver' of https://github.com/enaguero/sistema_talleres_salmoneras into rsolver

* 'rsolver' of https://github.com/enaguero/sistema_talleres_salmoneras:
  cambio en idioma y en un bug del orden
  Changes in locals, except message not founded in select2
  Merging
  Poner como etapa recepción y despacho  #12742415828602

Conflicts:
	config/locales/views.es.yml
spanglish fixes