Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-18 04:54:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
arm64v8a
2023-07-19 11:59:57 +09:00
parent 93a7a60116
commit ceae0e3faa
6 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/get_source_env.sh
View File

@@ -1,6 +1,6 @@
if [ ! -z $ENV_NEKORAY ]; then if [ ! -z $ENV_NEKORAY ]; then
export COMMIT_SING_BOX_EXTRA="03df5df5b343c2d6da6bfd27656a12353cc457dd" export COMMIT_SING_BOX_EXTRA="03df5df5b343c2d6da6bfd27656a12353cc457dd"
export COMMIT_MATSURI_XRAY="3c826392b6c830de88aef209b56782dee0b6fbb5" export COMMIT_MATSURI_XRAY="f6843e4e1442341e88ac34c09ca2d243cdcc09f6"
fi fi
if [ ! -z $ENV_SING_BOX_EXTRA ]; then if [ ! -z $ENV_SING_BOX_EXTRA ]; then

6
translations/fa_IR.ts
View File

@@ -926,9 +926,13 @@ This needs to be run NekoBox with administrator privileges.</source>
<translation>پلاگین</translation> <translation>پلاگین</translation>
</message> </message>
<message> <message>
<source>Server support is required</source> <source>Version of UDP over TCP protocol, server support is required.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Off</source>
<translation type="unfinished">خاموش</translation>
</message>
</context> </context>
<context> <context>
<name>EditSocksHttp</name> <name>EditSocksHttp</name>

10
translations/ru_RU.ts
View File

@@ -923,7 +923,15 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun</translation>
</message> </message>
<message> <message>
<source>Server support is required</source> <source>Server support is required</source>
<translation>Необходима поддержка со стороны сервера</translation> <translation type="vanished">Необходима поддержка со стороны сервера</translation>
</message>
<message>
<source>Version of UDP over TCP protocol, server support is required.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Off</source>
<translation type="unfinished">Выкл</translation>
</message> </message>
</context> </context>
<context> <context>

8
translations/zh_CN.ts
View File

@@ -924,8 +924,12 @@ This needs to be run NekoBox with administrator privileges.</source>
<translation>插件</translation> <translation>插件</translation>
</message> </message>
<message> <message>
<source>Server support is required</source> <source>Version of UDP over TCP protocol, server support is required.</source>
<translation>需要服务器支持</translation> <translation>UDP over TCP 协议版本，需要服务器支持。</translation>
</message>
<message>
<source>Off</source>
<translation>关闭</translation>
</message> </message>
</context> </context>
<context> <context>

4
ui/edit/edit_shadowsocks.cpp
View File

@@ -19,7 +19,7 @@ void EditShadowSocks::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
auto bean = this->ent->ShadowSocksBean(); auto bean = this->ent->ShadowSocksBean();
ui->method->setCurrentText(bean->method); ui->method->setCurrentText(bean->method);
ui->uot->setCurrentText(Int2String(bean->uot)); ui->uot->setCurrentIndex(bean->uot);
ui->password->setText(bean->password); ui->password->setText(bean->password);
auto ssPlugin = bean->plugin.split(";"); auto ssPlugin = bean->plugin.split(";");
if (!ssPlugin.empty()) { if (!ssPlugin.empty()) {
@@ -33,7 +33,7 @@ bool EditShadowSocks::onEnd() {
bean->method = ui->method->currentText(); bean->method = ui->method->currentText();
bean->password = ui->password->text(); bean->password = ui->password->text();
bean->uot = ui->uot->currentText().toInt();; bean->uot = ui->uot->currentIndex();
bean->plugin = ui->plugin->currentText(); bean->plugin = ui->plugin->currentText();
if (!bean->plugin.isEmpty()) { if (!bean->plugin.isEmpty()) {
bean->plugin += ";" + ui->plugin_opts->text(); bean->plugin += ";" + ui->plugin_opts->text();

12
ui/edit/edit_shadowsocks.ui
View File

@@ -77,13 +77,13 @@
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="uot_l"> <widget class="QLabel" name="uot_l">
<property name="toolTip"> <property name="toolTip">
<string>Server support is required</string> <string>Version of UDP over TCP protocol, server support is required.</string>
</property> </property>
<property name="locale"> <property name="locale">
<locale language="English" country="UnitedStates"/> <locale language="English" country="UnitedStates"/>
</property> </property>
<property name="text"> <property name="text">
<string>UDP over TCP version</string> <string notr="true">UoT</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -91,17 +91,17 @@
<widget class="QComboBox" name="uot"> <widget class="QComboBox" name="uot">
<item> <item>
<property name="text"> <property name="text">
<string>0</string> <string>Off</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>1</string> <string notr="true">1</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>2</string> <string notr="true">2</string>
</property> </property>
</item> </item>
</widget> </widget>
@@ -123,4 +123,4 @@
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>