Settings : FR translation

Patch set 2 : rebase, correction
Patch set 3 : correction

Change-Id: I1a1a3541f5e9e1a989df20666b56930d8c6708ce
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1