Explicitly set defaultValue for statusbar clock

PS2: remove duplicate array and set correct defaultValue to 1 for right
  where 0 is don't show.

Change-Id: Ia108edf87239903dc39fcf46b541cf2b316f566c
Settings: PT-BR Translations

Change-Id: I5271a905ebfb0a3e124b8190af67ffd8579a0e0a
Settings: DA translation

Change-Id: Id89c70851a4db51ac4d88cc716ec713b9e3d02f6
Settings: CS translation

- added new CAF

Change-Id: Iab5e7a6fe4a5a960d0fe747e6f19315313be41cd
Settings: EL translations

Change-Id: Ib29013e546bcdbac340180edbee3f0cced862ee7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Settings: Update IW translations

translation of CAF strings
remove 3 unused strings from cm_strings.xml

Change-Id: Iaf9daaabe7ba6fd81dae236a96b0771b3f2b392f
Settings: update Privacy Guard help text string

Fix tiny error plus shorten string a bit

Change-Id: I3453d677a5bce8d8f58539d71283d47fe4a4cbf4
Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>
Settings: EL AOSP translation fixes

Come on AOSP, we're fixing these since ICS...

Change-Id: Ic94f25a2335d187c98d8712e8dbd3bcaac82cfb9
Settings: Fix button settings FC on Danish

Change-Id: I9997dceb43b7498fef10f49d9763505a0869ecc9
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Settings: ES translations

Change-Id: I5be369e183aee5fd1e9b74486be27956b72dd323
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Settings: NL translation

ps1/2: Add screen color settings
ps3: enable QuickBoot Settings UI
ps4: update Privacy Guard help text string

Change-Id: Ic6a999a434173be210479106ad603f6c71b42461
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
[TEMP] Revert "Active notifications:"

Active notifications introduced a few permissions security holes and could get itself wedged in a way that would periodically lock up some devices for 10 seconds.

This reverts commit a1ebf970003e1f53f584c167ada4d711fbc8d616.

Conflicts:

	AndroidManifest.xml
	res/values/dimens.xml
	res/values/vanir_arrays.xml
	res/values/vanir_attrs.xml
	res/values/vanir_strings.xml
	res/xml/active_notification_settings.xml
	res/xml/active_notifications.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/vanir/ActiveNotificationSettings.java
	src/com/android/settings/vanir/ActiveNotifications.java

Change-Id: I6967717fa3e34733a2f46ad8fae51b4c3fa8088b
Preference to disable navigation ring [2/2]

Change-Id: Icd9aa61d6752bbe0086cb9d87a912303c0f34db9
Merge remote-tracking branch 'upstream/kk44' into kk44