Merge french translation