From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Sun, 22 Nov 2020 15:59:52 +0000 (+0200)
Subject: treewide: fix conflicts with weblate
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=87d64ee27978ad008743e69e2e1c198e89a598ff;p=project%2Fluci.git

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

87d64ee27978ad008743e69e2e1c198e89a598ff
diff --cc modules/luci-base/po/ja/base.po
index 5cc697a286,b43cb7ecae..3ce1eaccf6
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@@ -3319,8 -3319,8 +3319,8 @@@ msgstr "受信パケットのキー（ã
  #: 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"