Sync with the original version. Unify some japanese words. Submitted by: kano@na.rim.or.jp
Submitted by: Akira Ikeuchi <a_ikeuchi@mic.mitsumi.co.jp>