String fixes

... and spanish translations

Change-Id: I5dd049fc443b830b0b7b74e57020253b8c94087a
Small cleanup