Settings: Modify AOSP JA translation

Change-Id: I0994f6148e99d1b479640ead076fb307f225bd66
Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Merge pull request #2 from CyanogenMod/cm-11.0

Update to upstream