Merge "Settings: update Japanese translation." into cm-10.1