Enhance Spanish and Mexican support (bug #1566) thanks!