Settings: DA translation

A few other revisions from review. Cid, please play nicely.

Change-Id: I907d816982ab838455d492ba14501be4b92d83f0
Merge "Settings: DA translation" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1