Fix translation according to PR comments