french/acroread8: resolve conflict