Update nav bar strings

Conflicts:

	res/values/cr_strings.xml

(cherry picked from commit b1f9bae1bd4b5b36c707d29cfbf23198d1fe22b4)
Revert "[1/2] Settings AppOps: show/hide app type and allow/deny counters"

This reverts commit 1a057eaabebee78f4821a01a6232aeea73920c03.

Conflicts:

	res/values/cm_strings.xml

(cherry picked from commit 6972f5d3f1385f58e8299c5698b6b406e88bc49f)
Revert "[1/2] Settings AppOps: show/hide app type and allow/deny counters"

This reverts commit 24ba669832ac7eb7a4e1fa4a0fd08185838aac4d.

Conflicts:

	res/values/cm_strings.xml

(cherry picked from commit 1b6e2cb49934bfd2870b5f6802c2618b04b542f5)
[1/2] Settings AppOps: show/hide app type and allow/deny counters

Squash of:

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Thu Oct 3 13:51:31 2013 -0700
AppOps: menu options to show/hide user and system apps
Change-Id: Ia55364c361db949a891e4b53a757ee4dff519eb6

Author: Sam Mortimer <sam@mortimer.me.uk>
Author: Danny Baumann <dannybaumann@web.de>
Date:   Wed Oct 2 22:24:14 2013 -0700
[1/2] AppOps: Show allowed/ignored counts
Change-Id: Ia27737155c33e934df9a2a1fcff88379240fd096

Author: Sam Mortimer <sam@mortimer.me.uk>
Date:   Sun Dec 1 21:39:07 2013 -0800
AppOps: only apply app type filters to summary screen
    *) If buildState() is called for a single package, do
       not apply hide user/system app filters.
    *) Fixes show detail display when called via
       long press in privacyguard and an AppOp hide
       filter is ticked.
Change-Id: If31d094fb989836ab6829daeefe820695032c0ed

Change-Id: I4d6f37b3923eb9bc98d67101d6f0ef481a427682

Conflicts:

	res/values/cm_strings.xml

(cherry picked from commit 8b44a63494434854f4cbb0b8d96f2cb76b61b49f)
Settings: fix appops delete sms string

Change-Id: Ic312212e6bd56ad90b15c56c40d9fdae626d1bd3
(cherry picked from commit 5fe9d5bcb937ddf54b8f339dcc851c89624c6322)