minhnguyen - add localized messages