Settings: merge fix

Change-Id: I4f971de2bc0331cf9db6d00b44b933bf2a826462
Settings: Simplified Chinese Translations

Change-Id: I23ecb320de49fab3767dbf82fc6b0290b6f60768