Added a fex translation strings
resolved conflict