Sync with the original version. Unify some japanese words. Submitted by: kano@na.rim.or.jp
Submitted by: Watanabe Kazuhiro <CQG00620@nifty.ne.jp> Reviewed by: Yoshihiko Sarumaru <mistral@imasy.or.jp>