ErikZalm/Marlin — pull request #255 by elgambitero (2012-09-26 17:18:32+00:00)
Title: Spanish language updated

Sorry for all the commits, I had some trouble syncing the repository after the ssh key vulnerability.

I think it's OK again. I merged all the previous changes.