merge master - translation into Spanish

merge master - translation into Spanish