fix locale
Merge branch 'menu'