fix codepage error
fix codepage error
Merge branch 'my' of https://github.com/EcoleKeine/Cataclysm-DDA.git
Revert "fix codepage error"

This reverts commit ea236428ac2339c7a4022cc6f3eddc86c3071a31.
Revert "Revert "fix codepage error""

This reverts commit 92066be7cccce20126d31f7801123533c147cd4c.
Merge branch 'my'