Fix translations

several fixes

cheers

Change-Id: Ie4f304370d8566592939228dbdacd12c408e9d96