treewide: fix conflicts with weblate
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 22 Nov 2020 15:59:52 +0000 (17:59 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 22 Nov 2020 15:59:52 +0000 (17:59 +0200)
commit87d64ee27978ad008743e69e2e1c198e89a598ff
tree5579fb973a11bc80430f2821928b2178d82a0b04
parent0f3f464adc9e24646638aa5d71edb995a352dec5
parent06dcfeffa03b2cfa5a2b739f603d98b67a5786bd
treewide: fix conflicts with weblate

Merge remote-tracking branch 'weblate/master' after fixing
modules/luci-base/po/ja/base.po

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
modules/luci-base/po/ja/base.po
modules/luci-base/po/sv/base.po
modules/luci-base/po/zh_Hans/base.po