Issue #21480: Fixed translation problems

This also fixes issue #21479.