Settings: merge fix

Change-Id: Ie2ea88c9db0ca4a2850e58aaf0775b50597680d7
Settings: Simplified Chinese Translations

Change-Id: Ia362c91dc677aeed8dd7a4ac4c004dd7ca65d0f3