some typo fixed. some order changed.
fixed till line 4045. fixed some typo. two _what_ retranslate.
Merge pull request #11 from DeathKing/master

Yet another pull request from DeathKing