Merge "Settings: FR translation" into cm-10.1

Change-Id: I00aec11a36fcba599280c839752be0ba3d0348be