From: Florian Eckert <fe@dev.tdt.de>
Date: Sat, 21 Sep 2019 18:53:08 +0000 (+0200)
Subject: Merge pull request #3042 from muink/patch-1
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8a2119727bc7cc24c41819b2295e0408feb117df;p=project%2Fluci.git

Merge pull request #3042 from muink/patch-1

luci-base: hosts.js: Update chinese translations
---

8a2119727bc7cc24c41819b2295e0408feb117df
diff --cc modules/luci-base/po/zh-cn/base.po
index 562fd0ad74,bf8b29ef0c..0b186f2bd9
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@@ -2254,9 -2210,9 +2254,9 @@@ msgstr "主机
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:21
  msgid "Host entries"
- msgstr "主机目录"
+ msgstr "主机/域名列表"
  
 -#: protocols/luci-proto-relay/luasrc/model/cbi/admin_network/proto_relay.lua:48
 +#: protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js:171
  msgid "Host expiry timeout"
  msgstr "主机到期超时"
  
@@@ -2282,11 -2238,11 +2282,11 @@@ msgid "Hostname to send when requestin
  msgstr "请求 DHCP 时发送的主机名"
  
  #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/hosts.js:19
 -#: modules/luci-mod-network/luasrc/controller/admin/network.lua:112
 +#: modules/luci-mod-network/luasrc/controller/admin/network.lua:67
  msgid "Hostnames"
- msgstr "主机名"
+ msgstr "主机映射"
  
 -#: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:13
 +#: protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js:24
  msgid "Hybrid"
  msgstr "混合"
  
@@@ -5672,20 -5506,21 +5672,20 @@@ msgstr "使用 <code>/etc/ethers</code
  msgid "Use DHCP gateway"
  msgstr "使用 DHCP 网关"
  
 -#: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:33
 -#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:85
 -#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:34
 -#: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:98
 -#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_l2tp.lua:46
 -#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:59
 -#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua:65
 -#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua:59
 -#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua:38
 -#: protocols/luci-proto-pppossh/luasrc/model/cbi/admin_network/proto_pppossh.lua:58
 +#: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:37
 +#: protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js:124
 +#: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js:39
 +#: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:116
 +#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js:59
 +#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js:103
 +#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js:90
 +#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:64
 +#: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js:77
 +#: protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js:100
  msgid "Use DNS servers advertised by peer"
- msgstr "使用对端通告的 DNS 服务器"
+ msgstr "自动获取 DNS 服务器"
  
 -#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:227
 -#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:233
 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:479
  msgid "Use ISO/IEC 3166 alpha2 country codes."
  msgstr "参考 ISO/IEC 3166 alpha2 国家代码。"