diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua index fa149de89d..924512ebfc 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/api/v2ray.lua @@ -45,7 +45,7 @@ function gen_config(user) } elseif user.protocol == "shadowsocks" then settings = { - method = user.v_ss_encrypt_method, + method = user.method, password = user.password, level = tonumber(user.level) or 1, network = user.ss_network or "TCP,UDP", diff --git a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua index 1b29fc9471..50aa25f275 100644 --- a/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua +++ b/package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua @@ -113,7 +113,7 @@ username = s:option(Value, "username", translate("Username")) username:depends("protocol", "http") username:depends("protocol", "socks") -password = s:option(Value, "password", translate("Password")) +password = s:option(Value, "password", translate("Password"), translate("The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f.")) password.password = true password:depends("type", "SSR") password:depends("type", "Brook") @@ -404,15 +404,14 @@ quic_guise:depends("transport", "quic") fallback = s:option(Flag, "fallback", translate("Fallback")) fallback:depends({ type = "V2ray", protocol = "vless", transport = "tcp", stream_security = "tls" }) -fallback_addr = s:option(Value, "fallback_addr", "Fallback" .. translate("Address (Support Domain Name)")) -fallback_addr:depends("fallback", "1") +fallback_alpn = s:option(Value, "fallback_alpn", "Fallback alpn") +fallback_alpn:depends("fallback", "1") -fallback_port = s:option(Value, "fallback_port", "Fallback" .. translate("Port")) -fallback_port.datatype = "port" -fallback_port:depends("fallback", "1") +fallback_path = s:option(Value, "fallback_path", "Fallback path") +fallback_path:depends("fallback", "1") -fallback_unix = s:option(Value, "fallback_unix", "Fallback UNIX domain socket", translate("UNIX domain socket, absolute path, you can add @ at the beginning to represent abstract, and it is empty by default. If this value is filled in, addr and port will be ignored.")) -fallback_unix:depends("fallback", "1") +fallback_dest = s:option(Value, "fallback_dest", "Fallback dest") +fallback_dest:depends("fallback", "1") fallback_xver = s:option(Value, "fallback_xver", "Fallback xver") fallback_xver.default = 0 diff --git a/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po b/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po index d5d4cf007f..ccccdbb0ef 100644 --- a/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po +++ b/package/lienol/luci-app-passwall/po/zh_Hans/passwall.po @@ -949,9 +949,6 @@ msgstr "
none:默认值,不进行伪装,发送的数据是没有特 msgid "A legal file path. This file must not exist before running V2Ray." msgstr "一个合法的文件路径。在运行 V2Ray 之前,这个文件必须不存在。" -msgid "UNIX domain socket, absolute path, you can add @ at the beginning to represent abstract, and it is empty by default. If this value is filled in, addr and port will be ignored." -msgstr "UNIX domain socket,绝对路径,可在开头加 @ 代表 abstract,默认为空。若填写了该值,addr 和 port 将被忽略。" - msgid "TCP Open Socks" msgstr "开启Socks" @@ -997,6 +994,9 @@ msgstr "隐藏菜单方法,地址栏输入例:" msgid "After the hidden to the display, input example in the address bar:" msgstr "当你隐藏后想再次显示,地址栏输入例:" +msgid "The MTProto protocol must be 32 characters and can only contain characters from 0 to 9 and a to f." +msgstr "MTProto 协议必须为 32 个字符,仅可包含 0 到 9 和 a 到 f 之间的字符。" + msgid "When OTA is enabled, a connection that is not OTA enabled is rejected. This option is invalid when using AEAD encryption." msgstr "开启 OTA 后,将拒绝未启用 OTA 的连接。当使用 AEAD 加密时,该选项无效。"