ANNPLT-67 : Internationalization improvement
*changes provided by user auxepaul