[de] fixed some old merging issues
[es_MX] merged vinkos.com contribution
[es] merged vinkos.com contribution (adapted from es_MX)