[TASK][WIP] Translation
Merge remote-tracking branch 'origin/master'