am 370461ef: Clean up a few option strings under the Advanced settings

* commit '370461ef9f964cf2b118fa6076b77273b7caa917':
  Clean up a few option strings under the Advanced settings