treewide: Fix weblate conflicts
authorHannu Nyman <redacted>
Mon, 21 Apr 2025 19:11:19 +0000 (22:11 +0300)
committerHannu Nyman <redacted>
Mon, 21 Apr 2025 19:11:19 +0000 (22:11 +0300)
Merge remote-tracking branch 'weblate/master' and fix conflicts.

Signed-off-by: Hannu Nyman <redacted>

Trivial merge
git clone https://git.99rst.org/PROJECT