fix translation
fix conflict
Merge branch 'master' into staging
fix bug in wstatus scope
Merge branch 'staging' of github.com:alabs/oigame into staging