work on #616 and update locales