fix Bug
Merge branch 'master' of https://git.oschina.net/erawtfos/pycharm_zh_cn

Conflicts:
	messages/OptionsBundle.properties
merge files