translation
Merge remote-tracking branch 'origin/watabe_translation' into dev