Committer: redrum781 <ycplayer@gmail.com>
 On branch cm-11.0
 Changes to be committed:

	modified:   res/values-hr/cr_strings.xml

(cherry picked from commit fa2953ace5027ba48d1e8b419facba3c9a749df6)
Update to FR version of cr_strings.xml

I fixed the part you said needed to be redone but I'm not sure if it's good enough or not. I've also added all the new stuff up until V10.
(cherry picked from commit 491493d0e51511795299da0370fc9c408e12939a)
Settings: DE translations

(cherry picked from commit cfd09eacc09e302de181c67c5609f5afc388a42e)
Settings: Enable menu key to unlock lockscreen

This is a temporary commit till actual commit comes up

(cherry picked from commit d00e61083f936190f7a339bfdbdda986bff96e14)
Remove the "enable widgets" preference properly

779a6aed2c89b17ee11e59710434dac31dfbd7ec removed this preference in
favor of a switch in the CM lock screen section, but failed to do so for
all lock screen types. Remove the broken preference from every possible
lock type to avoid confusing a lot of people (i.e. me) with a broken
toggle.

Change-Id: Ib1544cd5dcccb77a8f7a70b820035cf16cf43589

Conflicts:

	res/xml/security_settings_chooser.xml

(cherry picked from commit a484d4c395b3e9d3713a263fee8276d61dd52d83)
settings: lockscreen widgets (2/2)

see fb commit for more details

Change-Id: Ia8c365121c5f2fda92080b67717f50de25beb9bc
(cherry picked from commit 8a1563b48279ac45a37b7c3ecf4b0b557f5136af)
Revert "Update to FR version of cr_strings.xml"

This reverts commit 491493d0e51511795299da0370fc9c408e12939a.

Too many errors

(cherry picked from commit c169cc1ad3c08c04d171114b575938d9c6c1f76e)