Fix translations according to PR comments