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>

diff --cc modules/luci-base/po/ja/base.po
index 5cc697a28612d7c029fcba6f4f19bbdfe17444ec,b43cb7ecae9de0442be1b315d79378c00bc56908..3ce1eaccf608d718727c76af2399868d317b6e84
--- 1/modules/luci-base/po/ja/base.po
--- 2/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@@ -3319,8 -3319,8 +3319,8 @@@ msgstr "å\8f\97ä¿¡ã\83\91ã\82±ã\83\83ã\83\88ã\81®ã\82­ã\83¼ï¼\88ã
  #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js:101
  #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js:98
  #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js:103
 -msgid "Key for outgoing packets (optinal)."
 +msgid "Key for outgoing packets (optional)."
- msgstr ""
+ msgstr "送信パケットのキー（オプション）。"
  
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/processes.js:54
  msgid "Kill"

diff --cc modules/luci-base/po/sv/base.po
Simple merge

diff --cc modules/luci-base/po/zh_Hans/base.po
Simple merge