From b6d9cdef61d6dee76b2e27fb8921e6b7decb06e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Nov 2021 20:29:54 +0800 Subject: [PATCH] update-11.11 --- cdnspeedtest/Makefile | 2 +- luci-app-godproxy/root/etc/init.d/koolproxy | 2 +- .../root/usr/share/koolproxy/kpupdate | 23 +- luci-app-godproxy/rulesupdate.log | 108 ++++---- luci-app-nft-qos/po/da/nft-qos.po | 251 ++++++++++++++++++ .../model/cbi/passwall/client/rule_list.lua | 9 +- luci-app-passwall/po/zh-cn/passwall.po | 6 + .../root/usr/share/passwall/iptables.sh | 6 +- 8 files changed, 330 insertions(+), 77 deletions(-) create mode 100644 luci-app-nft-qos/po/da/nft-qos.po diff --git a/cdnspeedtest/Makefile b/cdnspeedtest/Makefile index 5a9561669..87b260ae6 100644 --- a/cdnspeedtest/Makefile +++ b/cdnspeedtest/Makefile @@ -14,7 +14,7 @@ PKG_HASH:=skip PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILE:=LICENSE -PKG_MAINTAINER:=CN_SZTL +PKG_MAINTAINER:=Tianling Shen PKG_CONFIG_DEPENDS:= \ CONFIG_CDNSPEEDTEST_COMPRESS_GOPROXY \ diff --git a/luci-app-godproxy/root/etc/init.d/koolproxy b/luci-app-godproxy/root/etc/init.d/koolproxy index 7da899c9e..755cb97ed 100755 --- a/luci-app-godproxy/root/etc/init.d/koolproxy +++ b/luci-app-godproxy/root/etc/init.d/koolproxy @@ -178,7 +178,7 @@ __load_exrule() { fi if [ ! -f $KP_DIR/data/rules/$file ]; then - wget-ssl --quiet --timeout=5 --no-check-certificate $exrule -O $TMP_DIR/$file + wget $exrule -q -O $TMP_DIR/$file if [ "$?" == "0" ]; then uci set koolproxy.$1.time="`date +%Y-%m-%d" "%H:%M`" uci commit koolproxy diff --git a/luci-app-godproxy/root/usr/share/koolproxy/kpupdate b/luci-app-godproxy/root/usr/share/koolproxy/kpupdate index 33bca0b4d..97ec6937f 100755 --- a/luci-app-godproxy/root/usr/share/koolproxy/kpupdate +++ b/luci-app-godproxy/root/usr/share/koolproxy/kpupdate @@ -44,7 +44,7 @@ __compare_file() { echo $(date "+%F %T"): ------------------- $descript更新 ------------------- >>$LOGFILE local filename=`basename $localPath` local remotePath="$TMP_DIR/$filename" - wget-ssl -qT5 --no-check-certificate "$remoteUrl" -O "$remotePath" + wget "$remoteUrl" -q -O "$remotePath" if [ "$?" == "0" ]; then if [ -f "$localPath" ]; then localMD5=`md5sum "$localPath" | awk '{print $1}'` @@ -111,16 +111,17 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/fanboy.txt' -q -O $KP_DIR/data/rules/fanboy.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/ABP.txt' -q -O $KP_DIR/data/rules/ABP.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/antiad.txt' -q -O $KP_DIR/data/rules/anti-ad.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/rules/mv.txt' -q -O $KP_DIR/data/rules/mv.txt - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/ipsetadblock/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf - wget 'https://raw.githubusercontents.com/project-lede/koolproxy/main/ipsetadblock/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/daily.txt' -q -O $KP_DIR/data/rules/daily.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/koolproxy.txt' -q -O $KP_DIR/data/rules/koolproxy.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/user.txt' -q -O $KP_DIR/data/rules/user.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/fanboy.txt' -q -O $KP_DIR/data/rules/fanboy.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/ABP.txt' -q -O $KP_DIR/data/rules/ABP.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/antiad.txt' -q -O $KP_DIR/data/rules/anti-ad.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/rules/mv.txt' -q -O $KP_DIR/data/rules/mv.txt + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/ipsetadblock/koolproxy_ipset.conf' -q -O $KP_DIR/koolproxy_ipset.conf + wget 'https://cdn.jsdelivr.net/gh/project-lede/koolproxy@master/ipsetadblock/dnsmasq.adblock' -q -O $KP_DIR/dnsmasq.adblock ABP_rules_local=`cat /usr/share/koolproxy/data/rules/easylistchina.txt | sed -n '3p'|awk '{print $3,$4}'` fanboy_rules_local=`cat /usr/share/koolproxy/data/rules/fanboy.txt | sed -n '3p'|awk '{print $3,$4}'` yhosts_rules_local=`cat /usr/share/koolproxy/data/rules/yhosts.txt | sed -n '1p' | cut -d ":" -f2` diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log index 85a76714c..8ca242ca5 100644 --- a/luci-app-godproxy/rulesupdate.log +++ b/luci-app-godproxy/rulesupdate.log @@ -1,55 +1,53 @@ -2021-11-10 04:48:11: ------------------- 规则更新 ----------------------- -2021-11-10 04:48:11: ==================================================== -2021-11-10 04:48:11: 开始更新koolproxy的规则，请等待... -2021-11-10 04:48:11: --------------------------------------------------------------------------------------- -2021-11-10 04:48:13: --------------------------------------------------------------------------------------- -2021-11-10 04:48:14: ABP规则的本地版本号： 202111091602 -2021-11-10 04:48:14: ABP规则的在线版本号： 202111100441 -2021-11-10 04:48:14: 检测到 ABP规则 已更新，现在开始更新... -2021-11-10 04:48:14: 将临时的ABP规则文件移动到指定位置 -2021-11-10 04:48:15: yhosts规则本地版本号： 202111082343 -2021-11-10 04:48:15: yhosts规则在线版本号： 202111082343 -2021-11-10 04:48:15: 检测到yhosts本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-10 04:48:15: 远程视频规则md5： -2021-11-10 04:48:15: 您本地视频规则md5：48cdd7ed1e121aabf00b0884538e1cfe -2021-11-10 04:48:15: 检测到新版视频规则.开始更新.......... -2021-11-10 04:48:15: 您下载的视频规则md5：d41d8cd98f00b204e9800998ecf8427e -2021-11-10 04:48:15: 视频规则md5校验不通过... -2021-11-10 04:48:17: fanboy规则本地版本号： 202111091600 -2021-11-10 04:48:17: fanboy规则在线版本号： 202111100400 -2021-11-10 04:48:17: 检测到新版本 fanboy规则 列表，开始更新... -2021-11-10 04:48:17: 将临时文件覆盖到原始 fanboy规则 文件 -2021-11-10 04:48:17: antiad规则本地版本号： 20211108024012 -2021-11-10 04:48:17: antiad规则在线版本号： 20211108024012 -2021-11-10 04:48:17: 检测到 antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-10 04:48:17: Android规则本地版本号： -2021-11-10 04:48:17: Android规则在线版本号： 20211107000607 -2021-11-10 04:48:17: 检测到新版本 Android规则 列表，开始更新... -2021-11-10 04:48:17: 将临时文件覆盖到原始 Android规则 文件 -2021-11-10 04:48:17: StevenBlack规则本地版本号： 04 November 2021 -2021-11-10 04:48:17: StevenBlack规则在线版本号： 04 November 2021 -2021-11-10 04:48:17: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-10 04:48:17: AdAway规则本地版本号： mobile ad -2021-11-10 04:48:17: AdAway规则在线版本号： -2021-11-10 04:48:17: 检测到新版本 AdAway规则 列表，开始更新... -2021-11-10 04:48:17: 将临时文件覆盖到原始 AdAway规则 文件 -2021-11-10 04:48:17: 正在优化 fanboy规则。。。。。 -2021-11-10 04:48:18: 正在优化 ABP规则。。。。。 -2021-11-10 04:48:22: 跳过优化 补充规则yhosts。。。。。 -2021-11-10 04:48:22: 跳过优化 补充规则antiad。。。。。 -2021-11-10 04:48:22: 正在优化 补充规则Android。。。。。 -2021-11-10 04:48:22: 跳过优化 补充规则StevenBlack。。。。。 -2021-11-10 04:48:22: 正在优化 补充规则AdAway。。。。。 -2021-11-10 04:48:22: 所有规则更新并优化完毕！ -2021-11-10 04:48:22: ==================================================== -2021-11-10 04:48:24: -------------------ABP规则 version 202111100441 -2021-11-10 04:48:24: -------------------Fanboy规则 version 202111100400 -2021-11-10 04:48:24: -------------------Yhosts规则 version 202111082343 -2021-11-10 04:48:24: -------------------Antiad规则 version 20211108024012 -2021-11-10 04:48:24: -------------------AdAway规则 version -2021-11-10 04:48:24: -------------------Android规则 version 20211107000607 -2021-11-10 04:48:24: -------------------StevenBlack规则 version 04 November 2021 -2021-11-10 04:48:24: -------------------静态规则 version 2020-02-27 23:00 -2021-11-10 04:48:24: -------------------乘风视频 version 202111051 -2021-11-10 04:48:24: ------------------- 内置规则更新成功！ ------------------- -2021-11-10 04:48:24: ------------------- 规则更新成功！ ------------------- +2021-11-11 04:35:56: ------------------- 规则更新 ----------------------- +2021-11-11 04:35:56: ==================================================== +2021-11-11 04:35:56: 开始更新koolproxy的规则，请等待... +2021-11-11 04:35:56: --------------------------------------------------------------------------------------- +2021-11-11 04:35:58: --------------------------------------------------------------------------------------- +2021-11-11 04:36:00: ABP规则的本地版本号： 202111100441 +2021-11-11 04:36:00: ABP规则的在线版本号： 202111110431 +2021-11-11 04:36:00: 检测到 ABP规则 已更新，现在开始更新... +2021-11-11 04:36:00: 将临时的ABP规则文件移动到指定位置 +2021-11-11 04:36:01: yhosts规则本地版本号： 202111082343 +2021-11-11 04:36:01: yhosts规则在线版本号： 202111082343 +2021-11-11 04:36:01: 检测到yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 04:36:01: 远程视频规则md5： +2021-11-11 04:36:01: 您本地视频规则md5： +2021-11-11 04:36:01: 检测到 视频规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 04:36:03: fanboy规则本地版本号： 202111100400 +2021-11-11 04:36:03: fanboy规则在线版本号： 202111110400 +2021-11-11 04:36:03: 检测到新版本 fanboy规则 列表，开始更新... +2021-11-11 04:36:03: 将临时文件覆盖到原始 fanboy规则 文件 +2021-11-11 04:36:03: antiad规则本地版本号： 20211108024012 +2021-11-11 04:36:03: antiad规则在线版本号： 20211111023927 +2021-11-11 04:36:03: 检测到新版本 antiad规则 列表，开始更新... +2021-11-11 04:36:03: 将临时文件覆盖到原始 antiad规则 文件 +2021-11-11 04:36:03: Android规则本地版本号： 20211107000607 +2021-11-11 04:36:03: Android规则在线版本号： 20211107000607 +2021-11-11 04:36:03: 检测到 Android规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 04:36:03: StevenBlack规则本地版本号： 04 November 2021 +2021-11-11 04:36:03: StevenBlack规则在线版本号： 04 November 2021 +2021-11-11 04:36:03: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-11 04:36:04: AdAway规则本地版本号： mobile ad +2021-11-11 04:36:04: AdAway规则在线版本号： +2021-11-11 04:36:04: 检测到新版本 AdAway规则 列表，开始更新... +2021-11-11 04:36:04: 将临时文件覆盖到原始 AdAway规则 文件 +2021-11-11 04:36:04: 正在优化 fanboy规则。。。。。 +2021-11-11 04:36:04: 正在优化 ABP规则。。。。。 +2021-11-11 04:36:09: 跳过优化 补充规则yhosts。。。。。 +2021-11-11 04:36:09: 正在优化 补充规则antiad。。。。。 +2021-11-11 04:36:10: 跳过优化 补充规则Android。。。。。 +2021-11-11 04:36:10: 跳过优化 补充规则StevenBlack。。。。。 +2021-11-11 04:36:10: 正在优化 补充规则AdAway。。。。。 +2021-11-11 04:36:10: 所有规则更新并优化完毕！ +2021-11-11 04:36:10: ==================================================== +2021-11-11 04:36:14: -------------------ABP规则 version 202111110431 +2021-11-11 04:36:14: -------------------Fanboy规则 version 202111110400 +2021-11-11 04:36:14: -------------------Yhosts规则 version 202111082343 +2021-11-11 04:36:14: -------------------Antiad规则 version 20211111023927 +2021-11-11 04:36:14: -------------------AdAway规则 version +2021-11-11 04:36:14: -------------------Android规则 version 20211107000607 +2021-11-11 04:36:14: -------------------StevenBlack规则 version 04 November 2021 +2021-11-11 04:36:14: -------------------静态规则 version 2021-04-04 18:30 +2021-11-11 04:36:14: -------------------乘风视频 version 202111051 +2021-11-11 04:36:14: ------------------- 内置规则更新成功！ ------------------- +2021-11-11 04:36:14: ------------------- 规则更新成功！ ------------------- diff --git a/luci-app-nft-qos/po/da/nft-qos.po b/luci-app-nft-qos/po/da/nft-qos.po new file mode 100644 index 000000000..ce311e1e5 --- /dev/null +++ b/luci-app-nft-qos/po/da/nft-qos.po @@ -0,0 +1,251 @@ +msgid "" +msgstr "" +"Language: da\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 +msgid "Bytes Total" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:141 +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:160 +msgid "Collecting data..." +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:222 +msgid "Comment" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:50 +msgid "Default Download Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:55 +msgid "Default Download Unit" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:109 +msgid "Default Network Interface" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:62 +msgid "Default Upload Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:67 +msgid "Default Upload Unit" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:55 +msgid "Default unit for download rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:67 +msgid "Default unit for upload rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:77 +msgid "Default value for download bandwidth" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:50 +msgid "Default value for download rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:82 +msgid "Default value for upload bandwidth" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:62 +msgid "Default value for upload rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:77 +msgid "Download Bandwidth (Mbps)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:252 +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:135 +msgid "Download Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:40 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:230 +msgid "Enable Limit Rate Feature" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:105 +msgid "Enable Traffic Priority" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:105 +msgid "Enable this feature" +msgstr "" + +#: applications/luci-app-nft-qos/root/usr/share/rpcd/acl.d/luci-app-nft-qos.json:3 +msgid "Grant UCI access for luci-app-nft-qos" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:123 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:156 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:244 +msgid "Hostname" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:134 +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:153 +msgid "IP Address" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:161 +msgid "IP Address (v4 / v6)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:130 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163 +msgid "IP Address (v4 Only)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:40 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:230 +msgid "Limit Enable" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239 +msgid "Limit Traffic Rate By Mac Address" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:44 +msgid "Limit Type" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:170 +msgid "MAC (optional)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:248 +msgid "MAC Address" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:48 +msgid "MB" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:29 +msgid "NFT-QoS Settings" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:109 +msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc." +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:87 +msgid "Network to be applied, e.g. 192.168.1.0/24, 10.2.0.0/16, etc." +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:93 +msgid "Network to be applied, e.g. AAAA::BBBB/64, CCCC::1/128, etc." +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65 +msgid "No information available" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:137 +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:156 +msgid "Packets Total" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:205 +msgid "Priority" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:197 +msgid "Protocol" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:21 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:24 +msgid "QoS over Nftables" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:13 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:137 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:174 +msgid "Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:130 +msgid "Realtime Download Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:125 +msgid "Realtime Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:149 +msgid "Realtime Upload Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:219 +msgid "Service" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:118 +msgid "Static QoS-Download Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:151 +msgid "Static QoS-Upload Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:87 +msgid "Target Network (IPv4/MASK)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:93 +msgid "Target Network6 (IPv6/MASK)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:127 +msgid "This page gives an overview over currently download/upload rate." +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:192 +msgid "Traffic Priority Settings" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:44 +msgid "Type of Limit Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:142 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:179 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:257 +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:268 +msgid "Unit" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:82 +msgid "Upload Bandwidth (Mbps)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:263 +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:154 +msgid "Upload Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:98 +msgid "White List for Limit Rate" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:219 +msgid "e.g. https, 23, (separator is comma)" +msgstr "" + +#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:44 +msgid "kB" +msgstr "" diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua index 34681fc2b..f786f149b 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua @@ -143,8 +143,8 @@ o.validate = function(self, value) local ipmasks= {} string.gsub(value, '[^' .. "\r\n" .. ']+', function(w) table.insert(ipmasks, w) end) for index, ipmask in ipairs(ipmasks) do - if not ( datatypes.ipmask4(ipmask) or datatypes.ipmask6(ipmask) ) then - return nil, ipmask .. " " .. translate("Not valid IP format, please re-enter!") + if not datatypes.ipmask4(ipmask) then + return nil, ipmask .. " " .. translate("Not valid IPv4 format, please re-enter!") end end return value @@ -162,8 +162,8 @@ o.validate = function(self, value) local ipmasks= {} string.gsub(value, '[^' .. "\r\n" .. ']+', function(w) table.insert(ipmasks, w) end) for index, ipmask in ipairs(ipmasks) do - if not ( datatypes.ipmask4(ipmask) or datatypes.ipmask6(ipmask) ) then - return nil, ipmask .. " " .. translate("Not valid IP format, please re-enter!") + if not datatypes.ipmask6(ipmask) then + return nil, ipmask .. " " .. translate("Not valid IPv6 format, please re-enter!") end end return value @@ -178,5 +178,4 @@ o.cfgvalue = function(self, section) return fs.readfile(hosts) or "" end o.write = function(self, section, value) fs.writefile(hosts, value:gsub("\r\n", "\n")) end o.remove = function(self, section, value) fs.writefile(hosts, "") end - return m diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index 0e3e29db8..aa216107c 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -961,6 +961,12 @@ msgstr "不是有效域名，请重新输入！" msgid "Not valid IP format, please re-enter!" msgstr "不是有效IP格式，请重新输入！" +msgid "Not valid IPv4 format, please re-enter!" +msgstr "不是有效IPv4格式，请重新输入！" + +msgid "Not valid IPv6 format, please re-enter!" +msgstr "不是有效IPv6格式，请重新输入！" + msgid "Plaintext: If this string matches any part of the targeting domain, this rule takes effet. Example: rule 'sina.com' matches targeting domain 'sina.com', 'sina.com.cn' and 'www.sina.com', but not 'sina.cn'." msgstr "纯字符串: 当此字符串匹配目标域名中任意部分，该规则生效。比如'sina.com'可以匹配'sina.com'、'sina.com.cn'和'www.sina.com'，但不匹配'sina.cn'。" diff --git a/luci-app-passwall/root/usr/share/passwall/iptables.sh b/luci-app-passwall/root/usr/share/passwall/iptables.sh index a2bddf23b..fce28d1d8 100755 --- a/luci-app-passwall/root/usr/share/passwall/iptables.sh +++ b/luci-app-passwall/root/usr/share/passwall/iptables.sh @@ -26,8 +26,6 @@ ip6t_m="ip6tables -t mangle -w" FWI=$(uci -q get firewall.passwall.path 2>/dev/null) FAKE_IP=198.18.0.0/16 -app_name=$(lua -e "local api = require 'luci.model.cbi.passwall.api.api' print(api.appname)") - factor() { if [ -z "$1" ] || [ -z "$2" ]; then echo "" @@ -145,11 +143,11 @@ get_action_chain_name() { gen_laniplist() { - cat /usr/share/${app_name}/rules/lanlist_ipv4 + cat $RULES_PATH/lanlist_ipv4 } gen_laniplist_6() { - cat /usr/share/${app_name}/rules/lanlist_ipv6 + cat $RULES_PATH/lanlist_ipv6 } load_acl() {