diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index 6bb6a46..f218255 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,6 +1,6 @@ if [ ! -z $ENV_NEKORAY ]; then export COMMIT_SING_BOX_EXTRA="03df5df5b343c2d6da6bfd27656a12353cc457dd" - export COMMIT_MATSURI_XRAY="3c826392b6c830de88aef209b56782dee0b6fbb5" + export COMMIT_MATSURI_XRAY="f6843e4e1442341e88ac34c09ca2d243cdcc09f6" fi if [ ! -z $ENV_SING_BOX_EXTRA ]; then diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index 05e3217..abd8afa 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -926,9 +926,13 @@ This needs to be run NekoBox with administrator privileges. پلاگین - Server support is required + Version of UDP over TCP protocol, server support is required. + + Off + خاموش + EditSocksHttp diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 67b68ff..7a96af6 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -923,7 +923,15 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Server support is required - Необходима поддержка со стороны сервера + Необходима поддержка со стороны сервера + + + Version of UDP over TCP protocol, server support is required. + + + + Off + Выкл diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index b118a2c..604e69e 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -924,8 +924,12 @@ This needs to be run NekoBox with administrator privileges. 插件 - Server support is required - 需要服务器支持 + Version of UDP over TCP protocol, server support is required. + UDP over TCP 协议版本,需要服务器支持。 + + + Off + 关闭 diff --git a/ui/edit/edit_shadowsocks.cpp b/ui/edit/edit_shadowsocks.cpp index eb8c34f..5c58846 100644 --- a/ui/edit/edit_shadowsocks.cpp +++ b/ui/edit/edit_shadowsocks.cpp @@ -19,7 +19,7 @@ void EditShadowSocks::onStart(std::shared_ptr _ent) { auto bean = this->ent->ShadowSocksBean(); ui->method->setCurrentText(bean->method); - ui->uot->setCurrentText(Int2String(bean->uot)); + ui->uot->setCurrentIndex(bean->uot); ui->password->setText(bean->password); auto ssPlugin = bean->plugin.split(";"); if (!ssPlugin.empty()) { @@ -33,7 +33,7 @@ bool EditShadowSocks::onEnd() { bean->method = ui->method->currentText(); bean->password = ui->password->text(); - bean->uot = ui->uot->currentText().toInt();; + bean->uot = ui->uot->currentIndex(); bean->plugin = ui->plugin->currentText(); if (!bean->plugin.isEmpty()) { bean->plugin += ";" + ui->plugin_opts->text(); diff --git a/ui/edit/edit_shadowsocks.ui b/ui/edit/edit_shadowsocks.ui index bd1fbb7..2916b6e 100644 --- a/ui/edit/edit_shadowsocks.ui +++ b/ui/edit/edit_shadowsocks.ui @@ -77,13 +77,13 @@ - Server support is required + Version of UDP over TCP protocol, server support is required. - UDP over TCP version + UoT @@ -91,17 +91,17 @@ - 0 + Off - 1 + 1 - 2 + 2 @@ -123,4 +123,4 @@ - \ No newline at end of file +