translation fixes

Merge and delete