diff --git a/README.md b/README.md index 149797d..b5abe7d 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,10 @@ Support Windows / Linux / macOS amd64 out of the box now. 目前支持 Windows / Linux / macOS amd64 开箱即用 +## Readme Translations + +中文 / English (undone) / [fa_IR](README_fa.md) + ## 下载 / Download ### GitHub Releases (Portable ZIP) diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp index 2911023..e08ca8a 100644 --- a/db/ConfigBuilder.cpp +++ b/db/ConfigBuilder.cpp @@ -332,11 +332,11 @@ namespace NekoRay { } // def_outbound - status->routingRules += QJsonObject{ - {"type", "field"}, - {"port", "0-65535"}, - {"outboundTag", dataStore->routing->def_outbound}, - }; + if (!status->forTest) status->routingRules += QJsonObject{ + {"type", "field"}, + {"port", "0-65535"}, + {"outboundTag", dataStore->routing->def_outbound}, + }; // final add routing rule auto routingRules = QString2QJsonObject(dataStore->routing->custom)["rules"].toArray(); @@ -813,10 +813,10 @@ namespace NekoRay { add_rule_route(status->domainListDirect, false, "bypass"); // def_outbound - status->routingRules += QJsonObject{ - {"port_range", ":"}, - {"outbound", dataStore->routing->def_outbound}, - }; + if (!status->forTest) status->routingRules += QJsonObject{ + {"port_range", ":"}, + {"outbound", dataStore->routing->def_outbound}, + }; // geopath auto geoip = FindCoreAsset("geoip.db"); @@ -865,8 +865,8 @@ namespace NekoRay { } QString WriteVPNSingBoxConfig() { - auto match_out = NekoRay::dataStore->vpn_rule_white ? "proxy" : "direct"; - auto no_match_out = NekoRay::dataStore->vpn_rule_white ? "direct" : "proxy"; + auto match_out = NekoRay::dataStore->vpn_rule_white ? "nekoray-socks" : "direct"; + auto no_match_out = NekoRay::dataStore->vpn_rule_white ? "direct" : "nekoray-socks"; // user rule QString process_name_rule = dataStore->vpn_rule_process.trimmed(); if (!process_name_rule.isEmpty()) { diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index 553e781..0fe7623 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -101,7 +101,7 @@ Language - زبان + زبان Security diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index b968e94..ca411c9 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -101,7 +101,7 @@ Language - 语言 + 语言 Security diff --git a/ui/dialog_basic_settings.ui b/ui/dialog_basic_settings.ui index 88bb0ea..c0ff10c 100644 --- a/ui/dialog_basic_settings.ui +++ b/ui/dialog_basic_settings.ui @@ -353,7 +353,7 @@ - Language + Language @@ -361,7 +361,7 @@ - System + System @@ -443,20 +443,37 @@ - - - - - - Max log lines - - - - - - - - + + + + + + + + Max log lines + + + + + + + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + +