Fork from spanish version, 30 june 2014