Settings: Fix for Transifex

Change-Id: Iac28c7fb7427b24659542c06fb2881ebc4d3c7a5
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cm_strings.xml