From: Hannu Nyman <redacted>
Date: Sat, 28 Feb 2026 17:57:55 +0000 (+0200)
Subject: treewide: Fix conflicts with remote 'weblate/master'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f7b1b71e6499ab5a0f2152eb7ea9ebb3790159cb;p=openwrt-luci.git

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>
---

f7b1b71e6499ab5a0f2152eb7ea9ebb3790159cb