Translation bug fixed
Merge remote-tracking branch 'upstream/pr/43'