treewide: Fix conflicts with remote 'weblate/master'
authorHannu Nyman <redacted>
Sat, 28 Feb 2026 17:57:55 +0000 (19:57 +0200)
committerHannu Nyman <redacted>
Sat, 28 Feb 2026 17:57:55 +0000 (19:57 +0200)
commitf7b1b71e6499ab5a0f2152eb7ea9ebb3790159cb
tree1a65a50e2511222407a496e9035d6589334957bb
parent258a301f333407d60764c77df020d90ce2d0d376
parenta14b1869cdc95123c6a0d382d38706b1d10fbf8d
treewide: Fix conflicts with remote 'weblate/master'

Merge a few changes and fix conflicts.
(stupid conflicts with .po metadata: last edit time & editor name)

Signed-off-by: Hannu Nyman <redacted>
git clone https://git.99rst.org/PROJECT