Fix conflicts with Weblate

Merging !245 (merged) caused a conflict with Weblate. I am not sure what happened yet, but I suspect the "Squash commits" Weblate plugin was the cause. The fact that !245 (merged) was merged with a squash commit might have been part of it too; I need to investigate it.

This MR simply brings the pending changes in weblate and fixes the conflicts with main. Once this is merged Weblate should be able to accept translations again (but it might need to be manually unlocked in https://weblate.securityinabox.org/projects/website-infrastructure/#repository)