finish merging FR translations