Translation file updates.
Merge pull request #1364 from ismailsunni/translation

Translation file updates.
Resolved merge conflicts