Revert "Revert "settings: Fix warnings""

This reverts commit 29f58c70388857cad9f928e13881de619c1c7898.

Fixed in 2b5ad1694e849353118386ae96a8b0e5e24ea0c1

Change-Id: I79c3addc7e5c1e83b8df2033f7ee497d9f5ac4eb
Settings: Added a missing FR translation

Google did a bad job.
One french translation about the battery saver is missing into the official Lollipop.

Here's the fix !

Change-Id: Ie26a1993166604414eb4dff55902a80759a3a333
Profiles: update text style to match Settings

-CategoryTitle for headers
-Material.Subhead for titles
-Material.Body1 for summaries
-fix some padding in abstract_trigger_row
-use ic_wifi_signal_4_teal for wifi icons

https://www.dropbox.com/s/mm8aiz44gvpsdlq/Screenshot_2014-12-15-21-54-45.png?dl=0
https://www.dropbox.com/s/z89en7orfup4b55/Screenshot_2014-12-15-21-54-55.png?dl=0

Change-Id: I5e9b77ba056220f0b82a92b2ff46c0f73d0b911b
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0