[3.8] Fix translation issues

- FIx #1440
- FIx #1443