Just A Couple More String Edits

I know I'm being nitpicky...just for consistency's sake.

Patch-set 2: Some layout changes for the Power Menu preferences...thanks Kit for pointing that out
Patch-set 3: Formatting
Patch-set 4 & 5: More formatting and a derp
Patch-set 6: OCD
Patch-set 7: Fix typo
Patch-set 8: moar formatting / fix typos
Patch-set 9: last one I swear

Change-Id: I6df1be4850cda8b52c0ab935365b11478849862d
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1