Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev