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-cpu-status/po/pl/cpu-status.po b/luci-app-cpu-status/po/pl/cpu-status.po new file mode 100644 index 00000000..9229f35d --- /dev/null +++ b/luci-app-cpu-status/po/pl/cpu-status.po @@ -0,0 +1,58 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"Language: pl\n" + +msgid "(%d minute window, %d second interval)" +msgstr "(%d minutowe okno, %d sekundowy interwał)" + +msgid "All CPUs" +msgstr "Wszystkie procesory" + +msgid "Average:" +msgstr "Średnia:" + +msgid "Calculating" +msgstr "Obliczanie" + +msgid "CPU" +msgstr "Procesor" + +msgid "CPU Load" +msgstr "Obciążenie procesora" + +msgid "CPU load" +msgstr "Obciążenie procesora" + +msgid "Detailed load" +msgstr "Szczegółowe obciążenie" + +msgid "Detailed load of each CPU" +msgstr "Szczegółowe obciążenie każdego procesora" + +msgid "Load" +msgstr "Obciążenie" + +msgid "Load of each CPU" +msgstr "Obciążenie każdego procesora" + +msgid "Peak:" +msgstr "Szczytowe:" + +msgid "This page displays the average CPU load at %d second interval." +msgstr "Ta strona wyświetla średnie obciążenie procesora w %d sekundowych odstępach." + +msgid "Total" +msgstr "Łącznie" + +msgid "Total load" +msgstr "Łączne obciążenie" diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua index c0f20f84..8ded862f 100644 --- a/luci-app-passwall/luasrc/passwall/util_xray.lua +++ b/luci-app-passwall/luasrc/passwall/util_xray.lua @@ -1049,7 +1049,7 @@ function gen_config(var) api.log(" - 加载 Xray 负载均衡 节点【" .. (_node.remarks or "") .. "】，子节点数量：" .. #(blc_nodes or {})) - local valid_nodes, valid_fallback = {}, true + local valid_nodes = {} for i = 1, #(blc_nodes or {}) do local blc_node_id = blc_nodes[i] local blc_node_tag = "blc-" .. blc_node_id @@ -1069,14 +1069,14 @@ function gen_config(var) end -- Check if balancing node duplicates fallback node if _node.fallback_node == blc_node_id then - valid_fallback = false + _node.fallback_node = nil end end if #valid_nodes == 0 then return nil end -- fallback node local fallback_node_id = _node.fallback_node - fallback_node_id = (valid_fallback and fallback_node_id and fallback_node_id ~= "") and fallback_node_id or nil + fallback_node_id = (fallback_node_id and fallback_node_id ~= "") and fallback_node_id or nil local fallback_node_tag = (fallback_node_id == "_direct") and "direct" or "blackhole" if fallback_node_id and fallback_node_id ~= "_direct" then local is_new_node = true diff --git a/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm b/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm index 0aafedfe..d7c8910c 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_config/link_share_man.htm @@ -1749,7 +1749,7 @@ local current_node = map:get(section) opt.set(dom_prefix + 'tls', true); opt.set(dom_prefix + 'reality', false); opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default'); - opt.set(dom_prefix + 'tls_serverName', queryParam.sni || ''); + opt.set(dom_prefix + 'tls_serverName', queryParam.sni || queryParam.peer || ''); opt.set(dom_prefix + 'tls_allowInsecure', !((queryParam.allowinsecure ?? '0') === '0' && (queryParam.insecure ?? '0') === '0')); if (queryParam.fp && queryParam.fp.trim() != "") { opt.set(dom_prefix + 'utls', true); @@ -1760,7 +1760,7 @@ local current_node = map:get(section) opt.set(dom_prefix + 'tls', true); opt.set(dom_prefix + 'reality', true); opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default'); - opt.set(dom_prefix + 'tls_serverName', queryParam.sni || ''); + opt.set(dom_prefix + 'tls_serverName', queryParam.sni || queryParam.peer || ''); if (queryParam.fp && queryParam.fp.trim() != "") { opt.set(dom_prefix + 'utls', true); opt.set(dom_prefix + 'fingerprint', queryParam.fp); diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 57a1bf60..b0d11daf 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1562,7 +1562,7 @@ local function processData(szType, content, add_mode, group, sub_cfg) end if params.security == "tls" or params.security == "reality" then result.tls = "1" - result.tls_serverName = params.sni + result.tls_serverName = params.sni or params.peer result.alpn = params.alpn if params.fp and params.fp ~= "" then result.utls = "1"