remove spin
fix language translation
Merge branch 'working-branch'