treewide: Fix weblate conflict and merge 'weblate/master'
authorHannu Nyman <[email protected]>
Mon, 16 Jun 2025 20:50:55 +0000 (23:50 +0300)
committerHannu Nyman <[email protected]>
Mon, 16 Jun 2025 20:50:55 +0000 (23:50 +0300)
commitb44f141e3735a0bcb6356956b4d1e21280537bc9
tree5e1a79f3181e8235baadbe0f07591deaa56bae81
parentfad6b8767c5dd43241b178a7088d088d59a8344b
parent5622bbaaa177b3feb44509dd9999a415a91d5e52
treewide: Fix weblate conflict and merge 'weblate/master'

Fix conflict caused by 93dad92

Signed-off-by: Hannu Nyman <[email protected]>
applications/luci-app-privoxy/po/ru/privoxy.po
applications/luci-app-privoxy/po/vi/privoxy.po