Merge branch 'translate-ja' into next