Settings: Fix build

Erronous string names in the Greek locale (values-el) were causing
build warnings.

Change-Id: Ic49f7d10a33168dd90060a36f5e7cef8d48fa334
Settings: Fix ambiguous expanded desktop options

Currently, one may interpret "With status bar" as both:
1. With the status bar also hidden
2. With the status bar left untouched

And vice versa with "without status bar". This patch aims to make it
more clear-cut.

Patch Set 2: Re-worded as per David van Tonder's suggestions.

Change-Id: Iff032c48de0e0c83ef955032c78187a43901163c
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1-n7