Merge Mainline

package/lean/luci-app-cpufreq/po/zh-cn/cpufreq.po

@@ -23,24 +23,6 @@ msgstr "设置路由器的 CPU 性能模式（高性能/均衡省电）"
 msgid "CPU Scaling Governor"
 msgstr "CPU 工作模式"
 
-msgid "Ondemand Balance Mode"
-msgstr "Ondemand 自动平衡模式"
-
-msgid "Performance Mode"
-msgstr "Performance 高性能模式（降低游戏转发延迟）"
-
-msgid "ondemand"
-msgstr "Ondemand 自动平衡模式"
-
-msgid "performance"
-msgstr "Performance 高性能模式（降低游戏转发延迟）"
-
-msgid "powersave"
-msgstr "Powersave 省电模式"
-
-msgid "schedutil"
-msgstr "Schedutil 自动平衡模式"
-
 msgid "CPU Freq from 48000 to 716000 (Khz)"
 msgstr "CPU 频率范围为 48000 到 716000 (Khz)"
 

package/ntlf9t/luci-app-smartdns/luasrc/controller/smartdns.lua

@@ -68,7 +68,7 @@ function act_status()
 		end
 	elseif e.redirect == 2 then
 		local str;
-		local dnsmasq_server = luci.sys.exec("uci get dhcp.@dnsmasq[0].server")
+		local dnsmasq_server = luci.sys.exec("uci -q get dhcp.@dnsmasq[0].server")
 		if e.local_port ~= nil then
 			str = "127.0.0.1#" .. e.local_port 
 			if  string.sub(dnsmasq_server,1,string.len(str)) == str then