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)
commit3b9adf800f6d93ec639577fc1f93ad841f841f1f
tree06b767a5e45e29b80f63f82f789c7d087d8fe5a5
parentad80b8bed22878137b0e6c8236799b78f5539191
parent6586e33fb0044df1ef00311791a134699de4061d
treewide: fix weblate conflicts

Merge remote-tracking branch 'weblate/master'

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