Fix some problems with the user-visible strings from the GSettings schema. Fixes bug 683387 and bug 686500.