OSDN Git Service

Merge Official Source
authorTianling Shen <cnsztl@immortalwrt.org>
Sun, 4 Jul 2021 08:19:11 +0000 (16:19 +0800)
committerTianling Shen <cnsztl@immortalwrt.org>
Sun, 4 Jul 2021 08:19:11 +0000 (16:19 +0800)
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
1  2 
modules/luci-base/po/en/base.po
modules/luci-base/po/zh_Hans/base.po
modules/luci-base/po/zh_Hant/base.po
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js

@@@ -1999,13 -2004,7 +2004,13 @@@ msgstr "
  msgid "Do you really want to recursively delete the directory \"%s\" ?"
  msgstr ""
  
- #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:168
 +msgid "DNS Redirect"
 +msgstr ""
 +
 +msgid "Redirect client DNS to dnsmasq"
 +msgstr ""
 +
+ #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
  msgid "Domain required"
  msgstr "Domain required"
  
@@@ -428,10 -428,7 +428,10 @@@ msgstr "æ´»å\8a¨ç\9a\84 <abbr title=\"äº\92è\81\94ç
  msgid "Active Connections"
  msgstr "活动连接"
  
- #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:33
 +msgid "Online Users"
 +msgstr "在线用户数"
 +
+ #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:34
  #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:173
  msgid "Active DHCP Leases"
  msgstr "已分配的 DHCP 租约"
@@@ -2018,13 -2016,7 +2031,13 @@@ msgstr "æ\82¨ç\9c\9fç\9a\84è¦\81æ¸\85é\99¤æ\89\80æ\9c\89设置å
  msgid "Do you really want to recursively delete the directory \"%s\" ?"
  msgstr "您真的要删除目录“%s”吗?"
  
- #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:168
 +msgid "DNS Redirect"
 +msgstr "DNS 重定向"
 +
 +msgid "Redirect client DNS to dnsmasq"
 +msgstr "重定向客户端DNS到dnsmasq"
 +
+ #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:259
  msgid "Domain required"
  msgstr "忽略空域名解析"
  
Simple merge