Merge pull request #354 from farismosman/master

[#1563] Defects related to story #1246 From Faris
[#1540] Faris : Added translation for dynamic text.