Persian (Farsi) translation by Mohsen Hemati
Merge branch 'upstream/master'