learning and manual po files
Merge remote-tracking branch 'origin/watabe_latest' into dev