From cb5b3ff87e5534b3589b1b05d51b72cae73fb814 Mon Sep 17 00:00:00 2001
From: actions <action@github.com>
Date: Tue, 25 Jun 2024 15:30:06 +0800
Subject: [PATCH] luci-app-passwall: sync upstream

last commit: https://github.com/xiaorouji/openwrt-passwall/commit/44dc39e5275fda2d841e48bf7584340864eeda6f
---
 luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua | 2 +-
 patch-luci-app-passwall.patch                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index 5ca99e2df..788a8fd31 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -395,7 +395,7 @@ local desc = "<ul>"
 		.. "<li>" .. translate("Remote DNS: Can avoid more DNS leaks, but some domestic domain names maybe to proxy!") .. "</li>"
 		.. "<li>" .. translate("Direct DNS: Internet experience may be better, but DNS will be leaked!") .. "</li>"
 o.description = desc
-		.. "<li>" .. translate("Smart: Forward to both direct and remote DNS, if the direct DNS resolution result is a mainland China IP, then use the direct result, otherwise use the remote result.") .. "</li>
+		.. "<li>" .. translate("Smart: Forward to both direct and remote DNS, if the direct DNS resolution result is a mainland China IP, then use the direct result, otherwise use the remote result.") .. "</li>"
 		.. "<li>" .. translate("In smart mode, no-ip reply from Direct DNS:") .. "</li>"
 		.. "<li>" .. translate("Do not accept: Wait and use Remote DNS Reply.") .. "</li>"
 		.. "<li>" .. translate("Accept: Trust the Reply, using this option can improve DNS resolution speeds for some mainland IPv4-only sites.") .. "</li>"
diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch
index 3ea198c52..eb4ca7113 100644
--- a/patch-luci-app-passwall.patch
+++ b/patch-luci-app-passwall.patch
@@ -24,7 +24,7 @@ index 1440118..be9dd12 100644
  	if code ~= 0 then
  		local use_time = luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $2}'")
 diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
-index 521c8ff..5ca99e2 100644
+index 2320472..788a8fd 100644
 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
 +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
 @@ -332,6 +332,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)")