minhnguyen - add localization