Settings: UMS [2/2]
Merge pull request #61 from redrum781/cm-11.0

Croatian V17 update
Update cr_strings.xml

Big german language Update.
Settings: Add option to enable activity indicators on status bar (2/2)
Merge branch 'cm-11.0' of github.com:temasek/android_packages_apps_Settings into cm-11.0
Merge pull request #62 from doncarloz/patch-7

Update cr_strings.xml
Settings: Initial DE translation

PS1:  Forward port strings from CM10.2

PS2:  Add translation for:
      * SMS security
      * Font size control
      * Longpress back to kill app

PS3:  Add translation for:
      * CAF bluetooth strings
      * Hostname setting
      * Privacy guard advanced settings menu link
      * Adaptive backlight settings
      * Performance profile settings
      * Power connect/disconect notification

PS4:  Add translation for:
      * lockscreen shortcut configuration
      * navigation ring customization
      * navigation bar customization
      * hardware key settings

PS5:  Minor cleanup
      Add translation for:
      * APN settings
      * untranslated AOSP strings
      * Circle Battery
      * Advanced Settings

PS6:  Minor wording changes
      Add translation for
      *cLock settings

PS7:  Add translation for:
      * Display wake on plug
      * Wi-Fi country code
      * Display rotation

Change-Id: I26c43659973cd2e8c2fc99b5345ee03fa50ff084
Revert "Settings: Add AOSP dummy strings"

This reverts commit 680b6bc8f5d4265fbc762d89ab4259730cee8339.

Google removed those strings with 4.4.1

Change-Id: If67f01234ddca36879a24c616f4843972048a8e3

Conflicts:

	res/values/cm_strings.xml
Modify Changelog to fragment

Patchset 1) Initial commit
(gweedo767)
Patchset 2) Clean up XML and imports
(gweedo767)
patchset 3) removed setHasOptionsMenu
(gweedo767)
patchset 4) removed hardcoded string and one unneeded string
(gweedo767)
patchset 5) fix spacing in Manifest
(gweedo767)

Settings: Remove Changelog Summary
Remove the redundant summary to the Changelog in About Phone.

Change-Id: Ia808792e31018ca91757b1956c14724a0e6f5c53

Ported from cm-10.2

Change-Id: Id39c3d44cf364b98bd8450db378d3dcfe7301fbb
Build V18
Croatian V18 update