Merge the JA locale translation (phase 2)