manual merge to fix conficts for 2.9.x with SAM-2184 fr_FR translation update 



git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@127396 66ffb92e-73f9-0310-93c1-f5514f145a0a