Settings: HU translation

PS2: Manual rebase

Change-Id: I9cb91215a866b4c3ab6e585b94fb5c099a3db131
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2