Settings: Fix the failing strings

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

Merged changes from upstream