Merged r5502 from trunk.
Simplified Chinese translation updated by Peng Wang.
Authored by: tmaruyama 2011-04-18
Parent: [r5502]
Child: [r5504]