Fix conflicts for Weblate

[grantfitzsimmons]

From @melton-jason:

There's some conflicts in Weblate with the merge of the consolidated setup PR.

https://specifydev.slack.com/archives/CVBECM265/p1772112762884549

These will have to be manually resolved.

I can do resolve those when I have time, otherwise anyone feel free to take a crack at it.
Weblate has some pretty good instructions on this: https://docs.weblate.org/en/latest/faq.html#merge.

For a reminder, our weblate branch is weblate-localization.