more typos fixed
(cherry picked from commit 629ae896f503f31f9a99828902302c9b6b0987fd)
Update cr_strings.xml

One very small correction.
(cherry picked from commit c61a1bebd8c70ee3dc320f4f922f44387f34df0d)
Merge pull request #14 from felipereis666/patch-2

Update cr_strings.xml
(cherry picked from commit 654656b184303025e63e61b76d7a115830dc2327)
Merge branch 'cm-11.0' of git://github.com/redrum781/android_packages_apps_Settings into cm-11.0

Conflicts:
	res/values/cr_strings.xml

(cherry picked from commit bcbc1944194439878f852be465a94d38b75389f0)
Revert "Settings : Port lockscreen shortcut configuration (WIP)"

This reverts commit 01777c354f609dd5b482b72ca38aad02b741d27a.

(cherry picked from commit 5b05b547fc82e0b9b23ea1a35440055ec74c62e2)
Settings : Port lockscreen shortcut configuration (WIP)

Port lockscreen configuration from cm-10.2

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad

Conflicts:

	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

Patchset: 3
http://review.cyanogenmod.org/#/c/54067/
(cherry picked from commit 311d26ff8115c97142e54f7a66f9ff220f53fa99)