Unify notational variants.
Merge branch 'ja_JP'