Merged r12339 from trunk to 2.4-stable (#15524)
Japanese translation updated by Go MAEDA.
Authored by: marutosijp 2013-11-25
Parent: [r12340]
Child: [r12342]