Pooja/Melanie |#3700| Adding translations
Melanie/Pooja |#3700| Adding error messages