Fixed 50Wliu's Changes of #233

I had to drop out several Taiwanese and Chinese changes, because the files were saved with CRLF instead of LF.

These are all the changes from @50Wliu 's #233 that could be cleanly applied.