Skip to content

Commit b23f49f

Browse files
DHR60DHR60
authored
Remove unnecessary settings (#8107)
1 parent 9a9e28e commit b23f49f

19 files changed

+133
-321
lines changed

‎v2rayN/ServiceLib/Global.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ public class Global
8484

8585
public const string SingboxDirectDNSTag = "direct_dns";
8686
public const string SingboxRemoteDNSTag = "remote_dns";
87-
public const string SingboxOutboundResolverTag = "outbound_resolver";
88-
public const string SingboxFinalResolverTag = "final_resolver";
87+
public const string SingboxLocalDNSTag = "local_local";
8988
public const string SingboxHostsDNSTag = "hosts_dns";
9089
public const string SingboxFakeDNSTag = "fake_dns";
9190

‎v2rayN/ServiceLib/Handler/ConfigHandler.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,8 +2274,6 @@ public static SimpleDNSItem InitBuiltinSimpleDNS()
22742274
BlockBindingQuery = true,
22752275
DirectDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
22762276
RemoteDNS = Global.DomainRemoteDNSAddress.FirstOrDefault(),
2277-
SingboxOutboundsResolveDNS = Global.DomainDirectDNSAddress.FirstOrDefault(),
2278-
SingboxFinalResolveDNS = Global.DomainPureIPDNSAddress.FirstOrDefault()
22792277
};
22802278
}
22812279

‎v2rayN/ServiceLib/Models/ConfigItems.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@ public class SimpleDNSItem
264264
public bool? BlockBindingQuery { get; set; }
265265
public string? DirectDNS { get; set; }
266266
public string? RemoteDNS { get; set; }
267-
public string? SingboxOutboundsResolveDNS { get; set; }
268-
public string? SingboxFinalResolveDNS { get; set; }
269267
public string? RayStrategy4Freedom { get; set; }
270268
public string? SingboxStrategy4Direct { get; set; }
271269
public string? SingboxStrategy4Proxy { get; set; }

‎v2rayN/ServiceLib/Resx/ResUI.Designer.cs‎

Lines changed: 30 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@
675675
<data name="TbSettingsCore" xml:space="preserve">
676676
<value>هسته: تنظیمات اولیه</value>
677677
</data>
678-
<data name="TbSettingsCoreDns" xml:space="preserve">
679-
<value>تنظیمات V2ray DNS</value>
678+
<data name="TbCustomDnsRay" xml:space="preserve">
679+
<value>V2ray Custom DNS</value>
680680
</data>
681681
<data name="TbSettingsCoreKcp" xml:space="preserve">
682682
<value>هسته: تنظیمات KCP</value>
@@ -1011,8 +1011,8 @@
10111011
<data name="menuDNSSetting" xml:space="preserve">
10121012
<value>تنظیمات DNS</value>
10131013
</data>
1014-
<data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
1015-
<value>تنظیمات DNS sing-box</value>
1014+
<data name="TbCustomDnsSingbox" xml:space="preserve">
1015+
<value>sing-box Custom DNS</value>
10161016
</data>
10171017
<data name="TbDnsSingboxObjectDoc" xml:space="preserve">
10181018
<value>لطفا ساختار DNS را پر کنید، برای مشاهده سند کلیک کنید</value>
@@ -1419,19 +1419,10 @@
14191419
<data name="TbDomesticDNS" xml:space="preserve">
14201420
<value>Domestic DNS</value>
14211421
</data>
1422-
<data name="TbSBOutboundsResolverDNS" xml:space="preserve">
1423-
<value>Outbound DNS Resolution (sing-box)</value>
1422+
<data name="TbRemoteDNSTips" xml:space="preserve">
1423+
<value>Via proxy — please ensure remote availability</value>
14241424
</data>
1425-
<data name="TbSBOutboundDomainResolve" xml:space="preserve">
1426-
<value>Resolve Outbound Domains</value>
1427-
</data>
1428-
<data name="TbSBBootstrapDNS" xml:space="preserve">
1429-
<value>Bootstrap DNS (sing-box)</value>
1430-
</data>
1431-
<data name="TbSBFallbackDNSResolve" xml:space="preserve">
1432-
<value>Resolve DNS server domains, requires IP</value>
1433-
</data>
1434-
<data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
1425+
<data name="TbXrayFreedomStrategy" xml:space="preserve">
14351426
<value>xray Freedom Resolution Strategy</value>
14361427
</data>
14371428
<data name="TbSBDirectResolveStrategy" xml:space="preserve">
@@ -1471,7 +1462,7 @@
14711462
<value>Custom DNS Enabled, This Page's Settings Invalid</value>
14721463
</data>
14731464
<data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
1474-
<value>Prevent domain-based routing rules from failing</value>
1465+
<value>Block ECH and HTTP/3 availability checks when enabled</value>
14751466
</data>
14761467
<data name="FillCorrectConfigTemplateText" xml:space="preserve">
14771468
<value>Please fill in the correct config template</value>

‎v2rayN/ServiceLib/Resx/ResUI.hu.resx‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@
675675
<data name="TbSettingsCore" xml:space="preserve">
676676
<value>Core: alapbeállítások</value>
677677
</data>
678-
<data name="TbSettingsCoreDns" xml:space="preserve">
679-
<value>V2ray DNS beállítások</value>
678+
<data name="TbCustomDnsRay" xml:space="preserve">
679+
<value>V2ray Custom DNS</value>
680680
</data>
681681
<data name="TbSettingsCoreKcp" xml:space="preserve">
682682
<value>Core: KCP beállítások</value>
@@ -1011,8 +1011,8 @@
10111011
<data name="menuDNSSetting" xml:space="preserve">
10121012
<value>DNS beállítások</value>
10131013
</data>
1014-
<data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
1015-
<value>sing-box DNS beállítások</value>
1014+
<data name="TbCustomDnsSingbox" xml:space="preserve">
1015+
<value>sing-box Custom DNS</value>
10161016
</data>
10171017
<data name="TbDnsSingboxObjectDoc" xml:space="preserve">
10181018
<value>Kérjük, töltse ki a DNS struktúrát, kattintson a dokumentum megtekintéséhez</value>
@@ -1419,19 +1419,10 @@
14191419
<data name="TbDomesticDNS" xml:space="preserve">
14201420
<value>Domestic DNS</value>
14211421
</data>
1422-
<data name="TbSBOutboundsResolverDNS" xml:space="preserve">
1423-
<value>Outbound DNS Resolution (sing-box)</value>
1422+
<data name="TbRemoteDNSTips" xml:space="preserve">
1423+
<value>Via proxy — please ensure remote availability</value>
14241424
</data>
1425-
<data name="TbSBOutboundDomainResolve" xml:space="preserve">
1426-
<value>Resolve Outbound Domains</value>
1427-
</data>
1428-
<data name="TbSBBootstrapDNS" xml:space="preserve">
1429-
<value>Bootstrap DNS (sing-box)</value>
1430-
</data>
1431-
<data name="TbSBFallbackDNSResolve" xml:space="preserve">
1432-
<value>Resolve DNS server domains, requires IP</value>
1433-
</data>
1434-
<data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
1425+
<data name="TbXrayFreedomStrategy" xml:space="preserve">
14351426
<value>xray Freedom Resolution Strategy</value>
14361427
</data>
14371428
<data name="TbSBDirectResolveStrategy" xml:space="preserve">
@@ -1471,7 +1462,7 @@
14711462
<value>Custom DNS Enabled, This Page's Settings Invalid</value>
14721463
</data>
14731464
<data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
1474-
<value>Prevent domain-based routing rules from failing</value>
1465+
<value>Block ECH and HTTP/3 availability checks when enabled</value>
14751466
</data>
14761467
<data name="FillCorrectConfigTemplateText" xml:space="preserve">
14771468
<value>Please fill in the correct config template</value>

‎v2rayN/ServiceLib/Resx/ResUI.resx‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@
675675
<data name="TbSettingsCore" xml:space="preserve">
676676
<value>Core: basic settings</value>
677677
</data>
678-
<data name="TbSettingsCoreDns" xml:space="preserve">
679-
<value>V2ray DNS settings</value>
678+
<data name="TbCustomDnsRay" xml:space="preserve">
679+
<value>V2ray Custom DNS</value>
680680
</data>
681681
<data name="TbSettingsCoreKcp" xml:space="preserve">
682682
<value>Core: KCP settings</value>
@@ -1011,8 +1011,8 @@
10111011
<data name="menuDNSSetting" xml:space="preserve">
10121012
<value>DNS Settings</value>
10131013
</data>
1014-
<data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
1015-
<value>sing-box DNS settings</value>
1014+
<data name="TbCustomDnsSingbox" xml:space="preserve">
1015+
<value>sing-box Custom DNS</value>
10161016
</data>
10171017
<data name="TbDnsSingboxObjectDoc" xml:space="preserve">
10181018
<value>Please fill in DNS Structure, Click to view the document</value>
@@ -1419,19 +1419,10 @@
14191419
<data name="TbDomesticDNS" xml:space="preserve">
14201420
<value>Domestic DNS</value>
14211421
</data>
1422-
<data name="TbSBOutboundsResolverDNS" xml:space="preserve">
1423-
<value>Outbound DNS Resolution (sing-box)</value>
1422+
<data name="TbRemoteDNSTips" xml:space="preserve">
1423+
<value>Via proxy — please ensure remote availability</value>
14241424
</data>
1425-
<data name="TbSBOutboundDomainResolve" xml:space="preserve">
1426-
<value>Resolve Outbound Domains</value>
1427-
</data>
1428-
<data name="TbSBBootstrapDNS" xml:space="preserve">
1429-
<value>Bootstrap DNS (sing-box)</value>
1430-
</data>
1431-
<data name="TbSBFallbackDNSResolve" xml:space="preserve">
1432-
<value>Resolve DNS server domains, requires IP</value>
1433-
</data>
1434-
<data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
1425+
<data name="TbXrayFreedomStrategy" xml:space="preserve">
14351426
<value>xray Freedom Resolution Strategy</value>
14361427
</data>
14371428
<data name="TbSBDirectResolveStrategy" xml:space="preserve">
@@ -1471,7 +1462,7 @@
14711462
<value>Custom DNS Enabled, This Page's Settings Invalid</value>
14721463
</data>
14731464
<data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
1474-
<value>Prevent domain-based routing rules from failing</value>
1465+
<value>Block ECH and HTTP/3 availability checks when enabled</value>
14751466
</data>
14761467
<data name="FillCorrectConfigTemplateText" xml:space="preserve">
14771468
<value>Please fill in the correct config template</value>

‎v2rayN/ServiceLib/Resx/ResUI.ru.resx‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@
675675
<data name="TbSettingsCore" xml:space="preserve">
676676
<value>Ядро: базовые настройки</value>
677677
</data>
678-
<data name="TbSettingsCoreDns" xml:space="preserve">
679-
<value>Настройки DNS V2ray</value>
678+
<data name="TbCustomDnsRay" xml:space="preserve">
679+
<value>V2ray Custom DNS</value>
680680
</data>
681681
<data name="TbSettingsCoreKcp" xml:space="preserve">
682682
<value>Ядро: настройки KCP</value>
@@ -1011,8 +1011,8 @@
10111011
<data name="menuDNSSetting" xml:space="preserve">
10121012
<value>Настройки DNS</value>
10131013
</data>
1014-
<data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
1015-
<value>Настройки DNS sing-box</value>
1014+
<data name="TbCustomDnsSingbox" xml:space="preserve">
1015+
<value>sing-box Custom DNS</value>
10161016
</data>
10171017
<data name="TbDnsSingboxObjectDoc" xml:space="preserve">
10181018
<value>Заполните структуру DNS, нажмите, чтобы открыть документ</value>
@@ -1419,19 +1419,10 @@
14191419
<data name="TbDomesticDNS" xml:space="preserve">
14201420
<value>Внутренний DNS</value>
14211421
</data>
1422-
<data name="TbSBOutboundsResolverDNS" xml:space="preserve">
1423-
<value>Резолвер DNS для исходящих (sing-box)</value>
1422+
<data name="TbRemoteDNSTips" xml:space="preserve">
1423+
<value>Via proxy — please ensure remote availability</value>
14241424
</data>
1425-
<data name="TbSBOutboundDomainResolve" xml:space="preserve">
1426-
<value>Разрешать домены для исходящих соединений</value>
1427-
</data>
1428-
<data name="TbSBBootstrapDNS" xml:space="preserve">
1429-
<value>Bootstrap DNS (sing-box)</value>
1430-
</data>
1431-
<data name="TbSBFallbackDNSResolve" xml:space="preserve">
1432-
<value>Resolve DNS server domains, requires IP</value>
1433-
</data>
1434-
<data name="TbXrayFreedomResolveStrategy" xml:space="preserve">
1425+
<data name="TbXrayFreedomStrategy" xml:space="preserve">
14351426
<value>Стратегия резолвинга Freedom (Xray)</value>
14361427
</data>
14371428
<data name="TbSBDirectResolveStrategy" xml:space="preserve">
@@ -1471,7 +1462,7 @@
14711462
<value>Включён пользовательский DNS — настройки на этой странице не применяются</value>
14721463
</data>
14731464
<data name="TbBlockSVCBHTTPSQueriesTips" xml:space="preserve">
1474-
<value>Предотвращает сбои доменных правил маршрутизации</value>
1465+
<value>Block ECH and HTTP/3 availability checks when enabled</value>
14751466
</data>
14761467
<data name="FillCorrectConfigTemplateText" xml:space="preserve">
14771468
<value>Пожалуйста, заполните корректный шаблон конфигурации</value>

0 commit comments

Comments
 (0)