Merge Settings : FR translation into cm-10.1

Change-Id: Ie9a456a75c2d9bb246916a6ed58a17ae8b3203d7