working on #541 and FR language