fix typo
Merge pull request #145 from mauk81/patch-1

fix typo
Update locales.ini
Merge pull request #146 from FlashYoshi/master

Fixed some typos
Merge pull request #25 from jdm/master

上游合并