ANNPLT-67 : Internationalization improvement