fix language button
Merge branch 'jan' into 0.3