PT-PT Translation

(cherry picked from commit d9b208ba7fe3dfdbd038e465203278b00ea2176e)

Conflicts:
	res/values/cr_strings.xml
PT-PT Translation (fixed directory)

Added cr_strings to values-pt

(cherry picked from commit 7a6e2d16a3fa7d22c391dc35c7afdaada4409aea)
Fixed cr_strings on values directory.

(cherry picked from commit a9203fe04760b67aa8b6ed502876a52ef6b9a7e3)

Conflicts:
	res/values/cr_strings.xml
Create cr_string.xml
(cherry picked from commit ab317d9560c2f2c1afa38cd13ab52895c4362b37)
HR translation

Translation to Croatian language

(cherry picked from commit f8af94887f18beed1bb3b9f72bf7871b26120ef8)
Create cr_strings.xml

Almost everything is translated into german language except the "action help" section. Didn´t exactly know how to translate.
(cherry picked from commit 42d360eaeea16decc1e895ded69497e9baa06857)
Fix FR Translations

(cherry picked from commit b1dd904ac34e328971f38eef6246147d6302347b)
Revert "Settings : Quick settings / Ribbons"

This reverts commit 52dfb665ccebc79ff7b5ab3d6cf40a7f8048e113.

Conflicts:

	res/values/strings.xml

(cherry picked from commit 1eb4df7b438b45659af0b04c0786b36af78d5537)

Conflicts:
	res/xml/settings_headers.xml
Settings : Quick settings / Ribbons

Port forward settings for quicksettings/ribbons

Patchset 7: Point to more fitting drawables (blunden)

Change-Id: I2d4659337f48338547a4e6c1efb8b32122319fe3

Conflicts:

	res/xml/settings_headers.xml

Patchset: 7
http://review.cyanogenmod.org/#/c/53648/
(cherry picked from commit 11d0be27b773e7d1d56f2b6f02bb32cb4649b42d)

Conflicts:
	res/xml/settings_headers.xml
Lockscreen: Add timeout and instant lock option to slide lock (1/2)

  This adds AOSP's new timeout and instant lock options to the
  slide (aka chooser) style lockscreen.

Change-Id: Ide8e8d14603e5111debcc7a7cf6c4b74898bfa3d

Conflicts:

	res/xml/security_settings_chooser.xml

Source
https://gerrit.omnirom.org/#/c/2378/

(cherry picked from commit 6c7df38895902bae438550c101860e821c86456d)
[2/2] Settings: Add lockscreen ring battery setting
Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

(cherry picked from commit 55440dff58cda3cec0747bf09126bd03ccf297de)
Fix translations errors

(cherry picked from commit bdf566597ec0a434515bd8d27fc5dab7f0982026)

Conflicts:
	res/values/cr_strings.xml
Add ES Translations

(cherry picked from commit 5d7a4c1251e24736054165532dd34f3d4e2aee73)
[1/2] Setting: Lockscreen maximized widgets
Settings part of maximizing lockscreen widgets

Modified from CM

PS2: fix whitespace and remove debug

Change-Id: I3d52b752415f48e5468db0804be5c2ff93a71e31
(cherry picked from commit 1d138cefec87c79ab2bd60a854cd5ef72f607426)
Fix Double Entry