Merge Japanese Translation from @shinichiN