New dictionary: fa
Merge branch 'fa'