Added locale for Spanish. Merged variants properly.