treewide: fix weblate conflicts
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 21 Jun 2023 14:44:25 +0000 (17:44 +0300)
committerHannu Nyman <hannu.nyman@iki.fi>
Wed, 21 Jun 2023 14:46:45 +0000 (17:46 +0300)
Merge remote-tracking branch 'weblate/master'

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Trivial merge