Bug 24860: (QA follow-up) Terminology and translation fixes