Translation fixes

Merge and delete