Update string translation.
Merge pull request #1368 from ismailsunni/translation

Update string translation.
Resolved merge conflicts
Resolved merge conflicts