review and add some changes for localization