Settings: FR translation

PS2: correction

Change-Id: Iee3df81d09c57dc776f174d76d3df0726f5a789f
HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Conflicts:
	res/values/arrays.xml
	res/values/pa_strings.xml
	res/xml/halo_control.xml
	src/com/android/settings/cyanogenmod/HaloControl.java
Settings: IW translations

Change-Id: I5329b62bde5d6458db37a6353950288e50a0cbec
Change CMUpdater with OTAUpdaterCenter
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge "Settings: IW translations" into cm-10.2
Merge "Settings: FR translation" into cm-10.2
Revert "HALO Mods (2/2)"

This reverts commit 6870ac2e915bb6f54bbf1dd2e9a041068ab80526.
Merge branch 'cm-10.2' of http://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]

Conflicts:
	res/values/arrays.xml
	res/values/pa_strings.xml
	res/xml/halo_control.xml
	src/com/android/settings/cyanogenmod/HaloControl.java
Add some missing strings
Merge branch 'cm-10.2' of github.com:CryosProject/android_packages_apps_Settings into cm-10.2