Revert "Settings: Fix aapt warnings (translation)"

This reverts commit 9c8a03f2714b09d43ee94c64f08116abf48c102e.
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2