Updated Japanese translation
Merge remote-tracking branch 'upstream/master' into japanese-translation
Updated Japanese translation
Merge pull request #1854 from t61p/japanese-translation

Updated Japanese translation