Merge pull request #12919 from eileenmcnaughton/setting
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 11 Oct 2018 13:28:38 +0000 (14:28 +0100)
committerGitHub <noreply@github.com>
Thu, 11 Oct 2018 13:28:38 +0000 (14:28 +0100)
Translate various settings information


Trivial merge