diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
| commit | 87d64ee27978ad008743e69e2e1c198e89a598ff (patch) | |
| tree | 5579fb973a11bc80430f2821928b2178d82a0b04 /modules/luci-base/po/zh_Hans/base.po | |
| parent | 0f3f464adc9e24646638aa5d71edb995a352dec5 (diff) | |
| parent | 06dcfeffa03b2cfa5a2b739f603d98b67a5786bd (diff) | |
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>
Diffstat (limited to 'modules/luci-base/po/zh_Hans/base.po')
| -rw-r--r-- | modules/luci-base/po/zh_Hans/base.po | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/luci-base/po/zh_Hans/base.po b/modules/luci-base/po/zh_Hans/base.po index 07d38f5d4c..c2aa06babb 100644 --- a/modules/luci-base/po/zh_Hans/base.po +++ b/modules/luci-base/po/zh_Hans/base.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"PO-Revision-Date: 2020-11-21 12:21+0000\n" -"Last-Translator: SunSpring <yearnsun@gmail.com>\n" +"PO-Revision-Date: 2020-11-22 15:35+0000\n" +"Last-Translator: Eric <spice2wolf@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "openwrt/luci/zh_Hans/>\n" "Language: zh_Hans\n" @@ -1250,7 +1250,7 @@ msgstr "执行命令失败" #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:72 msgid "Comment" -msgstr "备注" +msgstr "注解" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1634 msgid "" @@ -3272,7 +3272,7 @@ msgstr "内核版本" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1369 msgid "Key" -msgstr "密码" +msgstr "密钥" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1397 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1398 @@ -4761,7 +4761,7 @@ msgstr "Peer 地址缺失" #: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:115 msgid "Peers" -msgstr "Peers" +msgstr "对等节点" #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:80 msgid "Perfect Forward Secrecy" |