diff --git a/doc/lucky1.png b/doc/lucky1.png new file mode 100644 index 00000000..a5b41b6e Binary files /dev/null and b/doc/lucky1.png differ diff --git a/doc/lucky2.png b/doc/lucky2.png new file mode 100644 index 00000000..ba4c026f Binary files /dev/null and b/doc/lucky2.png differ diff --git a/doc/lucky3.png b/doc/lucky3.png new file mode 100644 index 00000000..6fa7982f Binary files /dev/null and b/doc/lucky3.png differ diff --git a/doc/taskplan1.png b/doc/taskplan1.png deleted file mode 100644 index 1f8db7be..00000000 Binary files a/doc/taskplan1.png and /dev/null differ diff --git a/doc/taskplan2.png b/doc/taskplan2.png deleted file mode 100644 index edb45d6d..00000000 Binary files a/doc/taskplan2.png and /dev/null differ diff --git a/doc/taskplan3.png b/doc/taskplan3.png deleted file mode 100644 index d4794702..00000000 Binary files a/doc/taskplan3.png and /dev/null differ diff --git a/doc/view.png b/doc/view.png deleted file mode 100644 index 169e112f..00000000 Binary files a/doc/view.png and /dev/null differ diff --git a/doc/view2.png b/doc/view2.png deleted file mode 100644 index 9058c632..00000000 Binary files a/doc/view2.png and /dev/null differ diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua index fc4af355..ba4404ed 100644 --- a/luci-app-passwall/luasrc/controller/passwall.lua +++ b/luci-app-passwall/luasrc/controller/passwall.lua @@ -1169,7 +1169,7 @@ function add_shunt_rule() if add_name then local has = uci:get(appname, uid) if has then - http_write_json_error({ message = "This ID already exists." }) + http_write_json_error({ message = i18n.translate("This ID already exists.") }) return end else diff --git a/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm b/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm index e3c694cc..a0ee9570 100644 --- a/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm +++ b/luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm @@ -245,11 +245,12 @@ table td, .table .td { btn.disabled = false; } if (x && x.status === 200) { - origin_group_shunt_rule_order[group] = get_shunt_rule_order(group); +// origin_group_shunt_rule_order[group] = get_shunt_rule_order(group); alert("<%:Saved current page order successfully.%>"); - if (btn) { - btn.style.display = "none"; - } +// if (btn) { +// btn.style.display = "none"; +// } + window.location.reload(); } else { alert("<%:Save failed!%>"); } diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index 0a5ff91d..f8fe18f3 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -1100,6 +1100,9 @@ msgstr "分流规则组" msgid "Please note attention to the priority, the higher the order, the higher the priority." msgstr "请注意优先级问题,排序越上面优先级越高。" +msgid "This ID already exists." +msgstr "该 ID 已存在。" + msgid "Update..." msgstr "更新中" diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 573ff416..a8e9c90e 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -21,13 +21,13 @@ define Download/geoip HASH:=c67bd077eb102cec74fab759b73d17f99275f56af10a87c14d9fd983508f5ce1 endef -GEOSITE_VER:=20260812053351 +GEOSITE_VER:=20260812055957 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=a2af26fc691bcb49efdc7839c9febe4210dbbcadc40c2a8998bb4ad2aaeb84c1 + HASH:=c2388340f01a772484882e4e2c7a0e05d4cf21a0c22dba5d5b78c3359348630b endef GEOSITE_IRAN_VER:=202608100039