Fix bugs
Add client-side locale strings