minhnguyen - fix localized messages