diff --git a/main/NekoGui.cpp b/main/NekoGui.cpp index 55d14f7..33e1f07 100644 --- a/main/NekoGui.cpp +++ b/main/NekoGui.cpp @@ -286,7 +286,6 @@ namespace NekoGui { _add(new configItem("sub_clear", &sub_clear, itemType::boolean)); _add(new configItem("sub_insecure", &sub_insecure, itemType::boolean)); _add(new configItem("sub_auto_update", &sub_auto_update, itemType::integer)); - _add(new configItem("enable_js_hook", &enable_js_hook, itemType::integer)); _add(new configItem("log_ignore", &log_ignore, itemType::stringList)); _add(new configItem("start_minimal", &start_minimal, itemType::boolean)); _add(new configItem("max_log_line", &max_log_line, itemType::integer)); diff --git a/main/NekoGui_DataStore.hpp b/main/NekoGui_DataStore.hpp index dbdee72..b5b7dbe 100644 --- a/main/NekoGui_DataStore.hpp +++ b/main/NekoGui_DataStore.hpp @@ -115,7 +115,6 @@ namespace NekoGui { // Security bool skip_cert = false; - int enable_js_hook = 0; QString utlsFingerprint = ""; // Remember diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index 502bd59..8d0e25b 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -43,10 +43,6 @@ Theme پوسته - - System - سیستم - Subscription اشتراک @@ -145,10 +141,6 @@ Ignore TLS errors when updating subscription هنگام به‌روزرسانی اشتراک، خطاهای TLS را نادیده گرفته شود - - Enable hook.js - فعال سازی hook.js - Advanced system proxy settings. Please select a format. تنظیمات پیشرفته پروکسی سیستم. لطفا یک قالب را انتخاب کنید. @@ -346,10 +338,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Front Proxy پروکسی front - - None - هیچ یک - Skip automatic update لغو آپدیت اتوماتیک @@ -614,14 +602,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Default Outbound - - Domain Strategy - استراتژی دامنه - - - Server Address Strategy - استراتژی آدرس سرور - Sniff result for routing @@ -676,10 +656,6 @@ For more information, see the document "Configuration/DNS". Routing Profile - - proxy - - direct @@ -688,10 +664,6 @@ For more information, see the document "Configuration/DNS". The outbound tag to use when the request is not handled by any rule - - 8.8.8.8 - - Default DNS server @@ -716,6 +688,20 @@ For more information, see the document "Configuration/DNS". Delete + + outbound.domain_strategy +when set, domain destinations are resolved to IP before connect, +also if the connection cannot be established with the current address family (ipv4, ipv6), a fallback connection is created shortly after, with the other address family. + + + + Outbound Domain Strategy + + + + Inbound Domain Strategy + + DialogVPNSettings @@ -1115,14 +1101,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Server سرور - - Ads - تبلیغات - - - Document - اسناد - Update بروزرسانی @@ -1441,10 +1419,6 @@ Split by line. Settings changed تنظیمات تغییر کرد - - Please run NekoBox as admin - لطفا Nekobox را با مجوز ادمین اجرا کنید - Restart Proxy راه اندازی مجدد پروکسی @@ -1493,6 +1467,42 @@ Split by line. Stop Testing + + Tun device misbehaving + + + + If you have trouble starting VPN, you can force reset nekobox_core process here and then try starting the profile again. + + + + Reset + بازنشانی + + + Cancel + لغو کردن + + + Please run Nekoray as admin + + + + Add new Group + + + + Delete selected Group + + + + Edit selected Group + + + + Remove %1? + حذف %1? + ProxyItem @@ -1651,10 +1661,6 @@ Direct: %2 Name - - View JSON - - Rules @@ -1691,5 +1697,9 @@ Direct: %2 Name_Placeholder + + Import JSON + + diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 161074f..fc3d382 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -63,10 +63,6 @@ Theme Тема - - System - Системная - Set custom icon Задать иконку @@ -163,10 +159,6 @@ Skip TLS certificate authentication by default (allowInsecure) Не проверять подлинность TLS сертификатов по умолчанию - - Enable hook.js - Использовать hook.js - Default uTLS Fingerprint uTLS fingerprint по умолчанию @@ -346,10 +338,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Please input URL Пожалуйста, введите URL - - None - Нет - Skip automatic update Пропустить автоматическое обновление @@ -598,10 +586,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Common Общие - - Domain Strategy - Стратегия доменов - Disable Выкл @@ -618,10 +602,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Sniffing Mode Режим подслушивания - - Server Address Strategy - Стратегия выбора адреса сервера - DNS DNS @@ -676,10 +656,6 @@ For more information, see the document "Configuration/DNS". Routing Profile - - proxy - - direct @@ -688,10 +664,6 @@ For more information, see the document "Configuration/DNS". The outbound tag to use when the request is not handled by any rule - - 8.8.8.8 - - Default DNS server @@ -716,6 +688,20 @@ For more information, see the document "Configuration/DNS". Delete Удалить + + outbound.domain_strategy +when set, domain destinations are resolved to IP before connect, +also if the connection cannot be established with the current address family (ipv4, ipv6), a fallback connection is created shortly after, with the other address family. + + + + Outbound Domain Strategy + + + + Inbound Domain Strategy + + DialogVPNSettings @@ -1118,14 +1104,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Server Сервер - - Ads - Реклама - - - Document - Документация - Update Обновление @@ -1363,10 +1341,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Imported %1 profile(s) Импортирован(ы) %1 профиль(ей) - - Please run NekoBox as admin - Пожалуйста, запустите NekoBox с правами администратора - Not Running Не запущен @@ -1497,6 +1471,42 @@ Split by line. Stop Testing + + Tun device misbehaving + + + + If you have trouble starting VPN, you can force reset nekobox_core process here and then try starting the profile again. + + + + Reset + + + + Cancel + Отмена + + + Please run Nekoray as admin + + + + Add new Group + + + + Delete selected Group + + + + Edit selected Group + + + + Remove %1? + Удалить %1? + ProxyItem @@ -1662,10 +1672,6 @@ Release note: Name Имя - - View JSON - - Rules @@ -1702,5 +1708,9 @@ Release note: Name_Placeholder + + Import JSON + + diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 52a3de4..1c308e8 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -43,10 +43,6 @@ Theme 主题 - - System - 系统 - Subscription 订阅 @@ -167,10 +163,6 @@ Ignore TLS errors when updating subscription 更新订阅时忽略 TLS 错误 - - Enable hook.js - 启用 hook.js 功能 - Hide dashboard at startup 启动时不显示仪表盘 @@ -346,10 +338,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Front Proxy 前置代理 - - None - 无 - Skip automatic update 跳过自动更新 @@ -622,14 +610,6 @@ For NekoBox, this rewrites the underlying(localhost) DNS in Tun Mode, normal mod Default Outbound 默认出站 - - Domain Strategy - 域名策略 - - - Server Address Strategy - 服务器地址策略 - Common 通用 @@ -678,10 +658,6 @@ For more information, see the document "Configuration/DNS". Routing Profile - - proxy - 代理 - direct 直连 @@ -690,10 +666,6 @@ For more information, see the document "Configuration/DNS". The outbound tag to use when the request is not handled by any rule 当请求未被任何规则处理时使用的出站标签 - - 8.8.8.8 - - Default DNS server 默认 DNS 服务器 @@ -718,6 +690,20 @@ For more information, see the document "Configuration/DNS". Delete 删除 + + outbound.domain_strategy +when set, domain destinations are resolved to IP before connect, +also if the connection cannot be established with the current address family (ipv4, ipv6), a fallback connection is created shortly after, with the other address family. + + + + Outbound Domain Strategy + + + + Inbound Domain Strategy + + DialogVPNSettings @@ -1120,10 +1106,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Server 服务器 - - Ads - 推广 - Type 类型 @@ -1244,10 +1226,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Update 更新 - - Document - 文档 - Select 选择 @@ -1450,10 +1428,6 @@ Split by line. Restart the program to take effect. 重启程序生效。 - - Please run NekoBox as admin - 请以管理员权限运行 NekoBox - Restart Proxy 重启代理 @@ -1498,6 +1472,42 @@ Split by line. Stop Testing 停止测试 + + Tun device misbehaving + + + + If you have trouble starting VPN, you can force reset nekobox_core process here and then try starting the profile again. + + + + Reset + 重置 + + + Cancel + 取消 + + + Please run Nekoray as admin + + + + Add new Group + + + + Delete selected Group + + + + Edit selected Group + + + + Remove %1? + 删除 %1 ? + ProxyItem @@ -1663,10 +1673,6 @@ Release note: Name 名称 - - View JSON - - Rules 规则 @@ -1703,5 +1709,9 @@ Release note: Name_Placeholder + + Import JSON + + diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp index fbde8b5..44394bb 100644 --- a/ui/dialog_basic_settings.cpp +++ b/ui/dialog_basic_settings.cpp @@ -228,7 +228,6 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent) ui->utlsFingerprint->addItems(Preset::SingBox::UtlsFingerPrint); D_LOAD_BOOL(skip_cert) - ui->enable_js_hook->setCurrentIndex(NekoGui::dataStore->enable_js_hook); ui->utlsFingerprint->setCurrentText(NekoGui::dataStore->utlsFingerprint); } @@ -310,7 +309,6 @@ void DialogBasicSettings::accept() { // Security D_SAVE_BOOL(skip_cert) - NekoGui::dataStore->enable_js_hook = ui->enable_js_hook->currentIndex(); NekoGui::dataStore->utlsFingerprint = ui->utlsFingerprint->currentText(); QStringList str{"UpdateDataStore"}; diff --git a/ui/dialog_basic_settings.ui b/ui/dialog_basic_settings.ui index c9ad244..e8279ff 100644 --- a/ui/dialog_basic_settings.ui +++ b/ui/dialog_basic_settings.ui @@ -23,10 +23,10 @@ - Qt::Horizontal + Qt::Orientation::Horizontal - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok @@ -215,7 +215,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -292,7 +292,7 @@ - System + System @@ -789,7 +789,7 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame true @@ -799,8 +799,8 @@ 0 0 - 680 - 355 + 686 + 377 @@ -848,44 +848,6 @@ - - - - - 0 - 0 - - - - - - - Enable hook.js - - - - - - - - Disable - - - - - Enable - - - - - Enable + load std module - - - - - - - diff --git a/ui/dialog_manage_routes.ui b/ui/dialog_manage_routes.ui index 0174d1a..a9450be 100644 --- a/ui/dialog_manage_routes.ui +++ b/ui/dialog_manage_routes.ui @@ -107,7 +107,7 @@ when used, domain destinations are resolved to IP before routing. - proxy + proxy @@ -170,7 +170,7 @@ For more information, see the document "Configuration/DNS". - 8.8.8.8 + 8.8.8.8 @@ -442,7 +442,7 @@ For more information, see the document "Configuration/DNS". - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok diff --git a/ui/edit/dialog_edit_group.ui b/ui/edit/dialog_edit_group.ui index 7956daa..901e1d2 100644 --- a/ui/edit/dialog_edit_group.ui +++ b/ui/edit/dialog_edit_group.ui @@ -45,7 +45,7 @@ - None + None @@ -105,7 +105,7 @@ - None + None @@ -172,7 +172,7 @@ - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok diff --git a/ui/edit/edit_shadowsocks.ui b/ui/edit/edit_shadowsocks.ui index 2916b6e..0500712 100644 --- a/ui/edit/edit_shadowsocks.ui +++ b/ui/edit/edit_shadowsocks.ui @@ -59,7 +59,7 @@ - +