Updated simplified Chinese translations

Change-Id: Ice0307aa873db47a9eccda85e85cc9a397c9db42
Updated Japanese translations

 Patch-set 2: Rebased
 Patch-set 3: Rebased

Change-Id: I448a88e5294fa4e982a0bb27448ec81819905f56
Signed-off-by: rdgate <rdgate@gmail.com>
Merge "Updated simplified Chinese translations" into jb-mr1
Merge "Updated Japanese translations" into jb-mr1
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1