Merge "Settings: CS translation" into cm-10.1

Change-Id: I346c79313342572b3f0dc43d0c1155d44b9cfef2