updated spanish messages file
first rev of stop merging