sync with upstream source

This commit is contained in:
CN_SZTL 2020-02-18 13:09:58 +08:00
parent 4b3d226812
commit fe6292f7bf
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 6 additions and 1 deletions

View File

@ -652,10 +652,13 @@ msgstr "使用dnscrypt-proxy TCP查询并缓存"
msgid "Use dnsforwarder tcp query and cache"
msgstr "使用dnsforwarder TCP查询并缓存"
msgid "Use Pdnsd udp query and cache"
msgstr "使用Pdnsd UDP查询并缓存"
msgid "Use dnsforwarder udp query and cache"
msgstr "使用dnsforwarder UDP查询并缓存"
msgid "Use chinadns query and cache"
msgstr "使用ChinaDNS查询并缓存"

View File

@ -457,6 +457,8 @@ if arg[1] then
log('发生错误, 正在恢复服务')
end)
log('订阅完毕...')
else
log('未设置或启用订阅, 请检查设置...')
end
elseif arg[1] == "add" then
local f = assert(io.open("/tmp/links.conf",'r'))