[i18n:ja] correction of a word and phrase
Merge branch '2.x' into 2.1