Dialog text improvements

I am submitting these as a separate pull request from #228, since it may be a bit close to release to change so many strings...

The only commits that are different from the other pull request are the last two. (64fd644 and 8e630d4)