Merged change from default branch: Correct Japanese menus.