IDEX-870
Replace hardcoded messges with loclization constatnts