up 7.12.7

https://github.com/2dust/v2rayN/issues/7387

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2019-Present  2dust
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    v2rayN  Copyright (C) 2019-Present  2dust
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -1,16 +1,18 @@
 # v2rayN
-A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core) and [sing-box](https://github.com/SagerNet/sing-box/releases) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
+A GUI client for Windows, Linux and macOS, support [Xray](https://github.com/XTLS/Xray-core)
+and [sing-box](https://github.com/SagerNet/sing-box)
+and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)
 [![CodeFactor](https://www.codefactor.io/repository/github/2dust/v2rayn/badge)](https://www.codefactor.io/repository/github/2dust/v2rayn)
 [![GitHub Releases](https://img.shields.io/github/downloads/2dust/v2rayN/latest/total?logo=github)](https://github.com/2dust/v2rayN/releases)
 [![Chat on Telegram](https://img.shields.io/badge/Chat%20on-Telegram-brightgreen.svg)](https://t.me/v2rayn)
 
-
 ## How to use
 
 Read the [Wiki](https://github.com/2dust/v2rayN/wiki) for details.
 
 ## Telegram Channel
+
 [github_2dust](https://t.me/github_2dust)

v2rayN/AmazTool/Program.cs

@@ -5,21 +5,83 @@ internal static class Program
     [STAThread]
     private static void Main(string[] args)
     {
-        if (args.Length == 0)
+        try
         {
-            Console.WriteLine(Resx.Resource.Guidelines);
-            Thread.Sleep(5000);
-            return;
-        }
+            // If no arguments are provided, display usage guidelines and exit
+            if (args.Length == 0)
+            {
+                ShowHelp();
+                return;
+            }
 
-        var argData = Uri.UnescapeDataString(string.Join(" ", args));
-        if (argData.Equals("rebootas"))
+            // Log all arguments for debugging purposes
+            foreach (var arg in args)
+            {
+                Console.WriteLine(arg);
+            }
+
+            // Parse command based on first argument
+            switch (args[0].ToLowerInvariant())
+            {
+                case "rebootas":
+                    // Handle application restart
+                    HandleRebootAsync();
+                    break;
+
+                case "help":
+                case "--help":
+                case "-h":
+                case "/?":
+                    // Display help information
+                    ShowHelp();
+                    break;
+
+                default:
+                    // Default behavior: handle as upgrade data
+                    // Maintain backward compatibility with existing usage pattern
+                    var argData = Uri.UnescapeDataString(string.Join(" ", args));
+                    HandleUpgrade(argData);
+                    break;
+            }
+        }
+        catch (Exception ex)
         {
-            Thread.Sleep(1000);
-            Utils.StartV2RayN();
-            return;
+            // Global exception handling
+            Console.WriteLine($"An error occurred: {ex.Message}");
+            Console.WriteLine("Press any key to exit...");
+            Console.ReadKey();
         }
+    }
 
-        UpgradeApp.Upgrade(argData);
+    /// <summary>
+    /// Display help information and usage guidelines
+    /// </summary>
+    private static void ShowHelp()
+    {
+        Console.WriteLine(Resx.Resource.Guidelines);
+        Console.WriteLine("Available commands:");
+        Console.WriteLine("  rebootas             - Restart the application");
+        Console.WriteLine("  help                 - Display this help information");
+        Thread.Sleep(5000);
+    }
+
+    /// <summary>
+    /// Handle application restart
+    /// </summary>
+    private static void HandleRebootAsync()
+    {
+        Console.WriteLine("Restarting application...");
+        Thread.Sleep(1000);
+        Utils.StartV2RayN();
+    }
+
+    /// <summary>
+    /// Handle application upgrade with the provided data
+    /// </summary>
+    /// <param name="upgradeData">Data for the upgrade process</param>
+    private static void HandleUpgrade(string upgradeData)
+    {
+        Console.WriteLine("Upgrading application...");
+        UpgradeApp.Upgrade(upgradeData);
     }
 }

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.11.0</Version>
+        <Version>7.12.7</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,21 +5,21 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.2.6" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.6" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.6" />
-    <PackageVersion Include="CliWrap" Version="3.8.2" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.1" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.1" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.1" />
+    <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="3.3.4" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageVersion Include="QRCoder" Version="1.6.0" />
-    <PackageVersion Include="ReactiveUI" Version="20.2.45" />
+    <PackageVersion Include="ReactiveUI" Version="20.3.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
-    <PackageVersion Include="ReactiveUI.WPF" Version="20.2.45" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.6" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.6" />
+    <PackageVersion Include="ReactiveUI.WPF" Version="20.3.1" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.2.1.8" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.8" />
     <PackageVersion Include="Splat.NLog" Version="15.3.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.1" />

v2rayN/ServiceLib/Common/AesUtils.cs

@@ -8,7 +8,7 @@ public class AesUtils
     private const int KeySize = 256; // AES-256
     private const int IvSize = 16;   // AES block size
     private const int Iterations = 10000;
-    private static readonly byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); // google浏览器默认盐值
+    private static readonly byte[] Salt = Encoding.ASCII.GetBytes("saltysalt".PadRight(16, ' ')); 
     private static readonly string DefaultPassword = Utils.GetMd5(Utils.GetHomePath() + "AesUtils");
 
     /// <summary>

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -1,3 +1,4 @@
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
@@ -86,7 +87,8 @@ public class JsonUtils
             var options = new JsonSerializerOptions
             {
                 WriteIndented = indented,
-                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull
+                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
+                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
             };
             result = JsonSerializer.Serialize(obj, options);
         }

v2rayN/ServiceLib/Common/Utils.cs

@@ -582,7 +582,7 @@ public class Utils
             var result = await cmd.ExecuteBufferedAsync();
             if (result.IsSuccess)
             {
-                return result.StandardOutput.ToString();
+                return result.StandardOutput ?? "";
             }
 
             Logging.SaveLog(result.ToString() ?? "");
@@ -839,14 +839,46 @@ public class Utils
     public static async Task<string?> SetLinuxChmod(string? fileName)
     {
         if (fileName.IsNullOrEmpty())
+        {
             return null;
+        }
+        if (SetUnixFileMode(fileName))
+        {
+            Logging.SaveLog($"Successfully set the file execution permission, {fileName}");
+            return "";
+        }
+
         if (fileName.Contains(' '))
+        {
             fileName = fileName.AppendQuotes();
-        //File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
+        }
         var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
         return await GetCliWrapOutput(Global.LinuxBash, arg);
     }
 
+    public static bool SetUnixFileMode(string? fileName)
+    {
+        try
+        {
+            if (fileName.IsNullOrEmpty())
+            {
+                return false;
+            }
+
+            if (File.Exists(fileName))
+            {
+                var currentMode = File.GetUnixFileMode(fileName);
+                File.SetUnixFileMode(fileName, currentMode | UnixFileMode.UserExecute | UnixFileMode.GroupExecute | UnixFileMode.OtherExecute);
+                return true;
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("SetUnixFileMode", ex);
+        }
+        return false;
+    }
+
     public static async Task<string?> GetLinuxFontFamily(string lang)
     {
         // var arg = new List<string>() { "-c", $"fc-list :lang={lang} family" };

v2rayN/ServiceLib/Common/YamlUtils.cs

@@ -11,7 +11,7 @@ public class YamlUtils
     #region YAML
 
     /// <summary>
-    /// 反序列化成对象
+    /// Deserialize
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="str"></param>
@@ -34,7 +34,7 @@ public class YamlUtils
     }
 
     /// <summary>
-    /// 序列化
+    /// Serialize
     /// </summary>
     /// <param name="obj"></param>
     /// <returns></returns>

v2rayN/ServiceLib/Enums/EViewAction.cs

@@ -20,6 +20,7 @@ public enum EViewAction
     BrowseServer,
     ImportRulesFromFile,
     InitSettingFont,
+    PasswordInput,
     SubEditWindow,
     RoutingRuleSettingWindow,
     RoutingRuleDetailsWindow,

v2rayN/ServiceLib/Global.cs

@@ -8,9 +8,7 @@ public class Global
     public const string GithubUrl = "https://github.com";
     public const string GithubApiUrl = "https://api.github.com/repos";
     public const string GeoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
-    public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
     public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/2dust/sing-box-rules/rule-set-{0}/{1}.srs";
-    public const string IPAPIUrl = "https://api.ip.sb/geoip";
 
     public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
     public const string ConfigFileName = "guiNConfig.json";
@@ -125,7 +123,7 @@ public class Global
     [
         "",
             @"https://github.com/runetfreedom/russia-v2ray-rules-dat/releases/latest/download/{0}.dat",
-            @"https://cdn.jsdelivr.net/gh/chocolate4u/Iran-v2ray-rules@release/{0}.dat"
+            @"https://github.com/Chocolate4U/Iran-v2ray-rules/releases/latest/download/{0}.dat"
     ];
 
     public static readonly List<string> SingboxRulesetSources =
@@ -519,5 +517,15 @@ public class Global
             @"https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb"
     ];
 
+    public static readonly List<string> IPAPIUrls =
+    [
+        @"https://speed.cloudflare.com/meta",
+        @"https://api.ip.sb/geoip",
+        @"https://api-ipv4.ip.sb/geoip",
+        @"https://api-ipv6.ip.sb/geoip",
+        @"https://api.ipapi.is",
+        @""
+    ];
+
     #endregion const
 }

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -9,7 +9,6 @@ public sealed class AppHandler
     private int? _statePort;
     private int? _statePort2;
     private Job? _processJob;
-    private bool? _isAdministrator;
     public static AppHandler Instance => _instance.Value;
     public Config Config => _config;
 
@@ -31,14 +30,7 @@ public sealed class AppHandler
         }
     }
 
-    public bool IsAdministrator
-    {
-        get
-        {
-            _isAdministrator ??= Utils.IsAdministrator();
-            return _isAdministrator.Value;
-        }
-    }
+    public string LinuxSudoPwd { get; set; }
 
     #endregion Property
 

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -3,9 +3,6 @@ using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler;
 
-/// <summary>
-/// 本软件配置文件处理类
-/// </summary>
 public class ConfigHandler
 {
     private static readonly string _configRes = Global.ConfigFileName;
@@ -14,10 +11,12 @@ public class ConfigHandler
     #region ConfigHandler
 
     /// <summary>
-    /// 载入配置文件
+    /// Load the application configuration file
+    /// If the file exists, deserialize it from JSON
+    /// If not found, create a new Config object with default settings
+    /// Initialize default values for missing configuration sections
     /// </summary>
-    /// <param name="config"></param>
-    /// <returns></returns>
+    /// <returns>Config object containing application settings or null if there's an error</returns>
     public static Config? LoadConfig()
     {
         Config? config = null;
@@ -123,7 +122,7 @@ public class ConfigHandler
         }
         if (config.SpeedTestItem.SpeedPingTestUrl.IsNullOrEmpty())
         {
-            config.SpeedTestItem.SpeedPingTestUrl = Global.SpeedPingTestUrl;
+            config.SpeedTestItem.SpeedPingTestUrl = Global.SpeedPingTestUrls.First();
         }
         if (config.SpeedTestItem.MixedConcurrencyCount < 1)
         {
@@ -169,10 +168,11 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 保参数
+    /// Save the configuration to a file
+    /// First writes to a temporary file, then replaces the original file
     /// </summary>
-    /// <param name="config"></param>
-    /// <returns></returns>
+    /// <param name="config">Configuration object to be saved</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SaveConfig(Config config)
     {
         try
@@ -204,6 +204,13 @@ public class ConfigHandler
 
     #region Server
 
+    /// <summary>
+    /// Add a server profile to the configuration
+    /// Dispatches the request to the appropriate method based on the config type
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Server profile to add</param>
+    /// <returns>Result of the operation (0 if successful, -1 if failed)</returns>
     public static async Task<int> AddServer(Config config, ProfileItem profileItem)
     {
         var item = await AppHandler.Instance.GetProfileItem(profileItem.IndexId);
@@ -258,11 +265,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a VMess server
+    /// Validates and processes VMess-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">VMess profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddVMessServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.VMess;
@@ -291,11 +300,11 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 移除服务器
+    /// Remove multiple servers from the configuration
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="indexes"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="indexes">List of server profiles to remove</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> RemoveServers(Config config, List<ProfileItem> indexes)
     {
         var subid = "TempRemoveSubId";
@@ -311,11 +320,12 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 克隆服务器
+    /// Clone server profiles
+    /// Creates copies of the specified server profiles with "-clone" appended to the remarks
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="index"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="indexes">List of server profiles to clone</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> CopyServer(Config config, List<ProfileItem> indexes)
     {
         foreach (var it in indexes)
@@ -347,11 +357,12 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 设置活动服务器
+    /// Set the default server by its index ID
+    /// Updates the configuration to use the specified server as default
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="item"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="indexId">Index ID of the server to set as default</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SetDefaultServerIndex(Config config, string? indexId)
     {
         if (indexId.IsNullOrEmpty())
@@ -366,6 +377,13 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Set a default server from the provided list of profiles
+    /// Ensures there's always a valid default server selected
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="lstProfile">List of profile models to choose from</param>
+    /// <returns>Result of SetDefaultServerIndex operation</returns>
     public static async Task<int> SetDefaultServer(Config config, List<ProfileItemModel> lstProfile)
     {
         if (lstProfile.Exists(t => t.IndexId == config.IndexId))
@@ -386,6 +404,12 @@ public class ConfigHandler
         return await SetDefaultServerIndex(config, item?.IndexId);
     }
 
+    /// <summary>
+    /// Get the current default server profile
+    /// If the current default is invalid, selects a new default
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <returns>The default profile item or null if none exists</returns>
     public static async Task<ProfileItem?> GetDefaultServer(Config config)
     {
         var item = await AppHandler.Instance.GetProfileItem(config.IndexId);
@@ -400,13 +424,15 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 移动服务器
+    /// Move a server in the list to a different position
+    /// Supports moving to top, up, down, bottom or specific position
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="lstProfile"></param>
-    /// <param name="index"></param>
-    /// <param name="eMove"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="lstProfile">List of server profiles</param>
+    /// <param name="index">Index of the server to move</param>
+    /// <param name="eMove">Direction to move the server</param>
+    /// <param name="pos">Target position when using EMove.Position</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> MoveServer(Config config, List<ProfileItem> lstProfile, int index, EMove eMove, int pos = -1)
     {
         int count = lstProfile.Count;
@@ -474,11 +500,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 添加自定义服务器
+    /// Add a custom server configuration from a file
+    /// Copies the configuration file to the app's config directory
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Profile item with the file path in Address</param>
+    /// <param name="blDelete">Whether to delete the source file after copying</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddCustomServer(Config config, ProfileItem profileItem, bool blDelete)
     {
         var fileName = profileItem.Address;
@@ -517,11 +545,12 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Edit an existing custom server configuration
+    /// Updates the server's properties without changing the file
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Profile item with updated properties</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> EditCustomServer(Config config, ProfileItem profileItem)
     {
         var item = await AppHandler.Instance.GetProfileItem(profileItem.IndexId);
@@ -551,11 +580,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a Shadowsocks server
+    /// Validates and processes Shadowsocks-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Shadowsocks profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddShadowsocksServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.Shadowsocks;
@@ -579,11 +610,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a SOCKS server
+    /// Processes SOCKS-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">SOCKS profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddSocksServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.SOCKS;
@@ -596,11 +629,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit an HTTP server
+    /// Processes HTTP-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">HTTP profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddHttpServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.HTTP;
@@ -613,11 +648,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a Trojan server
+    /// Validates and processes Trojan-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Trojan profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddTrojanServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.Trojan;
@@ -639,11 +676,14 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a Hysteria2 server
+    /// Validates and processes Hysteria2-specific settings
+    /// Sets the core type to sing_box as required by Hysteria2
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Hysteria2 profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddHysteria2Server(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.Hysteria2;
@@ -669,11 +709,14 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a TUIC server
+    /// Validates and processes TUIC-specific settings
+    /// Sets the core type to sing_box as required by TUIC
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">TUIC profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddTuicServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.TUIC;
@@ -708,15 +751,16 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a WireGuard server
+    /// Validates and processes WireGuard-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">WireGuard profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddWireguardServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.WireGuard;
-        profileItem.CoreType = ECoreType.sing_box;
 
         profileItem.Address = profileItem.Address.TrimEx();
         profileItem.Id = profileItem.Id.TrimEx();
@@ -739,6 +783,15 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Sort the server list by the specified column
+    /// Updates the sort order in the profile extension data
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="subId">Subscription ID to filter servers</param>
+    /// <param name="colName">Column name to sort by</param>
+    /// <param name="asc">Sort in ascending order if true, descending if false</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SortServers(Config config, string subId, string colName, bool asc)
     {
         var lstModel = await AppHandler.Instance.ProfileItems(subId, "");
@@ -746,8 +799,11 @@ public class ConfigHandler
         {
             return -1;
         }
+        var lstServerStat = (config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
         var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
         var lstProfile = (from t in lstModel
+                          join t2 in lstServerStat on t.IndexId equals t2.IndexId into t2b
+                          from t22 in t2b.DefaultIfEmpty()
                           join t3 in lstProfileExs on t.IndexId equals t3.IndexId into t3b
                           from t33 in t3b.DefaultIfEmpty()
                           select new ProfileItemModel
@@ -762,7 +818,11 @@ public class ConfigHandler
                               StreamSecurity = t.StreamSecurity,
                               Delay = t33?.Delay ?? 0,
                               Speed = t33?.Speed ?? 0,
-                              Sort = t33?.Sort ?? 0
+                              Sort = t33?.Sort ?? 0,
+                              TodayDown = (t22?.TodayDown ?? 0).ToString("D16"),
+                              TodayUp = (t22?.TodayUp ?? 0).ToString("D16"),
+                              TotalDown = (t22?.TotalDown ?? 0).ToString("D16"),
+                              TotalUp = (t22?.TotalUp ?? 0).ToString("D16"),
                           }).ToList();
 
         Enum.TryParse(colName, true, out EServerColName name);
@@ -780,6 +840,10 @@ public class ConfigHandler
                 EServerColName.DelayVal => lstProfile.OrderBy(t => t.Delay).ToList(),
                 EServerColName.SpeedVal => lstProfile.OrderBy(t => t.Speed).ToList(),
                 EServerColName.SubRemarks => lstProfile.OrderBy(t => t.Subid).ToList(),
+                EServerColName.TodayDown => lstProfile.OrderBy(t => t.TodayDown).ToList(),
+                EServerColName.TodayUp => lstProfile.OrderBy(t => t.TodayUp).ToList(),
+                EServerColName.TotalDown => lstProfile.OrderBy(t => t.TotalDown).ToList(),
+                EServerColName.TotalUp => lstProfile.OrderBy(t => t.TotalUp).ToList(),
                 _ => lstProfile
             };
         }
@@ -796,6 +860,10 @@ public class ConfigHandler
                 EServerColName.DelayVal => lstProfile.OrderByDescending(t => t.Delay).ToList(),
                 EServerColName.SpeedVal => lstProfile.OrderByDescending(t => t.Speed).ToList(),
                 EServerColName.SubRemarks => lstProfile.OrderByDescending(t => t.Subid).ToList(),
+                EServerColName.TodayDown => lstProfile.OrderByDescending(t => t.TodayDown).ToList(),
+                EServerColName.TodayUp => lstProfile.OrderByDescending(t => t.TodayUp).ToList(),
+                EServerColName.TotalDown => lstProfile.OrderByDescending(t => t.TotalDown).ToList(),
+                EServerColName.TotalUp => lstProfile.OrderByDescending(t => t.TotalUp).ToList(),
                 _ => lstProfile
             };
         }
@@ -832,11 +900,13 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// Add or edit server
+    /// Add or edit a VLESS server
+    /// Validates and processes VLESS-specific settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="profileItem"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">VLESS profile to add</param>
+    /// <param name="toFile">Whether to save to file</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddVlessServer(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigType = EConfigType.VLESS;
@@ -868,6 +938,13 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Remove duplicate servers from a subscription
+    /// Compares servers based on their properties rather than just names
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="subId">Subscription ID to deduplicate</param>
+    /// <returns>Tuple with total count and remaining count after deduplication</returns>
     public static async Task<Tuple<int, int>> DedupServerList(Config config, string subId)
     {
         var lstProfile = await AppHandler.Instance.ProfileItems(subId);
@@ -899,6 +976,14 @@ public class ConfigHandler
         return new Tuple<int, int>(lstProfile.Count, lstKeep.Count);
     }
 
+    /// <summary>
+    /// Common server addition logic used by all server types
+    /// Sets common properties and handles sorting and persistence
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="profileItem">Profile item to add</param>
+    /// <param name="toFile">Whether to save to database</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> AddServerCommon(Config config, ProfileItem profileItem, bool toFile = true)
     {
         profileItem.ConfigVersion = 2;
@@ -950,6 +1035,14 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Compare two profile items to determine if they represent the same server
+    /// Used for deduplication and server matching
+    /// </summary>
+    /// <param name="o">First profile item</param>
+    /// <param name="n">Second profile item</param>
+    /// <param name="remarks">Whether to compare remarks</param>
+    /// <returns>True if the profiles match, false otherwise</returns>
     private static bool CompareProfileItem(ProfileItem? o, ProfileItem? n, bool remarks)
     {
         if (o == null || n == null)
@@ -981,6 +1074,13 @@ public class ConfigHandler
         }
     }
 
+    /// <summary>
+    /// Remove a single server profile by its index ID
+    /// Deletes the configuration file if it's a custom config
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="indexId">Index ID of the profile to remove</param>
+    /// <returns>0 if successful</returns>
     private static async Task<int> RemoveProfileItem(Config config, string indexId)
     {
         try
@@ -1005,6 +1105,15 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Create a custom server that combines multiple servers for load balancing
+    /// Generates a configuration file that references multiple servers
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="selecteds">Selected servers to combine</param>
+    /// <param name="coreType">Core type to use (Xray or sing_box)</param>
+    /// <param name="multipleLoad">Load balancing algorithm</param>
+    /// <returns>Result object with success state and data</returns>
     public static async Task<RetResult> AddCustomServer4Multiple(Config config, List<ProfileItem> selecteds, ECoreType coreType, EMultipleLoad multipleLoad)
     {
         var indexId = Utils.GetMd5(Global.CoreMultipleLoadConfigFileName);
@@ -1023,14 +1132,21 @@ public class ConfigHandler
 
         var profileItem = await AppHandler.Instance.GetProfileItem(indexId) ?? new();
         profileItem.IndexId = indexId;
-        profileItem.Remarks = multipleLoad switch
+        if (coreType == ECoreType.Xray)
         {
-            EMultipleLoad.Random => ResUI.menuSetDefaultMultipleServerXrayRandom,
-            EMultipleLoad.RoundRobin => ResUI.menuSetDefaultMultipleServerXrayRoundRobin,
-            EMultipleLoad.LeastPing => ResUI.menuSetDefaultMultipleServerXrayLeastPing,
-            EMultipleLoad.LeastLoad => ResUI.menuSetDefaultMultipleServerXrayLeastLoad,
-            _ => ResUI.menuSetDefaultMultipleServerXrayRoundRobin,
-        };
+            profileItem.Remarks = multipleLoad switch
+            {
+                EMultipleLoad.Random => ResUI.menuSetDefaultMultipleServerXrayRandom,
+                EMultipleLoad.RoundRobin => ResUI.menuSetDefaultMultipleServerXrayRoundRobin,
+                EMultipleLoad.LeastPing => ResUI.menuSetDefaultMultipleServerXrayLeastPing,
+                EMultipleLoad.LeastLoad => ResUI.menuSetDefaultMultipleServerXrayLeastLoad,
+                _ => ResUI.menuSetDefaultMultipleServerXrayRoundRobin,
+            };
+        }
+        else if (coreType == ECoreType.sing_box)
+        {
+            profileItem.Remarks = ResUI.menuSetDefaultMultipleServerSingBoxLeastPing;
+        }
         profileItem.Address = Global.CoreMultipleLoadConfigFileName;
         profileItem.ConfigType = EConfigType.Custom;
         profileItem.CoreType = coreType;
@@ -1041,6 +1157,14 @@ public class ConfigHandler
         return result;
     }
 
+    /// <summary>
+    /// Get a SOCKS server profile for pre-SOCKS functionality
+    /// Used when TUN mode is enabled or when a custom config has a pre-SOCKS port
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="node">Server node that might need pre-SOCKS</param>
+    /// <param name="coreType">Core type being used</param>
+    /// <returns>A SOCKS profile item or null if not needed</returns>
     public static async Task<ProfileItem?> GetPreSocksItem(Config config, ProfileItem node, ECoreType coreType)
     {
         ProfileItem? itemSocks = null;
@@ -1070,6 +1194,13 @@ public class ConfigHandler
         return itemSocks;
     }
 
+    /// <summary>
+    /// Remove servers with invalid test results (timeout)
+    /// Useful for cleaning up subscription lists
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="subid">Subscription ID to filter servers</param>
+    /// <returns>Number of removed servers or -1 if failed</returns>
     public static async Task<int> RemoveInvalidServerResult(Config config, string subid)
     {
         var lstModel = await AppHandler.Instance.ProfileItems(subid, "");
@@ -1093,12 +1224,14 @@ public class ConfigHandler
     #region Batch add servers
 
     /// <summary>
-    /// 批量添加服务器
+    /// Add multiple servers from string data (common protocols)
+    /// Parses the string data into server profiles
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="strData"></param>
-    /// <param name="subid"></param>
-    /// <returns>成功导入的数量</returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="strData">String data containing server information</param>
+    /// <param name="subid">Subscription ID to associate with the servers</param>
+    /// <param name="isSub">Whether this is from a subscription</param>
+    /// <returns>Number of successfully imported servers or -1 if failed</returns>
     private static async Task<int> AddBatchServersCommon(Config config, string strData, string subid, bool isSub)
     {
         if (strData.IsNullOrEmpty())
@@ -1178,6 +1311,15 @@ public class ConfigHandler
         return countServers;
     }
 
+    /// <summary>
+    /// Add servers from custom configuration formats (sing-box, v2ray, etc.)
+    /// Handles various configuration formats and imports them as custom configs
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="strData">String data containing server information</param>
+    /// <param name="subid">Subscription ID to associate with the servers</param>
+    /// <param name="isSub">Whether this is from a subscription</param>
+    /// <returns>Number of successfully imported servers or -1 if failed</returns>
     private static async Task<int> AddBatchServers4Custom(Config config, string strData, string subid, bool isSub)
     {
         if (strData.IsNullOrEmpty())
@@ -1276,6 +1418,15 @@ public class ConfigHandler
         }
     }
 
+    /// <summary>
+    /// Add Shadowsocks servers from SIP008 format
+    /// SIP008 is a JSON-based format for Shadowsocks servers
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="strData">String data in SIP008 format</param>
+    /// <param name="subid">Subscription ID to associate with the servers</param>
+    /// <param name="isSub">Whether this is from a subscription</param>
+    /// <returns>Number of successfully imported servers or -1 if failed</returns>
     private static async Task<int> AddBatchServers4SsSIP008(Config config, string strData, string subid, bool isSub)
     {
         if (strData.IsNullOrEmpty())
@@ -1308,6 +1459,15 @@ public class ConfigHandler
         return -1;
     }
 
+    /// <summary>
+    /// Main entry point for adding batch servers from various formats
+    /// Tries different parsing methods to import as many servers as possible
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="strData">String data containing server information</param>
+    /// <param name="subid">Subscription ID to associate with the servers</param>
+    /// <param name="isSub">Whether this is from a subscription</param>
+    /// <returns>Number of successfully imported servers or -1 if failed</returns>
     public static async Task<int> AddBatchServers(Config config, string strData, string subid, bool isSub)
     {
         if (strData.IsNullOrEmpty())
@@ -1380,11 +1540,12 @@ public class ConfigHandler
     #region Sub & Group
 
     /// <summary>
-    /// add sub
+    /// Add a subscription item from URL
+    /// Creates a new subscription with default settings
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="url"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="url">Subscription URL</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddSubItem(Config config, string url)
     {
         //already exists
@@ -1416,6 +1577,12 @@ public class ConfigHandler
         return await AddSubItem(config, subItem);
     }
 
+    /// <summary>
+    /// Add or update a subscription item
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="subItem">Subscription item to add or update</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddSubItem(Config config, SubItem subItem)
     {
         var item = await AppHandler.Instance.GetSubItem(subItem.Id);
@@ -1467,11 +1634,12 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// 移除服务器
+    /// Remove servers associated with a subscription ID
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="subid"></param>
-    /// <returns></returns>
+    /// <param name="config">Current configuration</param>
+    /// <param name="subid">Subscription ID</param>
+    /// <param name="isSub">Whether to only remove servers marked as subscription items</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> RemoveServersViaSubid(Config config, string subid, bool isSub)
     {
         if (subid.IsNullOrEmpty())
@@ -1495,6 +1663,12 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Delete a subscription item and all its associated servers
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="id">Subscription ID to delete</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> DeleteSubItem(Config config, string id)
     {
         var item = await AppHandler.Instance.GetSubItem(id);
@@ -1508,6 +1682,13 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Move servers to a different group (subscription)
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="lstProfile">List of profiles to move</param>
+    /// <param name="subid">Target subscription ID</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> MoveToGroup(Config config, List<ProfileItem> lstProfile, string subid)
     {
         foreach (var item in lstProfile)
@@ -1523,6 +1704,12 @@ public class ConfigHandler
 
     #region Routing
 
+    /// <summary>
+    /// Save a routing item to the database
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="item">Routing item to save</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SaveRoutingItem(Config config, RoutingItem item)
     {
         if (item.Id.IsNullOrEmpty())
@@ -1541,11 +1728,11 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// AddBatchRoutingRules
+    /// Add multiple routing rules to a routing item
     /// </summary>
-    /// <param name="config"></param>
-    /// <param name="strData"></param>
-    /// <returns></returns>
+    /// <param name="routingItem">Routing item to add rules to</param>
+    /// <param name="strData">JSON string containing rules data</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> AddBatchRoutingRules(RoutingItem routingItem, string strData)
     {
         if (strData.IsNullOrEmpty())
@@ -1582,12 +1769,14 @@ public class ConfigHandler
     }
 
     /// <summary>
-    /// MoveRoutingRule
+    /// Move a routing rule within a rules list
+    /// Supports moving to top, up, down, bottom or specific position
     /// </summary>
-    /// <param name="routingItem"></param>
-    /// <param name="index"></param>
-    /// <param name="eMove"></param>
-    /// <returns></returns>
+    /// <param name="rules">List of routing rules</param>
+    /// <param name="index">Index of the rule to move</param>
+    /// <param name="eMove">Direction to move the rule</param>
+    /// <param name="pos">Target position when using EMove.Position</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> MoveRoutingRule(List<RulesItem> rules, int index, EMove eMove, int pos = -1)
     {
         int count = rules.Count;
@@ -1658,6 +1847,12 @@ public class ConfigHandler
         return await Task.FromResult(0);
     }
 
+    /// <summary>
+    /// Set the default routing configuration
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="routingItem">Routing item to set as default</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> SetDefaultRouting(Config config, RoutingItem routingItem)
     {
         if (await SQLiteHelper.Instance.TableAsync<RoutingItem>().Where(t => t.Id == routingItem.Id).CountAsync() > 0)
@@ -1670,6 +1865,12 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Get the current default routing configuration
+    /// If no default is set, selects the first available routing item
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <returns>The default routing item</returns>
     public static async Task<RoutingItem> GetDefaultRouting(Config config)
     {
         var item = await AppHandler.Instance.GetRoutingItem(config.RoutingBasicItem.RoutingIndexId);
@@ -1683,6 +1884,12 @@ public class ConfigHandler
         return item;
     }
 
+    /// <summary>
+    /// Initialize routing rules from built-in or external templates
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="blImportAdvancedRules">Whether to import advanced rules</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> InitRouting(Config config, bool blImportAdvancedRules = false)
     {
         if (config.ConstItem.RouteRulesTemplateSourceUrl.IsNullOrEmpty())
@@ -1697,6 +1904,13 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Initialize routing rules from external templates
+    /// Downloads and processes routing templates from a URL
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="blImportAdvancedRules">Whether to import advanced rules</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> InitExternalRouting(Config config, bool blImportAdvancedRules = false)
     {
         var downloadHandle = new DownloadService();
@@ -1745,6 +1959,13 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Initialize built-in routing rules
+    /// Creates default routing configurations (whitelist, blacklist, global)
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="blImportAdvancedRules">Whether to import advanced rules</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> InitBuiltinRouting(Config config, bool blImportAdvancedRules = false)
     {
         var ver = "V3-";
@@ -1758,7 +1979,7 @@ public class ConfigHandler
             items = await AppHandler.Instance.RoutingItems();
         }
 
-        if (!blImportAdvancedRules && items.Where(t => t.Remarks.StartsWith(ver)).ToList().Count > 0)
+        if (!blImportAdvancedRules && items.Count > 0)
         {
             return 0;
         }
@@ -1798,6 +2019,10 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Remove a routing item from the database
+    /// </summary>
+    /// <param name="routingItem">Routing item to remove</param>
     public static async Task RemoveRoutingItem(RoutingItem routingItem)
     {
         await SQLiteHelper.Instance.DeleteAsync(routingItem);
@@ -1807,6 +2032,12 @@ public class ConfigHandler
 
     #region DNS
 
+    /// <summary>
+    /// Initialize built-in DNS configurations
+    /// Creates default DNS items for V2Ray and sing-box
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <returns>0 if successful</returns>
     public static async Task<int> InitBuiltinDNS(Config config)
     {
         var items = await AppHandler.Instance.DNSItems();
@@ -1830,6 +2061,12 @@ public class ConfigHandler
         return 0;
     }
 
+    /// <summary>
+    /// Save a DNS item to the database
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="item">DNS item to save</param>
+    /// <returns>0 if successful, -1 if failed</returns>
     public static async Task<int> SaveDNSItems(Config config, DNSItem item)
     {
         if (item == null)
@@ -1852,6 +2089,13 @@ public class ConfigHandler
         }
     }
 
+    /// <summary>
+    /// Get an external DNS configuration from URL
+    /// Downloads and processes DNS templates
+    /// </summary>
+    /// <param name="type">Core type (Xray or sing-box)</param>
+    /// <param name="url">URL of the DNS template</param>
+    /// <returns>DNS item with configuration from the URL</returns>
     public static async Task<DNSItem> GetExternalDNSItem(ECoreType type, string url)
     {
         var currentItem = await AppHandler.Instance.GetDNSItem(type);
@@ -1883,6 +2127,13 @@ public class ConfigHandler
 
     #region Regional Presets
 
+    /// <summary>
+    /// Apply regional presets for geo-specific configurations
+    /// Sets up geo files, routing rules, and DNS for specific regions
+    /// </summary>
+    /// <param name="config">Current configuration</param>
+    /// <param name="type">Type of preset (Default, Russia, Iran)</param>
+    /// <returns>True if successful</returns>
     public static async Task<bool> ApplyRegionalPreset(Config config, EPresetType type)
     {
         switch (type)

v2rayN/ServiceLib/Handler/ConnectionHandler.cs

@@ -0,0 +1,42 @@
+namespace ServiceLib.Handler;
+
+public class ConnectionHandler
+{
+    private static readonly Lazy<ConnectionHandler> _instance = new(() => new());
+    public static ConnectionHandler Instance => _instance.Value;
+
+    public async Task<string> RunAvailabilityCheck()
+    {
+        var downloadHandle = new DownloadService();
+        var time = await downloadHandle.RunAvailabilityCheck(null);
+        var ip = time > 0 ? await GetIPInfo(downloadHandle) ?? Global.None : Global.None;
+
+        return string.Format(ResUI.TestMeOutput, time, ip);
+    }
+
+    private async Task<string?> GetIPInfo(DownloadService downloadHandle)
+    {
+        var url = AppHandler.Instance.Config.SpeedTestItem.IPAPIUrl;
+        if (url.IsNullOrEmpty())
+        {
+            return null;
+        }
+
+        var result = await downloadHandle.TryDownloadString(url, true, "");
+        if (result == null)
+        {
+            return null;
+        }
+
+        var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
+        if (ipInfo == null)
+        {
+            return null;
+        }
+
+        var ip = ipInfo.ip ?? ipInfo.clientIp ?? ipInfo.ip_addr ?? ipInfo.query;
+        var country = ipInfo.country_code ?? ipInfo.country ?? ipInfo.countryCode ?? ipInfo.location?.country_code;
+
+        return $"({country ?? "unknown"}) {ip}";
+    }
+}

v2rayN/ServiceLib/Handler/CoreAdminHandler.cs

@@ -0,0 +1,126 @@
+using System.Diagnostics;
+using System.Text;
+using CliWrap;
+
+namespace ServiceLib.Handler;
+
+public class CoreAdminHandler
+{
+    private static readonly Lazy<CoreAdminHandler> _instance = new(() => new());
+    public static CoreAdminHandler Instance => _instance.Value;
+    private Config _config;
+    private Action<bool, string>? _updateFunc;
+    private int _linuxSudoPid = -1;
+
+    public async Task Init(Config config, Action<bool, string> updateFunc)
+    {
+        if (_config != null)
+        {
+            return;
+        }
+        _config = config;
+        _updateFunc = updateFunc;
+    }
+
+    private void UpdateFunc(bool notify, string msg)
+    {
+        _updateFunc?.Invoke(notify, msg);
+    }
+
+    public async Task<Process?> RunProcessAsLinuxSudo(string fileName, CoreInfo coreInfo, string configPath)
+    {
+        var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
+        var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
+
+        Process proc = new()
+        {
+            StartInfo = new()
+            {
+                FileName = shFilePath,
+                Arguments = "",
+                WorkingDirectory = Utils.GetBinConfigPath(),
+                UseShellExecute = false,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                CreateNoWindow = true,
+                StandardInputEncoding = Encoding.UTF8,
+                StandardOutputEncoding = Encoding.UTF8,
+                StandardErrorEncoding = Encoding.UTF8,
+            }
+        };
+
+        proc.OutputDataReceived += (sender, e) =>
+        {
+            if (e.Data.IsNotEmpty())
+            {
+                UpdateFunc(false, e.Data + Environment.NewLine);
+            }
+        };
+        proc.ErrorDataReceived += (sender, e) =>
+        {
+            if (e.Data.IsNotEmpty())
+            {
+                UpdateFunc(false, e.Data + Environment.NewLine);
+            }
+        };
+
+        proc.Start();
+        proc.BeginOutputReadLine();
+        proc.BeginErrorReadLine();
+
+        await Task.Delay(10);
+        await proc.StandardInput.WriteLineAsync();
+        await Task.Delay(10);
+        await proc.StandardInput.WriteLineAsync(AppHandler.Instance.LinuxSudoPwd);
+
+        await Task.Delay(100);
+        if (proc is null or { HasExited: true })
+        {
+            throw new Exception(ResUI.FailedToRunCore);
+        }
+
+        _linuxSudoPid = proc.Id;
+
+        return proc;
+    }
+
+    public async Task KillProcessAsLinuxSudo()
+    {
+        if (_linuxSudoPid < 0)
+        {
+            return;
+        }
+
+        var cmdLine = $"pkill -P {_linuxSudoPid} ; kill {_linuxSudoPid}";
+        var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
+
+        await Cli.Wrap(shFilePath)
+           .WithStandardInputPipe(PipeSource.FromString(AppHandler.Instance.LinuxSudoPwd))
+           .ExecuteAsync();
+
+        _linuxSudoPid = -1;
+    }
+
+    private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
+    {
+        var shFilePath = Utils.GetBinConfigPath(fileName);
+        File.Delete(shFilePath);
+
+        var sb = new StringBuilder();
+        sb.AppendLine("#!/bin/sh");
+        if (Utils.IsAdministrator())
+        {
+            sb.AppendLine($"{cmdLine}");
+        }
+        else
+        {
+            sb.AppendLine($"sudo -S {cmdLine}");
+        }
+
+        await File.WriteAllTextAsync(shFilePath, sb.ToString());
+        await Utils.SetLinuxChmod(shFilePath);
+
+        return shFilePath;
+    }
+}

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -13,7 +13,7 @@ public class CoreHandler
     private Config _config;
     private Process? _process;
     private Process? _processPre;
-    private int _linuxSudoPid = -1;
+    private bool _linuxSudo = false;
     private Action<bool, string>? _updateFunc;
     private const string _tag = "CoreHandler";
 
@@ -101,7 +101,7 @@ public class CoreHandler
 
     public async Task<int> LoadCoreConfigSpeedtest(List<ServerTestItem> selecteds)
     {
-        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard) ? ECoreType.sing_box : ECoreType.Xray;
+        var coreType = selecteds.Exists(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC) ? ECoreType.sing_box : ECoreType.Xray;
         var fileName = string.Format(Global.CoreSpeedtestConfigFileName, Utils.GetGuid(false));
         var configPath = Utils.GetBinConfigPath(fileName);
         var result = await CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType);
@@ -155,23 +155,23 @@ public class CoreHandler
     {
         try
         {
+            if (_linuxSudo)
+            {
+                await CoreAdminHandler.Instance.KillProcessAsLinuxSudo();
+                _linuxSudo = false;
+            }
+
             if (_process != null)
             {
-                await ProcUtils.ProcessKill(_process, true);
+                await ProcUtils.ProcessKill(_process, Utils.IsWindows());
                 _process = null;
             }
 
             if (_processPre != null)
             {
-                await ProcUtils.ProcessKill(_processPre, true);
+                await ProcUtils.ProcessKill(_processPre, Utils.IsWindows());
                 _processPre = null;
             }
-
-            if (_linuxSudoPid > 0)
-            {
-                await KillProcessAsLinuxSudo();
-            }
-            _linuxSudoPid = -1;
         }
         catch (Exception ex)
         {
@@ -225,15 +225,6 @@ public class CoreHandler
         _updateFunc?.Invoke(notify, msg);
     }
 
-    private bool IsNeedSudo(ECoreType eCoreType)
-    {
-        return _config.TunModeItem.EnableTun
-               && eCoreType == ECoreType.sing_box
-               && (Utils.IsNonWindows())
-            //&& _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
-            ;
-    }
-
     #endregion Private
 
     #region Process
@@ -249,69 +240,17 @@ public class CoreHandler
 
         try
         {
-            Process proc = new()
+            if (mayNeedSudo
+                && _config.TunModeItem.EnableTun
+                && coreInfo.CoreType == ECoreType.sing_box
+                && Utils.IsNonWindows())
             {
-                StartInfo = new()
-                {
-                    FileName = fileName,
-                    Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
-                    WorkingDirectory = Utils.GetBinConfigPath(),
-                    UseShellExecute = false,
-                    RedirectStandardOutput = displayLog,
-                    RedirectStandardError = displayLog,
-                    CreateNoWindow = true,
-                    StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
-                    StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
-                }
-            };
-
-            var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
-            if (isNeedSudo)
-            {
-                await RunProcessAsLinuxSudo(proc, fileName, coreInfo, configPath);
+                _linuxSudo = true;
+                await CoreAdminHandler.Instance.Init(_config, _updateFunc);
+                return await CoreAdminHandler.Instance.RunProcessAsLinuxSudo(fileName, coreInfo, configPath);
             }
 
-            if (displayLog)
-            {
-                proc.OutputDataReceived += (sender, e) =>
-                {
-                    if (e.Data.IsNullOrEmpty())
-                        return;
-                    UpdateFunc(false, e.Data + Environment.NewLine);
-                };
-                proc.ErrorDataReceived += (sender, e) =>
-                {
-                    if (e.Data.IsNullOrEmpty())
-                        return;
-                    UpdateFunc(false, e.Data + Environment.NewLine);
-                };
-            }
-            proc.Start();
-
-            if (isNeedSudo && _config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-            {
-                var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-            }
-            if (isNeedSudo)
-                _linuxSudoPid = proc.Id;
-
-            if (displayLog)
-            {
-                proc.BeginOutputReadLine();
-                proc.BeginErrorReadLine();
-            }
-
-            await Task.Delay(500);
-            AppHandler.Instance.AddProcess(proc.Handle);
-            if (proc is null or { HasExited: true })
-            {
-                throw new Exception(ResUI.FailedToRunCore);
-            }
-            return proc;
+            return await RunProcessNormal(fileName, coreInfo, configPath, displayLog);
         }
         catch (Exception ex)
         {
@@ -321,89 +260,57 @@ public class CoreHandler
         }
     }
 
-    #endregion Process
-
-    #region Linux
-
-    private async Task RunProcessAsLinuxSudo(Process proc, string fileName, CoreInfo coreInfo, string configPath)
+    private async Task<Process?> RunProcessNormal(string fileName, CoreInfo? coreInfo, string configPath, bool displayLog)
     {
-        var cmdLine = $"{fileName.AppendQuotes()} {string.Format(coreInfo.Arguments, Utils.GetBinConfigPath(configPath).AppendQuotes())}";
-
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "run_as_sudo.sh");
-        proc.StartInfo.FileName = shFilePath;
-        proc.StartInfo.Arguments = "";
-        proc.StartInfo.WorkingDirectory = "";
-        if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
-        {
-            proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
-            proc.StartInfo.RedirectStandardInput = true;
-        }
-    }
-
-    private async Task KillProcessAsLinuxSudo()
-    {
-        var cmdLine = $"kill {_linuxSudoPid}";
-        var shFilePath = await CreateLinuxShellFile(cmdLine, "kill_as_sudo.sh");
         Process proc = new()
         {
             StartInfo = new()
             {
-                FileName = shFilePath,
+                FileName = fileName,
+                Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
+                WorkingDirectory = Utils.GetBinConfigPath(),
                 UseShellExecute = false,
+                RedirectStandardOutput = displayLog,
+                RedirectStandardError = displayLog,
                 CreateNoWindow = true,
-                StandardInputEncoding = Encoding.UTF8,
-                RedirectStandardInput = true
+                StandardOutputEncoding = displayLog ? Encoding.UTF8 : null,
+                StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
             }
         };
+
+        if (displayLog)
+        {
+            proc.OutputDataReceived += (sender, e) =>
+            {
+                if (e.Data.IsNotEmpty())
+                {
+                    UpdateFunc(false, e.Data + Environment.NewLine);
+                }
+            };
+            proc.ErrorDataReceived += (sender, e) =>
+            {
+                if (e.Data.IsNotEmpty())
+                {
+                    UpdateFunc(false, e.Data + Environment.NewLine);
+                }
+            };
+        }
         proc.Start();
 
-        if (_config.TunModeItem.LinuxSudoPwd.IsNotEmpty())
+        if (displayLog)
         {
-            try
-            {
-                var pwd = DesUtils.Decrypt(_config.TunModeItem.LinuxSudoPwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-                await Task.Delay(10);
-                await proc.StandardInput.WriteLineAsync(pwd);
-            }
-            catch (Exception)
-            {
-                // ignored
-            }
+            proc.BeginOutputReadLine();
+            proc.BeginErrorReadLine();
         }
 
-        var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-        await proc.WaitForExitAsync(timeout.Token);
-        await Task.Delay(3000);
+        await Task.Delay(100);
+        AppHandler.Instance.AddProcess(proc.Handle);
+        if (proc is null or { HasExited: true })
+        {
+            throw new Exception(ResUI.FailedToRunCore);
+        }
+        return proc;
     }
 
-    private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)
-    {
-        //Shell scripts
-        var shFilePath = Utils.GetBinConfigPath(AppHandler.Instance.IsAdministrator ? "root_" + fileName : fileName);
-        File.Delete(shFilePath);
-        var sb = new StringBuilder();
-        sb.AppendLine("#!/bin/sh");
-        if (AppHandler.Instance.IsAdministrator)
-        {
-            sb.AppendLine($"{cmdLine}");
-        }
-        else if (_config.TunModeItem.LinuxSudoPwd.IsNullOrEmpty())
-        {
-            sb.AppendLine($"pkexec {cmdLine}");
-        }
-        else
-        {
-            sb.AppendLine($"sudo -S {cmdLine}");
-        }
-
-        await File.WriteAllTextAsync(shFilePath, sb.ToString());
-        await Utils.SetLinuxChmod(shFilePath);
-        Logging.SaveLog(shFilePath);
-
-        return shFilePath;
-    }
-
-    #endregion Linux
+    #endregion Process
 }

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -8,10 +8,13 @@ public class BaseFmt
     {
         if (Utils.IsIpv6(address))
         {
-            // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+            // Check if the address is already surrounded by square brackets, if not, add square brackets
             return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
         }
-        return address;  // 如果不是IPv6地址，直接返回原地址
+        else
+        {
+            return address;
+        }
     }
 
     protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)

v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs

@@ -6,9 +6,9 @@ public class VmessFmt : BaseFmt
     {
         msg = ResUI.ConfigurationFormatIncorrect;
         ProfileItem? item;
-        if (str.IndexOf('?') > 0 && str.IndexOf('&') > 0)
+        if (str.IndexOf('@') > 0)
         {
-            item = ResolveStdVmess(str);
+            item = ResolveStdVmess(str) ?? ResolveVmess(str, out msg);
         }
         else
         {

v2rayN/ServiceLib/Models/Config.cs

@@ -1,8 +1,5 @@
 namespace ServiceLib.Models;
 
-/// <summary>
-/// 本软件配置文件实体类
-/// </summary>
 [Serializable]
 public class Config
 {

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -147,7 +147,6 @@ public class TunModeItem
     public int Mtu { get; set; }
     public bool EnableExInbound { get; set; }
     public bool EnableIPv6Address { get; set; }
-    public string? LinuxSudoPwd { get; set; }
 }
 
 [Serializable]
@@ -157,6 +156,7 @@ public class SpeedTestItem
     public string SpeedTestUrl { get; set; }
     public string SpeedPingTestUrl { get; set; }
     public int MixedConcurrencyCount { get; set; }
+    public string IPAPIUrl { get; set; }
 }
 
 [Serializable]

v2rayN/ServiceLib/Models/IPAPIInfo.cs

@@ -3,10 +3,17 @@ namespace ServiceLib.Models;
 internal class IPAPIInfo
 {
     public string? ip { get; set; }
-    public string? city { get; set; }
-    public string? region { get; set; }
-    public string? region_code { get; set; }
+    public string? clientIp { get; set; }
+    public string? ip_addr { get; set; }    
+    public string? query { get; set; }
     public string? country { get; set; }
     public string? country_name { get; set; }
     public string? country_code { get; set; }
+    public string? countryCode { get; set; }
+    public LocationInfo? location { get; set; }
+}
+
+public class LocationInfo
+{
+    public string? country_code { get; set; }
 }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -127,6 +127,26 @@ public class Outboundsettings4Ray
     public int? userLevel { get; set; }
 
     public FragmentItem4Ray? fragment { get; set; }
+
+    public string? secretKey { get; set; }
+
+    public List<string>? address { get; set; }
+
+    public List<WireguardPeer4Ray>? peers { get; set; }
+
+    public bool? noKernelTun { get; set; }
+
+    public int? mtu { get; set; }
+
+    public List<int>? reserved { get; set; }
+
+    public int? workers { get; set; }
+}
+
+public class WireguardPeer4Ray
+{
+    public string endpoint { get; set; }
+    public string publicKey { get; set; }
 }
 
 public class VnextItem4Ray
@@ -190,6 +210,7 @@ public class DnsServer4Ray
 {
     public string? address { get; set; }
     public List<string>? domains { get; set; }
+    public bool? skipFallback { get; set; }
 }
 
 public class Routing4Ray

v2rayN/ServiceLib/Models/V2rayTcpRequest.cs

@@ -1,8 +1,5 @@
 namespace ServiceLib.Models;
 
-/// <summary>
-/// Tcp伪装http的Request，只要Host
-/// </summary>
 public class V2rayTcpRequest
 {
     /// <summary>

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -88,7 +88,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please check the server settings first. 的本地化字符串。
+        ///   查找类似 Please check the Configuration settings first. 的本地化字符串。
         /// </summary>
         public static string CheckServerSettings {
             get {
@@ -178,7 +178,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Failed to import custom configuration server 的本地化字符串。
+        ///   查找类似 Failed to import custom configuration Configuration 的本地化字符串。
         /// </summary>
         public static string FailedImportedCustomServer {
             get {
@@ -214,7 +214,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please enter the correct server port format. 的本地化字符串。
+        ///   查找类似 Please enter the correct port format. 的本地化字符串。
         /// </summary>
         public static string FillCorrectServerPort {
             get {
@@ -241,7 +241,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please enter the server address. 的本地化字符串。
+        ///   查找类似 Please enter the address. 的本地化字符串。
         /// </summary>
         public static string FillServerAddress {
             get {
@@ -250,7 +250,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please browse to import server configuration 的本地化字符串。
+        ///   查找类似 Please browse to import Configuration configuration 的本地化字符串。
         /// </summary>
         public static string FillServerAddressCustom {
             get {
@@ -466,7 +466,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Next proxy remarks 的本地化字符串。
+        ///   查找类似 Next proxy Configuration remarks 的本地化字符串。
         /// </summary>
         public static string LvNextProfile {
             get {
@@ -484,7 +484,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Previous proxy remarks 的本地化字符串。
+        ///   查找类似 Previous proxy Configuration remarks 的本地化字符串。
         /// </summary>
         public static string LvPrevProfile {
             get {
@@ -493,7 +493,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please make sure the remarks exist and are unique 的本地化字符串。
+        ///   查找类似 Please make sure the Configuration remarks exist and are unique 的本地化字符串。
         /// </summary>
         public static string LvPrevProfileTip {
             get {
@@ -673,7 +673,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add a custom configuration server 的本地化字符串。
+        ///   查找类似 Add a custom configuration Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddCustomServer {
             get {
@@ -682,7 +682,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [HTTP] server 的本地化字符串。
+        ///   查找类似 Add [HTTP] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddHttpServer {
             get {
@@ -691,7 +691,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Hysteria2] server 的本地化字符串。
+        ///   查找类似 Add [Hysteria2] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddHysteria2Server {
             get {
@@ -727,7 +727,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Shadowsocks] server 的本地化字符串。
+        ///   查找类似 Add [Shadowsocks] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddShadowsocksServer {
             get {
@@ -736,7 +736,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [SOCKS] server 的本地化字符串。
+        ///   查找类似 Add [SOCKS] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddSocksServer {
             get {
@@ -745,7 +745,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [Trojan] server 的本地化字符串。
+        ///   查找类似 Add [Trojan] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddTrojanServer {
             get {
@@ -754,7 +754,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [TUIC] server 的本地化字符串。
+        ///   查找类似 Add [TUIC] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddTuicServer {
             get {
@@ -763,7 +763,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [VLESS] server 的本地化字符串。
+        ///   查找类似 Add [VLESS] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddVlessServer {
             get {
@@ -772,7 +772,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [VMess] server 的本地化字符串。
+        ///   查找类似 Add [VMess] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddVmessServer {
             get {
@@ -781,7 +781,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Add [WireGuard] server 的本地化字符串。
+        ///   查找类似 Add [WireGuard] Configuration 的本地化字符串。
         /// </summary>
         public static string menuAddWireguardServer {
             get {
@@ -853,7 +853,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Clone selected server 的本地化字符串。
+        ///   查找类似 Clone selected Configuration 的本地化字符串。
         /// </summary>
         public static string menuCopyServer {
             get {
@@ -871,7 +871,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Edit Server (Ctrl+D) 的本地化字符串。
+        ///   查找类似 Edit Configuration (Ctrl+D) 的本地化字符串。
         /// </summary>
         public static string menuEditServer {
             get {
@@ -898,7 +898,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Export selected server for complete configuration 的本地化字符串。
+        ///   查找类似 Export selected Configuration for complete configuration 的本地化字符串。
         /// </summary>
         public static string menuExport2ClientConfig {
             get {
@@ -907,7 +907,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Export selected server for complete configuration to clipboard 的本地化字符串。
+        ///   查找类似 Export selected Configuration for complete configuration to clipboard 的本地化字符串。
         /// </summary>
         public static string menuExport2ClientConfigClipboard {
             get {
@@ -934,7 +934,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Export server 的本地化字符串。
+        ///   查找类似 Export Configuration 的本地化字符串。
         /// </summary>
         public static string menuExportConfig {
             get {
@@ -1222,7 +1222,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test servers real delay (Ctrl+R) 的本地化字符串。
+        ///   查找类似 Test Configurations real delay (Ctrl+R) 的本地化字符串。
         /// </summary>
         public static string menuRealPingServer {
             get {
@@ -1312,7 +1312,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove duplicate servers 的本地化字符串。
+        ///   查找类似 Remove duplicate Configurations 的本地化字符串。
         /// </summary>
         public static string menuRemoveDuplicateServer {
             get {
@@ -1330,7 +1330,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Remove selected servers (Delete) 的本地化字符串。
+        ///   查找类似 Remove selected Configurations (Delete) 的本地化字符串。
         /// </summary>
         public static string menuRemoveServer {
             get {
@@ -1474,7 +1474,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Servers 的本地化字符串。
+        ///   查找类似 Configurations 的本地化字符串。
         /// </summary>
         public static string menuServers {
             get {
@@ -1483,7 +1483,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server to custom configuration 的本地化字符串。
+        ///   查找类似 Multi-Configuration to custom configuration 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServer {
             get {
@@ -1492,7 +1492,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server LeastPing by sing-box 的本地化字符串。
+        ///   查找类似 Multi-Configuration LeastPing by sing-box 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerSingBoxLeastPing {
             get {
@@ -1501,7 +1501,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server LeastLoad by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration LeastLoad by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayLeastLoad {
             get {
@@ -1510,7 +1510,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server LeastPing by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration LeastPing by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayLeastPing {
             get {
@@ -1519,7 +1519,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server Random by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration Random by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayRandom {
             get {
@@ -1528,7 +1528,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Multi-server RoundRobin by Xray 的本地化字符串。
+        ///   查找类似 Multi-Configuration RoundRobin by Xray 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultMultipleServerXrayRoundRobin {
             get {
@@ -1537,7 +1537,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Set as active server (Enter) 的本地化字符串。
+        ///   查找类似 Set as active Configuration (Enter) 的本地化字符串。
         /// </summary>
         public static string menuSetDefaultServer {
             get {
@@ -1555,7 +1555,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Share Server (Ctrl+F) 的本地化字符串。
+        ///   查找类似 Share Configuration (Ctrl+F) 的本地化字符串。
         /// </summary>
         public static string menuShareServer {
             get {
@@ -1582,7 +1582,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test servers download speed (Ctrl+T) 的本地化字符串。
+        ///   查找类似 Test Configurations download speed (Ctrl+T) 的本地化字符串。
         /// </summary>
         public static string menuSpeedServer {
             get {
@@ -1726,7 +1726,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Test servers with tcping (Ctrl+O) 的本地化字符串。
+        ///   查找类似 Test Configurations with tcping (Ctrl+O) 的本地化字符串。
         /// </summary>
         public static string menuTcpingServer {
             get {
@@ -1834,7 +1834,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Server filter, press Enter to execute 的本地化字符串。
+        ///   查找类似 Configuration filter, press Enter to execute 的本地化字符串。
         /// </summary>
         public static string MsgServerTitle {
             get {
@@ -2023,7 +2023,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Please select the server first 的本地化字符串。
+        ///   查找类似 Please select the Configuration first 的本地化字符串。
         /// </summary>
         public static string PleaseSelectServer {
             get {
@@ -2050,7 +2050,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Servers deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
+        ///   查找类似 Configurations deduplication completed. Old: {0}, New: {1}. 的本地化字符串。
         /// </summary>
         public static string RemoveDuplicateServerResult {
             get {
@@ -2077,7 +2077,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Are you sure you want to remove the server? 的本地化字符串。
+        ///   查找类似 Are you sure you want to remove the Configuration? 的本地化字符串。
         /// </summary>
         public static string RemoveServer {
             get {
@@ -2203,7 +2203,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Custom configuration server imported successfully 的本地化字符串。
+        ///   查找类似 Custom configuration Configuration imported successfully 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedCustomServer {
             get {
@@ -2212,7 +2212,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 {0} servers have been imported from clipboard 的本地化字符串。
+        ///   查找类似 {0} Configurations have been imported from clipboard 的本地化字符串。
         /// </summary>
         public static string SuccessfullyImportedServerViaClipboard {
             get {
@@ -2581,7 +2581,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Server port range 的本地化字符串。
+        ///   查找类似 Configuration port range 的本地化字符串。
         /// </summary>
         public static string TbPorts7 {
             get {
@@ -3040,7 +3040,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Double-clicking server makes it active 的本地化字符串。
+        ///   查找类似 Double-clicking Configuration makes it active 的本地化字符串。
         /// </summary>
         public static string TbSettingsDoubleClick2Activate {
             get {
@@ -3076,7 +3076,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Enable sorting servers by drag-n-drop (requires restart) 的本地化字符串。
+        ///   查找类似 Enable sorting Configurations by drag-n-drop (requires restart) 的本地化字符串。
         /// </summary>
         public static string TbSettingsEnableDragDropSort {
             get {
@@ -3201,6 +3201,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Current connection info test URL 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsIPAPIUrl {
+            get {
+                return ResourceManager.GetString("TbSettingsIPAPIUrl", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Keep older entries when de-duplicating 的本地化字符串。
         /// </summary>
@@ -3247,7 +3256,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 The password is encrypted and stored only in local files 的本地化字符串。
+        ///   查找类似 The password you entered cannot be verified, so make sure you enter it correctly. If the application does not work properly due to an incorrect input, please restart the application. The password will not be stored and you will need to enter it again after each restart. 的本地化字符串。
         /// </summary>
         public static string TbSettingsLinuxSudoPasswordTip {
             get {
@@ -3526,7 +3535,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Tray right-click menu servers display limit 的本地化字符串。
+        ///   查找类似 Tray right-click menu Configurations display limit 的本地化字符串。
         /// </summary>
         public static string TbSettingsTrayMenuServersLimit {
             get {

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

@@ -1339,7 +1339,7 @@
     <value>رمز عبور sudo سیستم</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>رمز عبور رمزگذاری شده و فقط در فایل های محلی ذخیره می شود.</value>
+    <value>رمز عبوری که وارد کرده اید تایید نمی شود، بنابراین مطمئن شوید که آن را به درستی وارد کرده اید. اگر برنامه به دلیل ورودی نادرست به درستی کار نمی کند، لطفاً برنامه را مجدداً راه اندازی کنید. رمز عبور ذخیره نمی شود و پس از هر بار راه اندازی مجدد باید آن را دوباره وارد کنید.</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
     <value>لطفاً ابتدا رمز عبور sudo را در تنظیمات حالت Tun تنظیم کنید</value>
@@ -1416,4 +1416,7 @@
   <data name="menuExportConfig" xml:space="preserve">
     <value>صادر کردن سرور</value>
   </data>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>URL آزمایش اطلاعات اتصال فعلی</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1339,7 +1339,7 @@
     <value>Rendszer sudo jelszó</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>A jelszó titkosítva és csak a helyi fájlokban tárolva.</value>
+    <value>The password you entered cannot be verified, so make sure you enter it correctly. If the application does not work properly due to an incorrect input, please restart the application. The password will not be stored and you will need to enter it again after each restart.</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
     <value>Kérlek, először állítsd be a sudo jelszót a Tun módban</value>
@@ -1416,4 +1416,7 @@
   <data name="menuExportConfig" xml:space="preserve">
     <value>Export server</value>
   </data>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>Current connection info test URL</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -121,7 +121,7 @@
     <value>Export share link to clipboard successfully</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>Please check the server settings first.</value>
+    <value>Please check the Configuration settings first.</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>Invalid configuration format.</value>
@@ -148,13 +148,13 @@
     <value>Failed to get the default configuration</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>Failed to import custom configuration server</value>
+    <value>Failed to import custom configuration Configuration</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>Failed to read configuration file</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>Please enter the correct server port format.</value>
+    <value>Please enter the correct port format.</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>Please enter the local listening port.</value>
@@ -163,7 +163,7 @@
     <value>Please enter the password.</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>Please enter the server address.</value>
+    <value>Please enter the address.</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
     <value>Please enter the user ID.</value>
@@ -271,13 +271,13 @@
     <value>Please select a protocol</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>Please select the server first</value>
+    <value>Please select the Configuration first</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>Servers deduplication completed. Old: {0}, New: {1}.</value>
+    <value>Configurations deduplication completed. Old: {0}, New: {1}.</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>Are you sure you want to remove the server?</value>
+    <value>Are you sure you want to remove the Configuration?</value>
   </data>
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>The client configuration file is saved at: {0}</value>
@@ -289,10 +289,10 @@
     <value>Configuration successful. {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Custom configuration server imported successfully</value>
+    <value>Custom configuration Configuration imported successfully</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} servers have been imported from clipboard</value>
+    <value>{0} Configurations have been imported from clipboard</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
     <value>Successfully scanned and imported the shared link</value>
@@ -394,7 +394,7 @@
     <value>All</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>Please browse to import server configuration</value>
+    <value>Please browse to import Configuration configuration</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Testing...</value>
@@ -406,7 +406,7 @@
     <value>Local</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>Server filter, press Enter to execute</value>
+    <value>Configuration filter, press Enter to execute</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>Check Update</value>
@@ -436,7 +436,7 @@
     <value>Routing Setting</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>Servers</value>
+    <value>Configurations</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>Settings</value>
@@ -487,55 +487,55 @@
     <value>Scan QR code on the screen (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>Clone selected server</value>
+    <value>Clone selected Configuration</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>Remove duplicate servers</value>
+    <value>Remove duplicate Configurations</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>Remove selected servers (Delete)</value>
+    <value>Remove selected Configurations (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>Set as active server (Enter)</value>
+    <value>Set as active Configuration (Enter)</value>
   </data>
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>Clear all service statistics</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>Test servers real delay (Ctrl+R)</value>
+    <value>Test Configurations real delay (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>Sort by test result</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>Test servers download speed (Ctrl+T)</value>
+    <value>Test Configurations download speed (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>Test servers with tcping (Ctrl+O)</value>
+    <value>Test Configurations with tcping (Ctrl+O)</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>Export selected server for complete configuration</value>
+    <value>Export selected Configuration for complete configuration</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>Export Share Link to Clipboard (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
-    <value>Add a custom configuration server</value>
+    <value>Add a custom configuration Configuration</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>Add [Shadowsocks] server</value>
+    <value>Add [Shadowsocks] Configuration</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>Add [SOCKS] server</value>
+    <value>Add [SOCKS] Configuration</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>Add [Trojan] server</value>
+    <value>Add [Trojan] Configuration</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>Add [VLESS] server</value>
+    <value>Add [VLESS] Configuration</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>Add [VMess] server</value>
+    <value>Add [VMess] Configuration</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>Select all (Ctrl+A)</value>
@@ -760,7 +760,7 @@
     <value>Enable Security Protocol TLS v1.3 (subscription/update)</value>
   </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>Tray right-click menu servers display limit</value>
+    <value>Tray right-click menu Configurations display limit</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>Enable UDP</value>
@@ -793,7 +793,7 @@
     <value>PAC mode</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>Share Server (Ctrl+F)</value>
+    <value>Share Configuration (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>Routing</value>
@@ -940,7 +940,7 @@
     <value>Move to group</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>Enable sorting servers by drag-n-drop (requires restart)</value>
+    <value>Enable sorting Configurations by drag-n-drop (requires restart)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>Auto refresh</value>
@@ -949,10 +949,10 @@
     <value>Skip test</value>
   </data>
   <data name="menuEditServer" xml:space="preserve">
-    <value>Edit Server (Ctrl+D)</value>
+    <value>Edit Configuration (Ctrl+D)</value>
   </data>
   <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
-    <value>Double-clicking server makes it active</value>
+    <value>Double-clicking Configuration makes it active</value>
   </data>
   <data name="SpeedtestingCompleted" xml:space="preserve">
     <value>Test completed</value>
@@ -1060,7 +1060,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>Add [Hysteria2] server</value>
+    <value>Add [Hysteria2] Configuration</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria Max bandwidth (Up/Down)</value>
@@ -1069,19 +1069,19 @@
     <value>Use System Hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>Add [TUIC] server</value>
+    <value>Add [TUIC] Configuration</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>Congestion control</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remarks</value>
+    <value>Previous proxy Configuration remarks</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>Next proxy remarks</value>
+    <value>Next proxy Configuration remarks</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>Please make sure the remarks exist and are unique</value>
+    <value>Please make sure the Configuration remarks exist and are unique</value>
   </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>Enable additional Inbound</value>
@@ -1090,7 +1090,7 @@
     <value>Enable IPv6 Address</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>Add [WireGuard] server</value>
+    <value>Add [WireGuard] Configuration</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>Private Key</value>
@@ -1123,7 +1123,7 @@
     <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>Add [HTTP] server</value>
+    <value>Add [HTTP] Configuration</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
     <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
@@ -1237,7 +1237,7 @@
     <value>Export Base64-encoded Share Links to Clipboard</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>Export selected server for complete configuration to clipboard</value>
+    <value>Export selected Configuration for complete configuration to clipboard</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>Show or hide the main window</value>
@@ -1339,7 +1339,7 @@
     <value>System sudo password</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>The password is encrypted and stored only in local files</value>
+    <value>The password you entered cannot be verified, so make sure you enter it correctly. If the application does not work properly due to an incorrect input, please restart the application. The password will not be stored and you will need to enter it again after each restart.</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
     <value>Please set the sudo password in Tun mode settings first</value>
@@ -1390,30 +1390,33 @@
     <value>Removed {0} invalid test results.</value>
   </data>
   <data name="TbPorts7" xml:space="preserve">
-    <value>Server port range</value>
+    <value>Configuration port range</value>
   </data>
   <data name="TbPorts7Tips" xml:space="preserve">
     <value>Will cover the port, separate with commas (,)</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>Multi-server to custom configuration</value>
+    <value>Multi-Configuration to custom configuration</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>Multi-server Random by Xray</value>
+    <value>Multi-Configuration Random by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>Multi-server RoundRobin by Xray</value>
+    <value>Multi-Configuration RoundRobin by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by Xray</value>
+    <value>Multi-Configuration LeastPing by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>Multi-server LeastLoad by Xray</value>
+    <value>Multi-Configuration LeastLoad by Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by sing-box</value>
+    <value>Multi-Configuration LeastPing by sing-box</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>Export server</value>
+    <value>Export Configuration</value>
+  </data>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>Current connection info test URL</value>
   </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -118,16 +118,16 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="BatchExportURLSuccessfully" xml:space="preserve">
-    <value>Экспортирование URL в буфер обмена успешно завершено</value>
+    <value>Ссылка успешно скопирована в буфер обмена</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>Пожалуйста, сначала проверьте настройки сервера</value>
+    <value>Сначала проверьте настройки сервера</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>Недопустимый формат конфигурации</value>
   </data>
   <data name="CustomServerTips" xml:space="preserve">
-    <value>Обратите внимание, что пользовательская конфигурация полностью зависит от вашей собственной конфигурации и работает не со всеми настройками. Если вы хотите использовать системный прокси, пожалуйста, измените порт прослушивания вручную.</value>
+    <value>Обратите внимание, что пользовательская конфигурация полностью зависит от вашей собственной конфигурации и работает не со всеми настройками. Если вы хотите использовать системный прокси, то измените порт прослушивания вручную</value>
   </data>
   <data name="Downloading" xml:space="preserve">
     <value>Загрузка...</value>
@@ -136,13 +136,13 @@
     <value>Скорость загрузки</value>
   </data>
   <data name="DownloadYesNo" xml:space="preserve">
-    <value>Хотите загрузить? {0}</value>
+    <value>Хотите загрузить {0}?</value>
   </data>
   <data name="FailedConversionConfiguration" xml:space="preserve">
     <value>Не удалось преобразовать файл конфигурации</value>
   </data>
   <data name="FailedGenDefaultConfiguration" xml:space="preserve">
-    <value>Не удалось создать файл конфигурации по умолчаниюe</value>
+    <value>Не удалось создать файл конфигурации по умолчанию</value>
   </data>
   <data name="FailedGetDefaultConfiguration" xml:space="preserve">
     <value>Не удалось получить конфигурацию по умолчанию</value>
@@ -154,37 +154,37 @@
     <value>Не удалось прочитать файл конфигурации</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>Пожалуйста, укажите порт сервера в правильном формате</value>
+    <value>Укажите порт сервера в правильном формате</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
-    <value>Пожалуйста, укажите локальный порт прослушивания</value>
+    <value>Введите локальный порт для прослушивания</value>
   </data>
   <data name="FillPassword" xml:space="preserve">
-    <value>Пожалуйста, введите пароль</value>
+    <value>Введите пароль</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>Пожалуйста, заполните адрес сервера</value>
+    <value>Введите адрес сервера</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
-    <value>Пожалуйста, заполните идентификатор пользователя</value>
+    <value>Введите идентификатор пользователя</value>
   </data>
   <data name="Incorrectconfiguration" xml:space="preserve">
-    <value>Некорректная конфигурация, пожалуйста, проверьте</value>
+    <value>Некорректная конфигурация. Проверьте</value>
   </data>
   <data name="InitialConfiguration" xml:space="preserve">
     <value>Исходная конфигурация</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} {1} является последней версией.</value>
+    <value>{0} {1} является последней версией</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} {1} является последней версией.</value>
+    <value>{0} {1} является последней версией</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>Адрес</value>
   </data>
   <data name="LvEncryptionMethod" xml:space="preserve">
-    <value>Безопасность</value>
+    <value>Метод шифрования</value>
   </data>
   <data name="LvPort" xml:space="preserve">
     <value>Порт</value>
@@ -199,7 +199,7 @@
     <value>Загружено трафика сегодня</value>
   </data>
   <data name="LvTodayUploadDataAmount" xml:space="preserve">
-    <value>Отдано трафика сегодня</value>
+    <value>Отправлено сегодня</value>
   </data>
   <data name="LvTotalDownloadDataAmount" xml:space="preserve">
     <value>Всего загружено</value>
@@ -214,13 +214,13 @@
     <value>Ядро успешно загружено</value>
   </data>
   <data name="MsgFailedImportSubscription" xml:space="preserve">
-    <value>Не удалось импортировать содержимое подписки</value>
+    <value>Не удалось импортировать подписку</value>
   </data>
   <data name="MsgGetSubscriptionSuccessfully" xml:space="preserve">
     <value>Содержимое подписки успешно импортировано</value>
   </data>
   <data name="MsgNoValidSubscription" xml:space="preserve">
-    <value>Нет установлены подписки</value>
+    <value>Нет установленных подписок</value>
   </data>
   <data name="MsgParsingSuccessfully" xml:space="preserve">
     <value>Парсинг {0} прошел успешно</value>
@@ -235,7 +235,7 @@
     <value>Некорректное содержимое подписки</value>
   </data>
   <data name="MsgUnpacking" xml:space="preserve">
-    <value>распаковывается...</value>
+    <value>Распаковка…</value>
   </data>
   <data name="MsgUpdateSubscriptionEnd" xml:space="preserve">
     <value>Обновление подписки закончено</value>
@@ -244,37 +244,37 @@
     <value>Обновление подписки начинается</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Успешное обновление ядра</value>
+    <value>Ядро успешно обновлено</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
     <value>Успешное обновление ядра! Перезапуск службы...</value>
   </data>
   <data name="NonvmessOrssProtocol" xml:space="preserve">
-    <value>Не является протоколом Vmess или SS</value>
+    <value>Не является протоколом VMess или Shadowsocks</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
-    <value>Файл Core (имя файла: {1}) не найден в папке ({0}), загрузите и поместите его в папку, адрес загрузки: {2}</value>
+    <value>Файл ядра ({1}) не найден в папке {0}. Скачайте по адресу {2} и поместите его туда</value>
   </data>
   <data name="NoValidQRcodeFound" xml:space="preserve">
     <value>Сканирование завершено, не найден корректный QR код</value>
   </data>
   <data name="OperationFailed" xml:space="preserve">
-    <value> операция безуспешна, проверьте и попробуйте ещё раз</value>
+    <value>Операция безуспешна, проверьте и попробуйте ещё раз</value>
   </data>
   <data name="PleaseFillRemarks" xml:space="preserve">
-    <value>Пожалуйста, заполните примечания</value>
+    <value>Введите примечания</value>
   </data>
   <data name="PleaseSelectEncryption" xml:space="preserve">
-    <value>Пожалуйста, выберите метод шифрования</value>
+    <value>Выберите метод шифрования</value>
   </data>
   <data name="PleaseSelectProtocol" xml:space="preserve">
-    <value>Пожалуйста, выберите протокол</value>
+    <value>Выберите протокол</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
     <value>Сначала выберите сервер</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>Удаление дублей завершено. Старая: {0}, Новая: {1}.</value>
+    <value>Удаление дублей завершено. Старая: {0}, Новая: {1}</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
     <value>Вы уверены, что хотите удалить сервер?</value>
@@ -286,16 +286,16 @@
     <value>Запуск сервиса ({0})...</value>
   </data>
   <data name="SuccessfulConfiguration" xml:space="preserve">
-    <value>Конфигурация успешна {0}</value>
+    <value>Конфигурация выполнена успешно {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>Пользовательский сервер конфигурации успешно импортирован.</value>
+    <value>Пользовательская конфигурация сервера успешно импортирована</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>{0} серверов импортировано из буфера обмена.</value>
+    <value>{0} серверов импортировано из буфера обмена</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
-    <value>Сканирование URL-адреса импорта успешна.</value>
+    <value>Сканирование URL-адреса импорта прошло успешно</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
     <value>Задержка текущего сервера: {0} мс, {1}</value>
@@ -310,7 +310,7 @@
     <value>Вы уверены, что хотите удалить правила?</value>
   </data>
   <data name="RoutingRuleDetailRequiredTips" xml:space="preserve">
-    <value>{0}, Один из обязательных..</value>
+    <value>{0}: одно из обязательных полей</value>
   </data>
   <data name="LvRemarks" xml:space="preserve">
     <value>Примечания</value>
@@ -322,13 +322,13 @@
     <value>Количество</value>
   </data>
   <data name="MsgNeedUrl" xml:space="preserve">
-    <value>Пожалуйста, заполните адрес (Url)</value>
+    <value>Введите URL-адрес</value>
   </data>
   <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
-    <value>Вы хотите добавить правила? Выберите «Да», чтобы добавить, выберите иное, чтобы заменить</value>
+    <value>Хотите добавить правила? Выберите «Да» для добавления или «Нет» для замены</value>
   </data>
   <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
-    <value>Загрузка GeoFile: {0} успешна</value>
+    <value>Загрузка GeoFile {0} прошла успешно</value>
   </data>
   <data name="MsgInformationTitle" xml:space="preserve">
     <value>Информация</value>
@@ -337,49 +337,49 @@
     <value>Пользовательская иконка</value>
   </data>
   <data name="FillCorrectDNSText" xml:space="preserve">
-    <value>Пожалуйста, заполните правильный пользовательский DNS</value>
+    <value>Введите корректный пользовательский DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws путь</value>
+    <value>*WebSocket-путь</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
-    <value>*h2 путь</value>
+    <value>*HTTP2-путь</value>
   </data>
   <data name="TransportPathTip3" xml:space="preserve">
-    <value>*QUIC ключ/Kcp seed</value>
+    <value>*QUIC-ключ / KCP-seed</value>
   </data>
   <data name="TransportPathTip4" xml:space="preserve">
-    <value>*grpc serviceName</value>
+    <value>Имя сервиса *gRPC</value>
   </data>
   <data name="TransportRequestHostTip1" xml:space="preserve">
-    <value>*http хосты разделенные запятыми (,)</value>
+    <value>*http-хосты, разделённые запятыми (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws хост</value>
+    <value>*WebSocket-хост</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
-    <value>*h2 хосты разделенные запятыми (,)</value>
+    <value>*HTTP2-хосты, разделённые запятыми (,)</value>
   </data>
   <data name="TransportRequestHostTip4" xml:space="preserve">
-    <value>* безопасность QUIC</value>
+    <value>Безопасность *QUIC</value>
   </data>
   <data name="TransportHeaderTypeTip1" xml:space="preserve">
-    <value>* тип TCP камуфляжа</value>
+    <value>Тип *TCP-камуфляжа</value>
   </data>
   <data name="TransportHeaderTypeTip2" xml:space="preserve">
-    <value>* тип KCP камуфляжа</value>
+    <value>Тип *KCP-камуфляжа</value>
   </data>
   <data name="TransportHeaderTypeTip3" xml:space="preserve">
-    <value>* тип QUIC камуфляжа</value>
+    <value>Тип *QUIC-камуфляжа</value>
   </data>
   <data name="TransportHeaderTypeTip4" xml:space="preserve">
-    <value>* режим grpc</value>
+    <value>Режим *gRPC</value>
   </data>
   <data name="LvTLS" xml:space="preserve">
     <value>TLS</value>
   </data>
   <data name="TransportPathTip5" xml:space="preserve">
-    <value>*Kcp seed</value>
+    <value>*KCP-seed</value>
   </data>
   <data name="RegisterGlobalHotkeyFailed" xml:space="preserve">
     <value>Не удалось зарегистрировать глобальную горячую клавишу {0}, причина: {1}</value>
@@ -391,10 +391,10 @@
     <value>Разгруппировано</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
-    <value>Все сервера</value>
+    <value>Все серверы</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>Пожалуйста, просмотрите, чтобы импортировать конфигурацию сервера</value>
+    <value>Выберите файл конфигурации сервера для импорта</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>Тестирование...</value>
@@ -436,7 +436,7 @@
     <value>Настройки маршрутизации</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>Сервера</value>
+    <value>Серверы</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>Настройки</value>
@@ -445,7 +445,7 @@
     <value>Обновить текущую подписку без прокси</value>
   </data>
   <data name="menuSubGroupUpdateViaProxy" xml:space="preserve">
-    <value>Обновить текущую подписку с прокси</value>
+    <value>Обновить подписку через прокси</value>
   </data>
   <data name="menuSubscription" xml:space="preserve">
     <value>Группа подписки</value>
@@ -571,7 +571,7 @@
     <value>Сортировка</value>
   </data>
   <data name="LvUserAgent" xml:space="preserve">
-    <value>User Agent</value>
+    <value>Заголовок User-Agent</value>
   </data>
   <data name="TbCancel" xml:space="preserve">
     <value>Отмена</value>
@@ -628,7 +628,7 @@
     <value>TLS</value>
   </data>
   <data name="TipNetwork" xml:space="preserve">
-    <value>* По-умолчанию TCP</value>
+    <value>*По-умолчанию TCP</value>
   </data>
   <data name="TbCoreType" xml:space="preserve">
     <value>Ядро</value>
@@ -658,10 +658,10 @@
     <value>Шифрования</value>
   </data>
   <data name="TbPreSocksPort" xml:space="preserve">
-    <value>txtPreSocksPort</value>
+    <value>Порт SOCKS</value>
   </data>
   <data name="TipPreSocksPort" xml:space="preserve">
-    <value>* После установки этого значения служба socks будет запущена с использованием Xray/sing-box(Tun) для обеспечения таких функций, как отображение скорости</value>
+    <value>* После установки этого значения служба SOCKS будет запущена с использованием Xray/sing-box(TUN) для обеспечения таких функций, как отображение скорости</value>
   </data>
   <data name="TbBrowse" xml:space="preserve">
     <value>Просмотр</value>
@@ -697,7 +697,7 @@
     <value>Разрешить небезопасные</value>
   </data>
   <data name="TbSettingsDomainStrategy4Freedom" xml:space="preserve">
-    <value>Outbound Freedom domainStrategy</value>
+    <value>«Freedom»: стратегия обработки доменов исходящего трафика</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
     <value>Автоматически регулировать ширину столбца после обновления подписки</value>
@@ -712,7 +712,7 @@
     <value>Исключение. Не используйте прокси-сервер для адресов, начинающихся с (,), используйте точку с запятой (;)</value>
   </data>
   <data name="TbSettingsDisplayRealTimeSpeed" xml:space="preserve">
-    <value>Display real-time speed</value>
+    <value>Показывать скорость в реальном времени</value>
   </data>
   <data name="TbSettingsKeepOlderDedupl" xml:space="preserve">
     <value>Сохранить старые при удалении дублей</value>
@@ -721,10 +721,10 @@
     <value>Записывать логи</value>
   </data>
   <data name="TbSettingsLogLevel" xml:space="preserve">
-    <value>Уровень логгирования</value>
+    <value>Уровень записи логов</value>
   </data>
   <data name="TbSettingsMuxEnabled" xml:space="preserve">
-    <value>Включите мультиплексирование Mux</value>
+    <value>Включить мультиплексирование Mux</value>
   </data>
   <data name="TbSettingsN" xml:space="preserve">
     <value>Настройки v2rayN</value>
@@ -733,16 +733,16 @@
     <value>Пароль аутентификации</value>
   </data>
   <data name="TbSettingsRemoteDNS" xml:space="preserve">
-    <value>Пользовательский DNS (если несколько делите с запятыми (,))</value>
+    <value>Пользовательский DNS (если несколько, то делите запятыми (,))</value>
   </data>
   <data name="TbSettingsSetUWP" xml:space="preserve">
-    <value>Set Win10 UWP Loopback</value>
+    <value>Разрешить loopback для приложений UWP (Win10)</value>
   </data>
   <data name="TbSettingsSniffingEnabled" xml:space="preserve">
     <value>Включить сниффинг</value>
   </data>
   <data name="TbSettingsSocksPort" xml:space="preserve">
-    <value>Mixed Port</value>
+    <value>Смешанный порт</value>
   </data>
   <data name="TbSettingsStartBoot" xml:space="preserve">
     <value>Автозапуск</value>
@@ -751,7 +751,7 @@
     <value>Включить статистику (требуется перезагрузка)</value>
   </data>
   <data name="TbSettingsSubConvert" xml:space="preserve">
-    <value>URL-адрес конверсии подписки</value>
+    <value>URL конвертации подписок</value>
   </data>
   <data name="TbSettingsSystemproxy" xml:space="preserve">
     <value>Настройки системного прокси</value>
@@ -766,7 +766,7 @@
     <value>Включить UDP</value>
   </data>
   <data name="TbSettingsUser" xml:space="preserve">
-    <value>Auth user</value>
+    <value>Имя пользователя (логин)</value>
   </data>
   <data name="TbClearSystemProxy" xml:space="preserve">
     <value>Очистить системный прокси</value>
@@ -816,6 +816,9 @@
   <data name="menuMoveUp" xml:space="preserve">
     <value>Вверх (U)</value>
   </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>Переместить вверх/вниз</value>
+  </data>
   <data name="MsgFilterTitle" xml:space="preserve">
     <value>Фильтр, поддерживает regex</value>
   </data>
@@ -850,13 +853,13 @@
     <value>2.Прямой домен или IP</value>
   </data>
   <data name="TbRoutingTabProxy" xml:space="preserve">
-    <value>1.Прокси-домен или IP</value>
+    <value>1.Прокси домен или IP</value>
   </data>
   <data name="TbRoutingTabRuleList" xml:space="preserve">
     <value>Предустановленный список наборов правил</value>
   </data>
   <data name="TbRoutingTips" xml:space="preserve">
-    <value>* Установите правила, разделенные запятыми (,); Запятая в регулярке заменена на &lt;COMMA&gt;</value>
+    <value>*Разделяйте правила запятыми (,). Литерал «,» — &lt;COMMA&gt;. Префикс # — отключить правило</value>
   </data>
   <data name="menuImportRulesFromClipboard" xml:space="preserve">
     <value>Импорт правил из буфера обмена</value>
@@ -883,16 +886,16 @@
     <value>Удалить правила (Delete)</value>
   </data>
   <data name="menuRoutingRuleDetailsSetting" xml:space="preserve">
-    <value>RoutingRuleDetailsSetting</value>
+    <value>Детальные настройки правил маршрутизации</value>
   </data>
   <data name="TbAutoSort" xml:space="preserve">
     <value>Домен и IP автоматически сортируются при сохранении</value>
   </data>
   <data name="TbRuleobjectDoc" xml:space="preserve">
-    <value>Ruleobject Doc</value>
+    <value>Документация RuleObject</value>
   </data>
   <data name="TbDnsObjectDoc" xml:space="preserve">
-    <value>Поддержка DnsObject</value>
+    <value>Поддерживаются DNS-объекты, нажмите для просмотра документации</value>
   </data>
   <data name="SubUrlTips" xml:space="preserve">
     <value>Необязательное поле</value>
@@ -913,16 +916,16 @@
     <value>Тест задержки и скорости всех серверов (Ctrl+E)</value>
   </data>
   <data name="LvTestDelay" xml:space="preserve">
-    <value>Задержка (ms)</value>
+    <value>Задержка (мс)</value>
   </data>
   <data name="LvTestSpeed" xml:space="preserve">
-    <value>Скорость (M/s)</value>
+    <value>Скорость (МБ/с)</value>
   </data>
   <data name="FailedToRunCore" xml:space="preserve">
     <value>Не удалось запустить ядро, посмотрите логи</value>
   </data>
   <data name="LvFilter" xml:space="preserve">
-    <value>Remarks regular filter</value>
+    <value>Фильтр примечаний (Regex)</value>
   </data>
   <data name="TbDisplayLog" xml:space="preserve">
     <value>Показать логи</value>
@@ -934,7 +937,7 @@
     <value>Новый порт для локальной сети</value>
   </data>
   <data name="TbSettingsTunMode" xml:space="preserve">
-    <value>Настройки TunMode</value>
+    <value>Настройки режима TUN</value>
   </data>
   <data name="menuMoveToGroup" xml:space="preserve">
     <value>Перейти в группу</value>
@@ -958,22 +961,22 @@
     <value>Тест завершен</value>
   </data>
   <data name="TbSettingsDefFingerprint" xml:space="preserve">
-    <value>TLS отпечаток по умлочанию</value>
+    <value>TLS отпечаток по умолчанию</value>
   </data>
   <data name="TbSettingsDefUserAgent" xml:space="preserve">
     <value>User-Agent</value>
   </data>
   <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
-    <value>Этот параметр действителен только для TCP/HTTP и WS</value>
+    <value>Параметр действует только для TCP/HTTP и WebSocket (WS)</value>
   </data>
   <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
     <value>Шрифт (требуется перезагрузка)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>Скопируйте файл шрифта TTF/TTC в каталог guiFonts, перезапустите настройки</value>
+    <value>Скопируйте файл шрифта TTF/TTC в каталог guiFonts и заново откройте окно настроек</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
-    <value>Pac порт = +3; Xray API порт = +4; mihomo API порт = +5;</value>
+    <value>Pac порт = +3,Xray API порт = +4, mihomo API порт = +5</value>
   </data>
   <data name="TbSettingsStartBootTip" xml:space="preserve">
     <value>Установите это с правами администратора</value>
@@ -982,13 +985,10 @@
     <value>Размер шрифта</value>
   </data>
   <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
-    <value>Таймаут одиночного спидтеста</value>
+    <value>Тайм-аут одиночного тестирования скорости</value>
   </data>
   <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
-    <value>URL спидтеста</value>
-  </data>
-  <data name="menuMoveTo" xml:space="preserve">
-    <value>Move up and down</value>
+    <value>URL для тестирования скорости</value>
   </data>
   <data name="TbPublicKey" xml:space="preserve">
     <value>PublicKey</value>
@@ -1003,19 +1003,19 @@
     <value>Включить аппаратное ускорение (требуется перезагрузка)</value>
   </data>
   <data name="SpeedtestingWait" xml:space="preserve">
-    <value>Ожидание тестирования (нажмите ESC для отмены)...</value>
+    <value>Ожидание тестирования (нажмите ESC для отмены)…</value>
   </data>
   <data name="TipDisplayLog" xml:space="preserve">
-    <value>Please turn off when there is an abnormal disconnection</value>
+    <value>Отключите при аномальном разрыве соединения</value>
   </data>
   <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
-    <value>Updates are not enabled, skip this subscription</value>
+    <value>Обновления не включены — подписка пропущена</value>
   </data>
   <data name="menuRebootAsAdmin" xml:space="preserve">
     <value>Перезагрузить как администратор</value>
   </data>
   <data name="LvMoreUrl" xml:space="preserve">
-    <value>More URLs, separated by commas; Subscription conversion will be invalid</value>
+    <value>Дополнительные URL через запятую, конвертация подписки недоступна</value>
   </data>
   <data name="SpeedDisplayText" xml:space="preserve">
     <value>{0} : {1}/s↑ | {2}/s↓</value>
@@ -1024,13 +1024,13 @@
     <value>Интервал автоматического обновления в минутах</value>
   </data>
   <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
-    <value>Включить логгирование в файл</value>
+    <value>Включить запись логов в файл</value>
   </data>
   <data name="LvConvertTarget" xml:space="preserve">
     <value>Преобразовать тип цели</value>
   </data>
   <data name="LvConvertTargetTip" xml:space="preserve">
-    <value>Если преобразование не требуется, оставьте поле пустым.</value>
+    <value>Если преобразование не требуется, оставьте поле пустым</value>
   </data>
   <data name="menuDNSSetting" xml:space="preserve">
     <value>Настройки DNS</value>
@@ -1039,7 +1039,7 @@
     <value>Настройки DNS sing-box</value>
   </data>
   <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
-    <value>Пожалуйста, заполните структуру DNS. Нажмите, чтобы просмотреть документ.</value>
+    <value>Заполните структуру DNS, нажмите, чтобы открыть документ</value>
   </data>
   <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>Нажмите, чтобы импортировать конфигурацию DNS по умолчанию</value>
@@ -1048,88 +1048,88 @@
     <value>Стратегия домена для sing-box</value>
   </data>
   <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
-    <value>sing-box Mux Protocol</value>
+    <value>Протокол Mux для sing-box</value>
   </data>
   <data name="TbRoutingRuleProcess" xml:space="preserve">
-    <value>Full process name (Tun mode)</value>
+    <value>Полное имя процесса (режим TUN)</value>
   </data>
   <data name="TbRoutingRuleIP" xml:space="preserve">
-    <value>IP or IP CIDR</value>
+    <value>IP-адрес или сеть CIDR</value>
   </data>
   <data name="TbRoutingRuleDomain" xml:space="preserve">
     <value>Домен</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>Добавить [Hysteria2] сервер</value>
+    <value>Добавить сервер [Hysteria2]</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
-    <value>Hysteria Max bandwidth (Up/Dw)</value>
+    <value>Максимальная пропускная способность Hysteria (загрузка/отдача)</value>
   </data>
   <data name="TbSettingsUseSystemHosts" xml:space="preserve">
     <value>Использовать системные узлы</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>Добавить [TUIC] сервер</value>
+    <value>Добавить сервер [TUIC]</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>Контроль перегрузок</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>Previous proxy remarks</value>
+    <value>Примечания к предыдущему прокси</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>Next proxy remarks</value>
+    <value>Примечания к следующему прокси</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>Пожалуйста, убедитесь, что примечание существует и является уникальным.</value>
+    <value>Убедитесь, что примечание существует и является уникальным</value>
   </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
-    <value>Enable additional Inbound</value>
+    <value>Включить дополнительный входящий канал</value>
   </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Включить IPv6 адреса</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>Добавить [WireGuard] сервер</value>
+    <value>Добавить сервер [WireGuard]</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
-    <value>PrivateKey</value>
+    <value>Приватный ключ</value>
   </data>
   <data name="TbReserved" xml:space="preserve">
-    <value>Reserved(2,3,4)</value>
+    <value>Зарезервировано (2, 3, 4)</value>
   </data>
   <data name="TbLocalAddress" xml:space="preserve">
-    <value>Адрес(Ipv4,Ipv6)</value>
+    <value>Адрес (Ipv4,Ipv6)</value>
   </data>
   <data name="TbPath7" xml:space="preserve">
-    <value>obfs password</value>
+    <value>Пароль obfs</value>
   </data>
   <data name="TbRuleMatchingTips" xml:space="preserve">
-    <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
+    <value>(Домен или IP или имя процесса) и порт, и протокол, и InboundTag =&gt; OutboundTag</value>
   </data>
   <data name="TbAutoScrollToEnd" xml:space="preserve">
     <value>Автоматическая прокрутка в конец</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
-    <value>URL-адрес для проверки скорости пинга</value>
+    <value>URL для быстрой проверки реальной задержки</value>
   </data>
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
-    <value>Updating subscription, only determine remarks exists</value>
+    <value>Обновляя подписку, проверять лишь наличие примечаний</value>
   </data>
   <data name="SpeedtestingStop" xml:space="preserve">
     <value>Отмена тестирования...</value>
   </data>
   <data name="TransportRequestHostTip5" xml:space="preserve">
-    <value>*grpc Authority</value>
+    <value>*gRPC Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>Добавить [HTTP] сервер</value>
+    <value>Добавить сервер [HTTP]</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
-    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+    <value>Используйте Xray и отключите режим TUN, так как он конфликтует с предыдущим прокси-сервером группы</value>
   </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
-    <value>Включить фрагмент</value>
+    <value>Включить фрагментацию (Fragment)</value>
   </data>
   <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
     <value>Включить файл кэша для sing-box (файлы наборов правил)</value>
@@ -1138,7 +1138,7 @@
     <value>Пользовательский набор правил для sing-box</value>
   </data>
   <data name="NeedRebootTips" xml:space="preserve">
-    <value>Successful operation. Click the settings menu to reboot the app.</value>
+    <value>Операция успешна. Перезапустите приложение</value>
   </data>
   <data name="menuOpenTheFileLocation" xml:space="preserve">
     <value>Открыть место хранения</value>
@@ -1147,7 +1147,7 @@
     <value>Сортировка</value>
   </data>
   <data name="TbSortingChain" xml:space="preserve">
-    <value>Chain</value>
+    <value>Цепочка</value>
   </data>
   <data name="TbSortingDefault" xml:space="preserve">
     <value>По умолчанию</value>
@@ -1159,7 +1159,7 @@
     <value>Скорость загрузки</value>
   </data>
   <data name="TbSortingDownTraffic" xml:space="preserve">
-    <value>Download Traffic</value>
+    <value>Скачанный трафик</value>
   </data>
   <data name="TbSortingHost" xml:space="preserve">
     <value>Узел</value>
@@ -1177,10 +1177,10 @@
     <value>Тип</value>
   </data>
   <data name="TbSortingUpSpeed" xml:space="preserve">
-    <value>Скорость загрузки</value>
+    <value>Скорость отдачи</value>
   </data>
   <data name="TbSortingUpTraffic" xml:space="preserve">
-    <value>Upload Traffic</value>
+    <value>Отправленный трафик</value>
   </data>
   <data name="TbConnections" xml:space="preserve">
     <value>Соединения</value>
@@ -1198,13 +1198,13 @@
     <value>Режим правила</value>
   </data>
   <data name="menuModeDirect" xml:space="preserve">
-    <value>Direct</value>
+    <value>Прямое соединение</value>
   </data>
   <data name="menuModeGlobal" xml:space="preserve">
-    <value>Global</value>
+    <value>Глобальный режим</value>
   </data>
   <data name="menuModeNothing" xml:space="preserve">
-    <value>Do not change</value>
+    <value>Не менять</value>
   </data>
   <data name="menuModeRule" xml:space="preserve">
     <value>Правила</value>
@@ -1213,13 +1213,13 @@
     <value>Тест задержки</value>
   </data>
   <data name="menuProxiesDelaytestPart" xml:space="preserve">
-    <value>Part Node Latency Test</value>
+    <value>Тест задержки выбранных узлов</value>
   </data>
   <data name="menuProxiesReload" xml:space="preserve">
     <value>Обновить прокси</value>
   </data>
   <data name="menuProxiesSelectActivity" xml:space="preserve">
-    <value>Активировать узел (Enter)</value>
+    <value>Сделать узел активным (Enter)</value>
   </data>
   <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
     <value>Стратегия домена по умолчанию для исходящих</value>
@@ -1234,7 +1234,7 @@
     <value>Автоматическая регулировка ширины столбца</value>
   </data>
   <data name="menuExport2ShareUrlBase64" xml:space="preserve">
-    <value>Export Base64-encoded Share Links to Clipboard</value>
+    <value>Экспорт ссылок в формате Base64 в буфер обмена</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
     <value>Экспортировать выбранный сервер для полной конфигурации в буфер обмена</value>
@@ -1243,7 +1243,7 @@
     <value>Показать или скрыть главное окно</value>
   </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
-    <value>Пользовательская конфигурация порта socks</value>
+    <value>Пользовательская конфигурация порта SOCKS</value>
   </data>
   <data name="menuBackupAndRestore" xml:space="preserve">
     <value>Резервное копирование и восстановление</value>
@@ -1255,28 +1255,28 @@
     <value>Восстановить из файла</value>
   </data>
   <data name="menuRemoteBackup" xml:space="preserve">
-    <value>Backup to remote (WebDAV)</value>
+    <value>Резервное копирование на удалённый сервер (WebDAV)</value>
   </data>
   <data name="menuRemoteRestore" xml:space="preserve">
-    <value>Restore from remote (WebDAV)</value>
+    <value>Восстановить с удалённого сервера (WebDAV)</value>
   </data>
   <data name="menuLocalBackupAndRestore" xml:space="preserve">
-    <value>Local</value>
+    <value>Локально</value>
   </data>
   <data name="menuRemoteBackupAndRestore" xml:space="preserve">
-    <value>Remote (WebDAV)</value>
+    <value>Удалённо (WebDAV)</value>
   </data>
   <data name="LvWebDavUrl" xml:space="preserve">
-    <value>WebDav Url</value>
+    <value>URL WebDAV</value>
   </data>
   <data name="LvWebDavUserName" xml:space="preserve">
-    <value>WebDav User Name</value>
+    <value>Имя пользователя WebDAV</value>
   </data>
   <data name="LvWebDavPassword" xml:space="preserve">
-    <value>WebDav Password</value>
+    <value>Пароль WebDAV</value>
   </data>
   <data name="LvWebDavCheck" xml:space="preserve">
-    <value>WebDav Check</value>
+    <value>Проверить WebDAV</value>
   </data>
   <data name="LvWebDavDirName" xml:space="preserve">
     <value>Имя удаленной папки (необязательно)</value>
@@ -1285,16 +1285,16 @@
     <value>Неверный файл резервной копии</value>
   </data>
   <data name="ConnectionsHostFilterTitle" xml:space="preserve">
-    <value>Host filter</value>
+    <value>Фильтр хостов</value>
   </data>
   <data name="TipActiveServer" xml:space="preserve">
-    <value>Active</value>
+    <value>Активный</value>
   </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
-    <value>Источник geo файлов</value>
+    <value>Источник файлов Geo (необязательно)</value>
   </data>
   <data name="TbSettingsSrsFilesSource" xml:space="preserve">
-    <value>Источник sing-box srs файлов</value>
+    <value>Источник файлов наборов правил sing-box (необязательно)</value>
   </data>
   <data name="UpgradeAppNotExistTip" xml:space="preserve">
     <value>Программы для обновления не существует</value>
@@ -1315,7 +1315,7 @@
     <value>Иран</value>
   </data>
   <data name="TbSettingsChinaUserTip" xml:space="preserve">
-    <value>Используйте Настройки -&gt; Региональные пресеты вместо изменения этого поля</value>
+    <value>Пользователи из Китая могут пропустить этот пункт</value>
   </data>
   <data name="menuAddServerViaImage" xml:space="preserve">
     <value>Сканировать QR-код с изображения</value>
@@ -1324,7 +1324,7 @@
     <value>Неверный адрес (Url)</value>
   </data>
   <data name="InsecureUrlProtocol" xml:space="preserve">
-    <value>Пожалуйста, не используйте небезопасный адрес подписки по протоколу HTTP.</value>
+    <value>Не используйте небезопасный адрес подписки по протоколу HTTP</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
     <value>Установите шрифт в систему и перезапустите настройки</value>
@@ -1333,43 +1333,43 @@
     <value>Вы уверены, что хотите выйти?</value>
   </data>
   <data name="LvMemo" xml:space="preserve">
-    <value>Remarks Memo</value>
+    <value>Заметка (Memo)</value>
   </data>
   <data name="TbSettingsLinuxSudoPassword" xml:space="preserve">
-    <value>System sudo password</value>
+    <value>Пароль sudo системы</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>Пароль зашифрован и хранится только в локальных файлах..</value>
+    <value>Введенный вами пароль не может быть подтвержден, поэтому убедитесь, что вы ввели его правильно. Если приложение не работает должным образом из-за неправильного ввода, то перезапустите его. Пароль не будет сохранен, и вам придется вводить его заново после каждого перезапуска</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
-    <value>Please set the sudo password in Tun mode settings first</value>
+    <value>Сначала задайте пароль sudo в настройках TUN-режима</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
-    <value>Пожалуйста, не запускайте программу как суперпользователь.</value>
+    <value>Не запускайте программу как суперпользователь</value>
   </data>
   <data name="TransportHeaderTypeTip5" xml:space="preserve">
-    <value>*xhttp mode</value>
+    <value>*XHTTP-режим</value>
   </data>
   <data name="TransportExtraTip" xml:space="preserve">
-    <value>XHTTP Extra raw JSON, format: { XHTTPObject }</value>
+    <value>Дополнительный XHTTP сырой JSON, формат: { XHTTPObject }</value>
   </data>
   <data name="TbSettingsHide2TrayWhenClose" xml:space="preserve">
     <value>Скрыть в трее при закрытии окна</value>
   </data>
   <data name="TbSettingsMixedConcurrencyCount" xml:space="preserve">
-    <value>The number of concurrent during multi-test</value>
+    <value>Количество одновременно выполняемых тестов при многоэтапном тестировании</value>
   </data>
   <data name="TbSettingsExceptionTip2" xml:space="preserve">
     <value>Исключение. Не используйте прокси-сервер для адресов с запятой (,)</value>
   </data>
   <data name="TbSettingsDestOverride" xml:space="preserve">
-    <value>Sniffing type</value>
+    <value>Тип сниффинга</value>
   </data>
   <data name="TbSettingsSecondLocalPortEnabled" xml:space="preserve">
-    <value>Enable second mixed port</value>
+    <value>Включить второй смешанный порт</value>
   </data>
   <data name="TbRoutingInboundTagTips" xml:space="preserve">
-    <value>socks: local port, socks2: second local port, socks3: LAN port</value>
+    <value>socks: локальный порт, socks2: второй локальный порт, socks3: LAN порт</value>
   </data>
   <data name="TbSettingsTheme" xml:space="preserve">
     <value>Темы</value>
@@ -1378,7 +1378,7 @@
     <value>Копировать команду прокси в буфер обмена</value>
   </data>
   <data name="SpeedtestingTestFailedPart" xml:space="preserve">
-    <value>Starting retesting failed parts, {0} remaining. Press ESC to terminate...</value>
+    <value>Повторное тестирование неудачных элементов, осталось {0}. Нажмите ESC для остановки…</value>
   </data>
   <data name="menuTestServerResult" xml:space="preserve">
     <value>По результату теста</value>
@@ -1387,33 +1387,36 @@
     <value>Удалить недействительные по результатам теста</value>
   </data>
   <data name="RemoveInvalidServerResultTip" xml:space="preserve">
-    <value>Удалено {0} недействительных.</value>
+    <value>Удалено {0} недействительных</value>
   </data>
   <data name="TbPorts7" xml:space="preserve">
     <value>Диапазон портов сервера</value>
   </data>
   <data name="TbPorts7Tips" xml:space="preserve">
-    <value>Will cover the port, separate with commas (,)</value>
+    <value>Заменит указанный порт, перечисляйте через запятую (,)</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>Multi-server to custom configuration</value>
+    <value>От мультиконфигурации к пользовательской конфигурации</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>Multi-server Random by Xray</value>
+    <value>Случайный (Xray)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>Multi-server RoundRobin by Xray</value>
+    <value>Круговой (Xray)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by Xray</value>
+    <value>Минимальное RTT (минимальное время туда-обратно) (Xray)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>Multi-server LeastLoad by Xray</value>
+    <value>Минимальная нагрузка (Xray)</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>Multi-server LeastPing by sing-box</value>
+    <value>Минимальное RTT (минимальное время туда-обратно) (sing-box)</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>Export server</value>
+    <value>Экспортировать конфигурацию</value>
   </data>
-</root>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>URL для тестирования текущего соединения</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -121,7 +121,7 @@
     <value>导出分享链接至剪贴板成功</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>请先检查服务器设置</value>
+    <value>请先检查配置文件设置</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>配置格式不正确</value>
@@ -148,13 +148,13 @@
     <value>获取默认配置失败</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>导入自定义配置服务器失败</value>
+    <value>导入自定义配置文件失败</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>读取配置文件失败</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>请填写正确格式的服务器端口</value>
+    <value>请填写正确格式的端口</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>请填写本地监听端口</value>
@@ -163,7 +163,7 @@
     <value>请填写密码</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>请填写服务器地址</value>
+    <value>请填写地址</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
     <value>请填写用户 ID</value>
@@ -271,13 +271,13 @@
     <value>请选择协议</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>请先选择服务器</value>
+    <value>请先选择配置文件</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>服务器去重完成。原数量: {0}，现数量: {1}。</value>
+    <value>配置文件去重完成。原数量: {0}，现数量: {1}。</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>是否确定移除服务器？</value>
+    <value>是否确定移除配置文件？</value>
   </data>
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>客户端配置文件保存在：{0}</value>
@@ -289,10 +289,10 @@
     <value>配置成功。 {0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>成功导入自定义配置服务器</value>
+    <value>成功导入自定义配置文件</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>成功从剪贴板导入 {0} 个服务器</value>
+    <value>成功从剪贴板导入 {0} 个配置文件</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
     <value>扫描导入分享链接成功</value>
@@ -388,13 +388,13 @@
     <value>注册全局热键 {0} 成功</value>
   </data>
   <data name="UngroupedServers" xml:space="preserve">
-    <value>未分组服务器</value>
+    <value>未分组配置文件</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>请浏览导入服务器配置</value>
+    <value>请浏览导入配置文件配置</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>测试中...</value>
@@ -406,7 +406,7 @@
     <value>本地</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>服务器过滤器，按回车执行</value>
+    <value>配置文件过滤器，按回车执行</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>检查更新</value>
@@ -436,7 +436,7 @@
     <value>路由设置</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>服务器</value>
+    <value>配置文件</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>设置</value>
@@ -487,55 +487,55 @@
     <value>扫描屏幕上的二维码 (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>克隆所选服务器</value>
+    <value>克隆所选配置文件</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>移除重复的服务器</value>
+    <value>移除重复的配置文件</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>移除所选服务器 (多选) (Delete)</value>
+    <value>移除所选配置文件 (多选) (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>设为活动服务器 (Enter)</value>
+    <value>设为活动配置文件 (Enter)</value>
   </data>
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服务统计数据</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>测试服务器真连接延迟 (多选) (Ctrl+R)</value>
+    <value>测试配置文件真连接延迟 (多选) (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>按测试结果排序</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>测试服务器速度 (多选) (Ctrl+T)</value>
+    <value>测试配置文件速度 (多选) (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>测试服务器延迟 Tcping (多选) (Ctrl+O)</value>
+    <value>测试配置文件延迟 Tcping (多选) (Ctrl+O)</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>导出所选服务器完整配置</value>
+    <value>导出所选配置文件完整配置</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>导出分享链接至剪贴板 (多选) (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
-    <value>添加自定义配置服务器</value>
+    <value>添加自定义配置文件</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>添加 [Shadowsocks] 服务器</value>
+    <value>添加 [Shadowsocks] 配置文件</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>添加 [SOCKS] 服务器</value>
+    <value>添加 [SOCKS] 配置文件</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>添加 [Trojan] 服务器</value>
+    <value>添加 [Trojan] 配置文件</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>添加 [VLESS] 服务器</value>
+    <value>添加 [VLESS] 配置文件</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>添加 [VMess] 服务器</value>
+    <value>添加 [VMess] 配置文件</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>全选 (Ctrl+A)</value>
@@ -700,7 +700,7 @@
     <value>Outbound Freedom domainStrategy</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>自动调整服务器列宽在更新订阅后</value>
+    <value>自动调整配置文件列宽在更新订阅后</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>检查 Pre-Release 更新 (请谨慎启用)</value>
@@ -760,7 +760,7 @@
     <value>启用安全协议 TLS v1.3 (订阅/检查更新)</value>
   </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>托盘右键菜单服务器展示数量限制</value>
+    <value>托盘右键菜单配置文件展示数量限制</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>开启 UDP</value>
@@ -793,7 +793,7 @@
     <value>Pac 模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>分享服务器 (Ctrl+F)</value>
+    <value>分享配置文件 (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>路由</value>
@@ -940,7 +940,7 @@
     <value>移至订阅分组</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>启用服务器拖放排序（需重启）</value>
+    <value>启用配置文件拖放排序（需重启）</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>自动刷新</value>
@@ -949,10 +949,10 @@
     <value>跳过测试</value>
   </data>
   <data name="menuEditServer" xml:space="preserve">
-    <value>编辑服务器 (Ctrl+D)</value>
+    <value>编辑配置文件 (Ctrl+D)</value>
   </data>
   <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
-    <value>主界面双击设为活动服务器</value>
+    <value>主界面双击设为活动配置文件</value>
   </data>
   <data name="SpeedtestingCompleted" xml:space="preserve">
     <value>测试完成</value>
@@ -1057,7 +1057,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>添加 [Hysteria2] 服务器</value>
+    <value>添加 [Hysteria2] 配置文件</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria 最大带宽 (Up/Dw)</value>
@@ -1066,19 +1066,19 @@
     <value>使用系统 hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>添加 [TUIC] 服务器</value>
+    <value>添加 [TUIC] 配置文件</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>拥塞控制算法</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>前置代理别名</value>
+    <value>前置代理配置文件别名</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>落地代理別名</value>
+    <value>落地代理配置文件別名</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>请确保别名存在并唯一</value>
+    <value>请确保配置文件别名存在并唯一</value>
   </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>启用额外监听端口</value>
@@ -1087,7 +1087,7 @@
     <value>启用 IPv6</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>添加 [WireGuard] 服务器</value>
+    <value>添加 [WireGuard] 配置文件</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>PrivateKey</value>
@@ -1120,7 +1120,7 @@
     <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>添加 [HTTP] 服务器</value>
+    <value>添加 [HTTP] 配置文件</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
     <value>使用 Xray 且非 Tun 模式启用，和分组前置代理冲突</value>
@@ -1234,7 +1234,7 @@
     <value>导出分享链接至剪贴板 (多选) Base64 编码</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>导出所选服务器完整配置至剪贴板</value>
+    <value>导出所选配置文件完整配置至剪贴板</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>显示或隐藏主界面</value>
@@ -1336,7 +1336,7 @@
     <value>系统的 sudo 密码</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>密码已加密且只存储在本地文件中，无密码则每次都要输入</value>
+    <value>输入的密码无法校验，所以请确保输入正确。如果因为输入错误导致无法正常运行时，请重启本应用。 密码不会存储，每次重启后都需要再次输入。</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
     <value>请先在 Tun 模式设置中设置 sudo 密码</value>
@@ -1393,24 +1393,27 @@
     <value>会覆盖端口，多组时用逗号 (,) 隔开</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>多服务器产生自定义配置 (多选)</value>
+    <value>多配置文件产生自定义配置 (多选)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>多服务器随机 Xray</value>
+    <value>多配置文件随机 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>多服务器负载均衡  Xray</value>
+    <value>多配置文件负载均衡  Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>多服务器最低延迟  Xray</value>
+    <value>多配置文件最低延迟  Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>多服务器最稳定  Xray</value>
+    <value>多配置文件最稳定  Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>多服务器最低延迟 sing-box</value>
+    <value>多配置文件最低延迟 sing-box</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>导出服务器</value>
+    <value>导出配置文件</value>
   </data>
-</root>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>当前连接信息测试地址</value>
+  </data>
+</root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -121,7 +121,7 @@
     <value>匯出分享链接至剪貼簿成功</value>
   </data>
   <data name="CheckServerSettings" xml:space="preserve">
-    <value>請先檢查伺服器設定</value>
+    <value>請先檢查設定檔設定</value>
   </data>
   <data name="ConfigurationFormatIncorrect" xml:space="preserve">
     <value>設定格式不正確</value>
@@ -148,13 +148,13 @@
     <value>獲取預設設定失敗</value>
   </data>
   <data name="FailedImportedCustomServer" xml:space="preserve">
-    <value>匯入自訂設定伺服器失敗</value>
+    <value>匯入自訂設定設定檔失敗</value>
   </data>
   <data name="FailedReadConfiguration" xml:space="preserve">
     <value>讀取設定檔失敗</value>
   </data>
   <data name="FillCorrectServerPort" xml:space="preserve">
-    <value>請填寫正確格式的伺服器埠</value>
+    <value>請填寫正確格式的埠</value>
   </data>
   <data name="FillLocalListeningPort" xml:space="preserve">
     <value>請填寫本機偵聽埠</value>
@@ -163,7 +163,7 @@
     <value>請填寫密碼</value>
   </data>
   <data name="FillServerAddress" xml:space="preserve">
-    <value>請填寫伺服器位址</value>
+    <value>請填寫位址</value>
   </data>
   <data name="FillUUID" xml:space="preserve">
     <value>請填寫使用者 ID</value>
@@ -271,13 +271,13 @@
     <value>請選擇協定</value>
   </data>
   <data name="PleaseSelectServer" xml:space="preserve">
-    <value>請先選擇伺服器</value>
+    <value>請先選擇設定檔</value>
   </data>
   <data name="RemoveDuplicateServerResult" xml:space="preserve">
-    <value>伺服器去重完成。原數量: {0}，現數量: {1}。</value>
+    <value>設定檔去重完成。原數量: {0}，現數量: {1}。</value>
   </data>
   <data name="RemoveServer" xml:space="preserve">
-    <value>是否確定移除伺服器？</value>
+    <value>是否確定移除設定檔？</value>
   </data>
   <data name="SaveClientConfigurationIn" xml:space="preserve">
     <value>用戶端設定檔儲存在：{0}</value>
@@ -289,10 +289,10 @@
     <value>設定成功。{0}</value>
   </data>
   <data name="SuccessfullyImportedCustomServer" xml:space="preserve">
-    <value>成功匯入自訂設定伺服器</value>
+    <value>成功匯入自訂設定設定檔</value>
   </data>
   <data name="SuccessfullyImportedServerViaClipboard" xml:space="preserve">
-    <value>成功從剪貼簿匯入 {0} 個伺服器</value>
+    <value>成功從剪貼簿匯入 {0} 個設定檔</value>
   </data>
   <data name="SuccessfullyImportedServerViaScan" xml:space="preserve">
     <value>掃描匯入分享链接成功</value>
@@ -388,13 +388,13 @@
     <value>註冊全域快速鍵 {0} 成功</value>
   </data>
   <data name="UngroupedServers" xml:space="preserve">
-    <value>未分組伺服器</value>
+    <value>未分組設定檔</value>
   </data>
   <data name="AllGroupServers" xml:space="preserve">
     <value>所有</value>
   </data>
   <data name="FillServerAddressCustom" xml:space="preserve">
-    <value>請瀏覽匯入伺服器設定</value>
+    <value>請瀏覽匯入設定檔設定</value>
   </data>
   <data name="Speedtesting" xml:space="preserve">
     <value>測試中...</value>
@@ -406,7 +406,7 @@
     <value>本機</value>
   </data>
   <data name="MsgServerTitle" xml:space="preserve">
-    <value>伺服器過濾，按 Enter 執行</value>
+    <value>設定檔過濾，按 Enter 執行</value>
   </data>
   <data name="menuCheckUpdate" xml:space="preserve">
     <value>檢查更新</value>
@@ -436,7 +436,7 @@
     <value>路由設定</value>
   </data>
   <data name="menuServers" xml:space="preserve">
-    <value>伺服器</value>
+    <value>設定檔</value>
   </data>
   <data name="menuSetting" xml:space="preserve">
     <value>設定</value>
@@ -487,55 +487,55 @@
     <value>掃描螢幕上的二維碼 (Ctrl+S)</value>
   </data>
   <data name="menuCopyServer" xml:space="preserve">
-    <value>複製所選伺服器</value>
+    <value>複製所選設定檔</value>
   </data>
   <data name="menuRemoveDuplicateServer" xml:space="preserve">
-    <value>移除重複的伺服器</value>
+    <value>移除重複的設定檔</value>
   </data>
   <data name="menuRemoveServer" xml:space="preserve">
-    <value>移除所選伺服器 (多選) (Delete)</value>
+    <value>移除所選設定檔 (多選) (Delete)</value>
   </data>
   <data name="menuSetDefaultServer" xml:space="preserve">
-    <value>設為活動伺服器 (Enter)</value>
+    <value>設為活動設定檔 (Enter)</value>
   </data>
   <data name="menuClearServerStatistics" xml:space="preserve">
     <value>清除所有服務統計資料</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>測試伺服器真連線延遲 (多選) (Ctrl+R)</value>
+    <value>測試設定檔真連線延遲 (多選) (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>按測試結果排序</value>
   </data>
   <data name="menuSpeedServer" xml:space="preserve">
-    <value>測試伺服器速度 (多選) (Ctrl+T)</value>
+    <value>測試設定檔速度 (多選) (Ctrl+T)</value>
   </data>
   <data name="menuTcpingServer" xml:space="preserve">
-    <value>測試伺服器延遲 Tcping (多選) (Ctrl+O)</value>
+    <value>測試設定檔延遲 Tcping (多選) (Ctrl+O)</value>
   </data>
   <data name="menuExport2ClientConfig" xml:space="preserve">
-    <value>匯出所選伺服器完整設定</value>
+    <value>匯出所選設定檔完整設定</value>
   </data>
   <data name="menuExport2ShareUrl" xml:space="preserve">
     <value>匯出分享链接至剪貼簿 (多選) (Ctrl+C)</value>
   </data>
   <data name="menuAddCustomServer" xml:space="preserve">
-    <value>新增自訂設定伺服器</value>
+    <value>新增自訂設定設定檔</value>
   </data>
   <data name="menuAddShadowsocksServer" xml:space="preserve">
-    <value>新增 [Shadowsocks] 伺服器</value>
+    <value>新增 [Shadowsocks] 設定檔</value>
   </data>
   <data name="menuAddSocksServer" xml:space="preserve">
-    <value>新增 [SOCKS] 伺服器</value>
+    <value>新增 [SOCKS] 設定檔</value>
   </data>
   <data name="menuAddTrojanServer" xml:space="preserve">
-    <value>新增 [Trojan] 伺服器</value>
+    <value>新增 [Trojan] 設定檔</value>
   </data>
   <data name="menuAddVlessServer" xml:space="preserve">
-    <value>新增 [VLESS] 伺服器</value>
+    <value>新增 [VLESS] 設定檔</value>
   </data>
   <data name="menuAddVmessServer" xml:space="preserve">
-    <value>新增 [VMess] 伺服器</value>
+    <value>新增 [VMess] 設定檔</value>
   </data>
   <data name="menuSelectAll" xml:space="preserve">
     <value>全選 (Ctrl+A)</value>
@@ -700,7 +700,7 @@
     <value>Outbound Freedom domainStrategy</value>
   </data>
   <data name="TbSettingsEnableAutoAdjustMainLvColWidth" xml:space="preserve">
-    <value>在更新訂閱後自動調整伺服器列寬</value>
+    <value>在更新訂閱後自動調整設定檔列寬</value>
   </data>
   <data name="TbSettingsEnableCheckPreReleaseUpdate" xml:space="preserve">
     <value>檢查 Pre-Release 更新 (請謹慎啟用)</value>
@@ -760,7 +760,7 @@
     <value>啟用安全協定 TLS v1.3 (訂閱/檢查更新)</value>
   </data>
   <data name="TbSettingsTrayMenuServersLimit" xml:space="preserve">
-    <value>工具列右鍵選單伺服器展示數量限制</value>
+    <value>工具列右鍵選單設定檔展示數量限制</value>
   </data>
   <data name="TbSettingsUdpEnabled" xml:space="preserve">
     <value>開啟 UDP</value>
@@ -793,7 +793,7 @@
     <value>PAC 模式</value>
   </data>
   <data name="menuShareServer" xml:space="preserve">
-    <value>分享伺服器 (Ctrl+F)</value>
+    <value>分享設定檔 (Ctrl+F)</value>
   </data>
   <data name="menuRouting" xml:space="preserve">
     <value>路由</value>
@@ -940,7 +940,7 @@
     <value>移至訂閱分組</value>
   </data>
   <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
-    <value>啟動伺服器拖放排序 (需重啟)</value>
+    <value>啟動設定檔拖放排序 (需重啟)</value>
   </data>
   <data name="TbAutoRefresh" xml:space="preserve">
     <value>自動重新整理</value>
@@ -949,10 +949,10 @@
     <value>跳過測試</value>
   </data>
   <data name="menuEditServer" xml:space="preserve">
-    <value>編輯伺服器 (Ctrl+D)</value>
+    <value>編輯設定檔 (Ctrl+D)</value>
   </data>
   <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
-    <value>主介面輕按兩下設為活動伺服器</value>
+    <value>主介面輕按兩下設為活動設定檔</value>
   </data>
   <data name="SpeedtestingCompleted" xml:space="preserve">
     <value>測試完成</value>
@@ -1057,7 +1057,7 @@
     <value>Domain</value>
   </data>
   <data name="menuAddHysteria2Server" xml:space="preserve">
-    <value>添加 [Hysteria2] 伺服器</value>
+    <value>添加 [Hysteria2] 設定檔</value>
   </data>
   <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
     <value>Hysteria 最大頻寬 (Up/Dw)</value>
@@ -1066,19 +1066,19 @@
     <value>使用系統 hosts</value>
   </data>
   <data name="menuAddTuicServer" xml:space="preserve">
-    <value>新增 [TUIC] 伺服器</value>
+    <value>新增 [TUIC] 設定檔</value>
   </data>
   <data name="TbHeaderType8" xml:space="preserve">
     <value>擁塞控制算法</value>
   </data>
   <data name="LvPrevProfile" xml:space="preserve">
-    <value>前置代理別名</value>
+    <value>前置代理設定檔別名</value>
   </data>
   <data name="LvNextProfile" xml:space="preserve">
-    <value>落地代理別名</value>
+    <value>落地代理設定檔別名</value>
   </data>
   <data name="LvPrevProfileTip" xml:space="preserve">
-    <value>請確保別名存在並且唯一</value>
+    <value>請確保設定檔別名存在並且唯一</value>
   </data>
   <data name="TbSettingsEnableExInbound" xml:space="preserve">
     <value>啟用額外偵聽連接埠</value>
@@ -1087,7 +1087,7 @@
     <value>啟用 IPv6</value>
   </data>
   <data name="menuAddWireguardServer" xml:space="preserve">
-    <value>添加 [WireGuard] 伺服器</value>
+    <value>添加 [WireGuard] 設定檔</value>
   </data>
   <data name="TbPrivateKey" xml:space="preserve">
     <value>PrivateKey</value>
@@ -1120,7 +1120,7 @@
     <value>*grpc Authority</value>
   </data>
   <data name="menuAddHttpServer" xml:space="preserve">
-    <value>新增 [HTTP] 伺服器</value>
+    <value>新增 [HTTP] 設定檔</value>
   </data>
   <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
     <value>使用 Xray 且非 Tun 模式啟用，和分組前置代理衝突</value>
@@ -1234,7 +1234,7 @@
     <value>匯出分享链接至剪貼簿 (多選) Base64 编码</value>
   </data>
   <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
-    <value>匯出所選伺服器完整設定至剪貼簿</value>
+    <value>匯出所選設定檔完整設定至剪貼簿</value>
   </data>
   <data name="menuShowOrHideMainWindow" xml:space="preserve">
     <value>顯示或隱藏主介面</value>
@@ -1336,7 +1336,7 @@
     <value>系統的 sudo 密碼</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
-    <value>密碼已加密且只儲存在本機檔案中，無密碼則每次都要輸入</value>
+    <value>輸入的密碼無法校驗，所以請確保輸入正確。如果因為輸入錯誤導致無法正常運作時，請重新啟動本應用。 密碼不會存儲，每次重啟後都需要再次輸入。</value>
   </data>
   <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
     <value>請先在 Tun 模式設定中設定 sudo 密碼</value>
@@ -1393,24 +1393,27 @@
     <value>會覆蓋端口，多組時用逗號 (,) 隔開</value>
   </data>
   <data name="menuSetDefaultMultipleServer" xml:space="preserve">
-    <value>多伺服器產生自訂配置 (多選)</value>
+    <value>多設定檔產生自訂配置 (多選)</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRandom" xml:space="preserve">
-    <value>多伺服器隨機 Xray</value>
+    <value>多設定檔隨機 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayRoundRobin" xml:space="preserve">
-    <value>多伺服器負載平衡 Xray</value>
+    <value>多設定檔負載平衡 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastPing" xml:space="preserve">
-    <value>多伺服器最低延遲 Xray</value>
+    <value>多設定檔最低延遲 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerXrayLeastLoad" xml:space="preserve">
-    <value>多伺服器最穩定 Xray</value>
+    <value>多設定檔最穩定 Xray</value>
   </data>
   <data name="menuSetDefaultMultipleServerSingBoxLeastPing" xml:space="preserve">
-    <value>多伺服器最低延遲 sing-box</value>
+    <value>多設定檔最低延遲 sing-box</value>
   </data>
   <data name="menuExportConfig" xml:space="preserve">
-    <value>匯出伺服器</value>
+    <value>匯出設定檔</value>
   </data>
-</root>
+  <data name="TbSettingsIPAPIUrl" xml:space="preserve">
+    <value>目前連接資訊測試地址</value>
+  </data>
+</root>

v2rayN/ServiceLib/Sample/dns_v2ray_normal

@@ -6,15 +6,15 @@
   "servers": [
     {
       "address": "1.1.1.1",
+      "skipFallback": true,
       "domains": [
-        "geosite:geolocation-!cn"
-      ],
-      "expectIPs": [
-        "geoip:!cn"
+        "domain:googleapis.cn",
+        "domain:gstatic.com"
       ]
     },
     {
       "address": "223.5.5.5",
+      "skipFallback": true,
       "domains": [
         "geosite:cn"
       ],
@@ -22,6 +22,7 @@
         "geoip:cn"
       ]
     },
+    "1.1.1.1",
     "8.8.8.8",
     "https://dns.google/dns-query"
   ]

v2rayN/ServiceLib/Sample/proxy_set_linux_sh

@@ -95,6 +95,21 @@ detect_desktop_environment() {
         return
     fi
     
+    if [[ "$XDG_CURRENT_DESKTOP" == *"UKUI"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"ukui"* ]]; then
+        echo "gnome"
+        return
+    fi
+
+    if [[ "$XDG_CURRENT_DESKTOP" == *"DDE"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"dde"* ]]; then
+        echo "gnome"
+        return
+    fi
+
+    if [[ "$XDG_CURRENT_DESKTOP" == *"MATE"* ]] || [[ "$XDG_SESSION_DESKTOP" == *"mate"* ]]; then
+        echo "gnome"
+        return
+    fi
+
     local KDE_ENVIRONMENTS=("KDE" "plasma")
     for ENV in "${KDE_ENVIRONMENTS[@]}"; do
         if [ "$XDG_CURRENT_DESKTOP" == "$ENV" ] || [ "$XDG_SESSION_DESKTOP" == "$ENV" ]; then

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -12,14 +12,7 @@ public class CoreConfigClashService
     {
         _config = config;
     }
-
-    /// <summary>
-    /// 生成配置文件
-    /// </summary>
-    /// <param name="node"></param>
-    /// <param name="fileName"></param>
-    /// <param name="msg"></param>
-    /// <returns></returns>
+ 
     public async Task<RetResult> GenerateClientCustomConfig(ProfileItem node, string? fileName)
     {
         var ret = new RetResult();

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -979,26 +979,6 @@ public class CoreConfigSingboxService
         try
         {
             var dnsOutbound = "dns_out";
-            if (!_config.Inbound.First().SniffingEnabled)
-            {
-                singboxConfig.route.rules.Add(new()
-                {
-                    port = [53],
-                    network = ["udp"],
-                    outbound = dnsOutbound
-                });
-            }
-
-            singboxConfig.route.rules.Insert(0, new()
-            {
-                outbound = Global.DirectTag,
-                clash_mode = ERuleMode.Direct.ToString()
-            });
-            singboxConfig.route.rules.Insert(0, new()
-            {
-                outbound = Global.ProxyTag,
-                clash_mode = ERuleMode.Global.ToString()
-            });
 
             if (_config.TunModeItem.EnableTun)
             {
@@ -1025,6 +1005,27 @@ public class CoreConfigSingboxService
                 });
             }
 
+            if (!_config.Inbound.First().SniffingEnabled)
+            {
+                singboxConfig.route.rules.Add(new()
+                {
+                    port = [53],
+                    network = ["udp"],
+                    outbound = dnsOutbound
+                });
+            }
+
+            singboxConfig.route.rules.Add(new()
+            {
+                outbound = Global.DirectTag,
+                clash_mode = ERuleMode.Direct.ToString()
+            });
+            singboxConfig.route.rules.Add(new()
+            {
+                outbound = Global.ProxyTag,
+                clash_mode = ERuleMode.Global.ToString()
+            });
+
             var routing = await ConfigHandler.GetDefaultRouting(_config);
             if (routing != null)
             {
@@ -1047,28 +1048,30 @@ public class CoreConfigSingboxService
 
     private void GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe)
     {
-        lstDnsExe = new();
-        lstDirectExe = new();
-        var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
-        foreach (var it in coreInfo)
+        var dnsExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var directExeSet = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+
+        var coreInfoResult = CoreInfoHandler.Instance.GetCoreInfo();
+
+        foreach (var coreConfig in coreInfoResult)
         {
-            if (it.CoreType == ECoreType.v2rayN)
+            if (coreConfig.CoreType == ECoreType.v2rayN)
             {
                 continue;
             }
-            foreach (var it2 in it.CoreExes)
-            {
-                if (!lstDnsExe.Contains(it2) && it.CoreType != ECoreType.sing_box)
-                {
-                    lstDnsExe.Add($"{it2}.exe");
-                }
 
-                if (!lstDirectExe.Contains(it2))
+            foreach (var baseExeName in coreConfig.CoreExes)
+            {
+                if (coreConfig.CoreType != ECoreType.sing_box)
                 {
-                    lstDirectExe.Add($"{it2}.exe");
+                    dnsExeSet.Add(Utils.GetExeName(baseExeName));
                 }
+                directExeSet.Add(Utils.GetExeName(baseExeName));
             }
         }
+
+        lstDnsExe = new List<string>(dnsExeSet);
+        lstDirectExe = new List<string>(directExeSet);
     }
 
     private async Task<int> GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules)
@@ -1087,14 +1090,11 @@ public class CoreConfigSingboxService
 
             if (item.Port.IsNotEmpty())
             {
-                if (item.Port.Contains("-"))
-                {
-                    rule.port_range = new List<string> { item.Port.Replace("-", ":") };
-                }
-                else
-                {
-                    rule.port = new List<int> { item.Port.ToInt() };
-                }
+                var portRanges = item.Port.Split(',').Where(it => it.Contains('-')).Select(it => it.Replace("-", ":")).ToList();
+                var ports = item.Port.Split(',').Where(it => !it.Contains('-')).Select(it => it.ToInt()).ToList();
+
+                rule.port_range = portRanges.Count > 0 ? portRanges : null;
+                rule.port = ports.Count > 0 ? ports : null;
             }
             if (item.Network.IsNotEmpty())
             {
@@ -1151,7 +1151,7 @@ public class CoreConfigSingboxService
             }
 
             if (!hasDomainIp
-                && (rule.port != null || rule.port_range != null || rule.protocol != null || rule.inbound != null))
+                && (rule.port != null || rule.port_range != null || rule.protocol != null || rule.inbound != null || rule.network != null))
             {
                 rules.Add(rule);
             }

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -120,7 +120,7 @@ public class CoreConfigV2rayService
                 {
                     continue;
                 }
-                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)
+                if (it.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC)
                 {
                     continue;
                 }
@@ -328,7 +328,7 @@ public class CoreConfigV2rayService
                 {
                     listen = Global.Loopback,
                     port = port,
-                    protocol = EInboundProtocol.socks.ToString(),
+                    protocol = EInboundProtocol.mixed.ToString(),
                 };
                 inbound.tag = inbound.protocol + inbound.port.ToString();
                 v2rayConfig.inbounds.Add(inbound);
@@ -403,7 +403,7 @@ public class CoreConfigV2rayService
                 tag = $"{EInboundProtocol.socks}{port}",
                 listen = Global.Loopback,
                 port = port,
-                protocol = EInboundProtocol.socks.ToString(),
+                protocol = EInboundProtocol.mixed.ToString(),
             });
 
             ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
@@ -507,7 +507,7 @@ public class CoreConfigV2rayService
         }
         inbound.tag = protocol.ToString();
         inbound.port = inItem.LocalPort + (int)protocol;
-        inbound.protocol = EInboundProtocol.socks.ToString();
+        inbound.protocol = EInboundProtocol.mixed.ToString();
         inbound.settings.udp = inItem.UdpEnabled;
         inbound.sniffing.enabled = inItem.SniffingEnabled;
         inbound.sniffing.destOverride = inItem.DestOverride;
@@ -614,6 +614,7 @@ public class CoreConfigV2rayService
                 if (rule.port.IsNotEmpty()
                     || rule.protocol?.Count > 0
                     || rule.inboundTag?.Count > 0
+                    || rule.network != null
                     )
                 {
                     var it = JsonUtils.DeepCopy(rule);
@@ -661,7 +662,7 @@ public class CoreConfigV2rayService
                         {
                             usersItem = vnextItem.users.First();
                         }
-                        //远程服务器用户ID
+                
                         usersItem.id = node.Id;
                         usersItem.alterId = node.AlterId;
                         usersItem.email = Global.UserEMail;
@@ -805,6 +806,26 @@ public class CoreConfigV2rayService
                         outbound.settings.vnext = null;
                         break;
                     }
+                case EConfigType.WireGuard:
+                    {
+                        var peer = new WireguardPeer4Ray
+                        {
+                            publicKey = node.PublicKey,
+                            endpoint = node.Address + ":" + node.Port.ToString()
+                        };
+                        var setting = new Outboundsettings4Ray
+                        {
+                            address = Utils.String2List(node.RequestHost),
+                            secretKey = node.Id,
+                            reserved = Utils.String2List(node.Path)?.Select(int.Parse).ToList(),
+                            mtu = node.ShortId.IsNullOrEmpty() ? Global.TunMtus.First() : node.ShortId.ToInt(),
+                            peers = new List<WireguardPeer4Ray> { peer }
+                        };
+                        outbound.settings = setting;
+                        outbound.settings.vnext = null;
+                        outbound.settings.servers = null;
+                        break;
+                    }
             }
 
             outbound.protocol = Global.ProtocolTypes[node.ConfigType];
@@ -1123,7 +1144,7 @@ public class CoreConfigV2rayService
                 obj["servers"] = JsonUtils.SerializeToNode(servers);
             }
 
-            // 追加至 dns 设置
+            // Append to dns settings
             if (item.UseSystemHosts)
             {
                 var systemHosts = Utils.GetSystemHosts();
@@ -1156,16 +1177,49 @@ public class CoreConfigV2rayService
     private async Task<int> GenDnsDomains(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
     {
         if (node == null)
-        { return 0; }
+        {
+            return 0;
+        }
         var servers = dns["servers"];
         if (servers != null)
         {
+            var domainList = new List<string>();
             if (Utils.IsDomain(node.Address))
+            {
+                domainList.Add(node.Address);
+            }
+            var subItem = await AppHandler.Instance.GetSubItem(node.Subid);
+            if (subItem is not null)
+            {
+                // Previous proxy
+                var prevNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.PrevProfile);
+                if (prevNode is not null
+                    && prevNode.ConfigType != EConfigType.Custom
+                    && prevNode.ConfigType != EConfigType.Hysteria2
+                    && prevNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(prevNode.Address))
+                {
+                    domainList.Add(prevNode.Address);
+                }
+
+                // Next proxy
+                var nextNode = await AppHandler.Instance.GetProfileItemViaRemarks(subItem.NextProfile);
+                if (nextNode is not null
+                    && nextNode.ConfigType != EConfigType.Custom
+                    && nextNode.ConfigType != EConfigType.Hysteria2
+                    && nextNode.ConfigType != EConfigType.TUIC
+                    && Utils.IsDomain(nextNode.Address))
+                {
+                    domainList.Add(nextNode.Address);
+                }
+            }
+            if (domainList.Count > 0)
             {
                 var dnsServer = new DnsServer4Ray()
                 {
                     address = string.IsNullOrEmpty(dNSItem?.DomainDNSAddress) ? Global.DomainDNSAddress.FirstOrDefault() : dNSItem?.DomainDNSAddress,
-                    domains = [node.Address]
+                    skipFallback = true,
+                    domains = domainList
                 };
                 servers.AsArray().Add(JsonUtils.SerializeToNode(dnsServer));
             }
@@ -1270,8 +1324,7 @@ public class CoreConfigV2rayService
             if (prevNode is not null
                 && prevNode.ConfigType != EConfigType.Custom
                 && prevNode.ConfigType != EConfigType.Hysteria2
-                && prevNode.ConfigType != EConfigType.TUIC
-                && prevNode.ConfigType != EConfigType.WireGuard)
+                && prevNode.ConfigType != EConfigType.TUIC)
             {
                 var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(prevNode, prevOutbound);
@@ -1289,8 +1342,7 @@ public class CoreConfigV2rayService
             if (nextNode is not null
                 && nextNode.ConfigType != EConfigType.Custom
                 && nextNode.ConfigType != EConfigType.Hysteria2
-                && nextNode.ConfigType != EConfigType.TUIC
-                && nextNode.ConfigType != EConfigType.WireGuard)
+                && nextNode.ConfigType != EConfigType.TUIC)
             {
                 var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
                 await GenOutbound(nextNode, nextOutbound);
@@ -1314,16 +1366,32 @@ public class CoreConfigV2rayService
 
     private async Task<int> GenBalancer(V2rayConfig v2rayConfig, EMultipleLoad multipleLoad)
     {
-        if (multipleLoad is EMultipleLoad.LeastLoad or EMultipleLoad.LeastPing)
+        if (multipleLoad == EMultipleLoad.LeastPing)
         {
             var observatory = new Observatory4Ray
             {
                 subjectSelector = [Global.ProxyTag],
                 probeUrl = AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
-                probeInterval = "3m"
+                probeInterval = "3m",
+                enableConcurrency = true,
             };
             v2rayConfig.observatory = observatory;
         }
+        else if (multipleLoad == EMultipleLoad.LeastLoad)
+        {
+            var burstObservatory = new BurstObservatory4Ray
+            {
+                subjectSelector = [Global.ProxyTag],
+                pingConfig = new()
+                {
+                    destination = AppHandler.Instance.Config.SpeedTestItem.SpeedPingTestUrl,
+                    interval = "5m",
+                    timeout = "30s",
+                    sampling = 2,
+                }
+            };
+            v2rayConfig.burstObservatory = burstObservatory;
+        }
         var strategyType = multipleLoad switch
         {
             EMultipleLoad.Random => "random",

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -196,6 +196,7 @@ public class SpeedtestService
             {
                 return false;
             }
+            await Task.Delay(1000);
 
             var downloadHandle = new DownloadService();
 
@@ -255,9 +256,13 @@ public class SpeedtestService
                 try
                 {
                     pid = await CoreHandler.Instance.LoadCoreConfigSpeedtest(it);
-                    if (pid > 0)
+                    if (pid < 0)
                     {
-                        await Task.Delay(500);
+                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
+                    }
+                    else
+                    {
+                        await Task.Delay(1000);
                         var delay = await DoRealPing(downloadHandle, it);
                         if (blSpeedTest)
                         {
@@ -271,10 +276,6 @@ public class SpeedtestService
                             }
                         }
                     }
-                    else
-                    {
-                        UpdateFunc(it.IndexId, "", ResUI.FailedToRunCore);
-                    }
                 }
                 catch (Exception ex)
                 {
@@ -357,8 +358,8 @@ public class SpeedtestService
     private List<List<ServerTestItem>> GetTestBatchItem(List<ServerTestItem> lstSelected, int pageSize)
     {
         List<List<ServerTestItem>> lstTest = new();
-        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard)).ToList();
-        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC or EConfigType.WireGuard).ToList();
+        var lst1 = lstSelected.Where(t => t.ConfigType is not (EConfigType.Hysteria2 or EConfigType.TUIC)).ToList();
+        var lst2 = lstSelected.Where(t => t.ConfigType is EConfigType.Hysteria2 or EConfigType.TUIC).ToList();
 
         for (var num = 0; num < (int)Math.Ceiling(lst1.Count * 1.0 / pageSize); num++)
         {

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -194,11 +194,11 @@ public class UpdateService
                     {
                         if (Utils.IsBase64String(result2))
                         {
-                            result += Utils.Base64Decode(result2);
+                            result += Environment.NewLine + Utils.Base64Decode(result2);
                         }
                         else
                         {
-                            result += result2;
+                            result += Environment.NewLine + result2;
                         }
                     }
                 }
@@ -243,21 +243,6 @@ public class UpdateService
         _updateFunc?.Invoke(true, string.Format(ResUI.MsgDownloadGeoFileSuccessfully, "geo"));
     }
 
-    public async Task<string> RunAvailabilityCheck()
-    {
-        var downloadHandle = new DownloadService();
-        var time = await downloadHandle.RunAvailabilityCheck(null);
-        var ip = Global.None;
-        if (time > 0)
-        {
-            var result = await downloadHandle.TryDownloadString(Global.IPAPIUrl, true, Global.IPAPIUrl);
-            var ipInfo = JsonUtils.Deserialize<IPAPIInfo>(result);
-            ip = $"({ipInfo?.country_code}) {ipInfo?.ip}";
-        }
-
-        return string.Format(ResUI.TestMeOutput, time, ip);
-    }
-
     #region CheckUpdate private
 
     private async Task<RetResult> CheckUpdateAsync(DownloadService downloadHandle, ECoreType type, bool preRelease)
@@ -500,6 +485,12 @@ public class UpdateService
 
     private async Task UpdateOtherFiles(Config config, Action<bool, string> updateFunc)
     {
+        //If it is not in China area, no update is required
+        if (config.ConstItem.GeoSourceUrl.IsNotEmpty())
+        {
+            return;
+        }
+
         _updateFunc = updateFunc;
 
         foreach (var url in Global.OtherGeoUrls)

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -174,6 +174,11 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     public void RefreshProxyGroups()
     {
+        if (_proxies == null)
+        {
+            return;
+        }
+
         var selectedName = SelectedGroup?.Name;
         _proxyGroups.Clear();
 
@@ -229,7 +234,7 @@ public class ClashProxiesViewModel : MyReactiveObject
             else
             {
                 SelectedGroup = _proxyGroups.First();
-            }
+            } 
         }
         else
         {
@@ -297,8 +302,10 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     private ProxiesItem? TryGetProxy(string name)
     {
-        if (_proxies is null)
+        if (_proxies == null)
+        {
             return null;
+        }
         _proxies.TryGetValue(name, out var proxy2);
         if (proxy2 != null)
         {

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -548,8 +548,12 @@ public class MainWindowViewModel : MyReactiveObject
 
         BlReloadEnabled = false;
 
-        await LoadCore();
-        await SysProxyHandler.UpdateSysProxy(_config, false);
+        await Task.Run(async () =>
+        {
+            await LoadCore();
+            await SysProxyHandler.UpdateSysProxy(_config, false);
+            await Task.Delay(1000);
+        });
         Locator.Current.GetService<StatusBarViewModel>()?.TestServerAvailability();
 
         _updateView?.Invoke(EViewAction.DispatcherReload, null);

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -70,6 +70,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string GeoFileSourceUrl { get; set; }
     [Reactive] public string SrsFileSourceUrl { get; set; }
     [Reactive] public string RoutingRulesSourceUrl { get; set; }
+    [Reactive] public string IPAPIUrl { get; set; }
 
     #endregion UI
 
@@ -88,7 +89,6 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public int TunMtu { get; set; }
     [Reactive] public bool TunEnableExInbound { get; set; }
     [Reactive] public bool TunEnableIPv6Address { get; set; }
-    [Reactive] public string TunLinuxSudoPassword { get; set; }
 
     #endregion Tun mode
 
@@ -100,6 +100,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public string CoreType4 { get; set; }
     [Reactive] public string CoreType5 { get; set; }
     [Reactive] public string CoreType6 { get; set; }
+    [Reactive] public string CoreType9 { get; set; }
 
     #endregion CoreType
 
@@ -186,6 +187,7 @@ public class OptionSettingViewModel : MyReactiveObject
         GeoFileSourceUrl = _config.ConstItem.GeoSourceUrl;
         SrsFileSourceUrl = _config.ConstItem.SrsSourceUrl;
         RoutingRulesSourceUrl = _config.ConstItem.RouteRulesTemplateSourceUrl;
+        IPAPIUrl = _config.SpeedTestItem.IPAPIUrl;
 
         #endregion UI
 
@@ -204,7 +206,6 @@ public class OptionSettingViewModel : MyReactiveObject
         TunMtu = _config.TunModeItem.Mtu;
         TunEnableExInbound = _config.TunModeItem.EnableExInbound;
         TunEnableIPv6Address = _config.TunModeItem.EnableIPv6Address;
-        TunLinuxSudoPassword = _config.TunModeItem.LinuxSudoPwd;
 
         #endregion Tun mode
 
@@ -259,6 +260,10 @@ public class OptionSettingViewModel : MyReactiveObject
                 case 6:
                     CoreType6 = type;
                     break;
+
+                case 9:
+                    CoreType9 = type;
+                    break;
             }
         });
         await Task.CompletedTask;
@@ -341,6 +346,7 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.ConstItem.GeoSourceUrl = GeoFileSourceUrl;
         _config.ConstItem.SrsSourceUrl = SrsFileSourceUrl;
         _config.ConstItem.RouteRulesTemplateSourceUrl = RoutingRulesSourceUrl;
+        _config.SpeedTestItem.IPAPIUrl = IPAPIUrl;
 
         //systemProxy
         _config.SystemProxyItem.SystemProxyExceptions = systemProxyExceptions;
@@ -353,10 +359,6 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.TunModeItem.Mtu = TunMtu;
         _config.TunModeItem.EnableExInbound = TunEnableExInbound;
         _config.TunModeItem.EnableIPv6Address = TunEnableIPv6Address;
-        if (TunLinuxSudoPassword != _config.TunModeItem.LinuxSudoPwd)
-        {
-            _config.TunModeItem.LinuxSudoPwd = DesUtils.Encrypt(TunLinuxSudoPassword);
-        }
 
         //coreType
         await SaveCoreType();
@@ -407,6 +409,10 @@ public class OptionSettingViewModel : MyReactiveObject
                     type = CoreType6;
                     break;
 
+                case 9:
+                    type = CoreType9;
+                    break;
+
                 default:
                     continue;
             }

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -318,7 +318,10 @@ public class StatusBarViewModel : MyReactiveObject
 
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);
 
-        var msg = await (new UpdateService()).RunAvailabilityCheck();
+        var msg = await Task.Run(async () =>
+        {
+            return await ConnectionHandler.Instance.RunAvailabilityCheck();
+        });
 
         NoticeHandler.Instance.SendMessageEx(msg);
         _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
@@ -433,11 +436,13 @@ public class StatusBarViewModel : MyReactiveObject
                     Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
                     return;
                 }
-                else if (Utils.IsOSX())
+                else
                 {
-                    _config.TunModeItem.EnableTun = false;
-                    NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
-                    return;
+                    if (await _updateView?.Invoke(EViewAction.PasswordInput, null) == false)
+                    {
+                        _config.TunModeItem.EnableTun = false;
+                        return;
+                    }
                 }
             }
             await ConfigHandler.SaveConfig(_config);
@@ -449,15 +454,15 @@ public class StatusBarViewModel : MyReactiveObject
     {
         if (Utils.IsWindows())
         {
-            return AppHandler.Instance.IsAdministrator;
+            return Utils.IsAdministrator();
         }
         else if (Utils.IsLinux())
         {
-            return _config.TunModeItem.LinuxSudoPwd.IsNotEmpty();
+            return AppHandler.Instance.LinuxSudoPwd.IsNotEmpty();
         }
         else if (Utils.IsOSX())
         {
-            return _config.TunModeItem.LinuxSudoPwd.IsNotEmpty();
+            return AppHandler.Instance.LinuxSudoPwd.IsNotEmpty();
         }
         return false;
     }
@@ -495,8 +500,16 @@ public class StatusBarViewModel : MyReactiveObject
     {
         try
         {
-            SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
-            SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.DirectUp), Utils.HumanFy(update.DirectDown));
+            if (_config.IsRunningCore(ECoreType.sing_box))
+            {
+                SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, EInboundProtocol.mixed, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
+                SpeedDirectDisplay = string.Empty;
+            }
+            else
+            {
+                SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.ProxyUp), Utils.HumanFy(update.ProxyDown));
+                SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.DirectUp), Utils.HumanFy(update.DirectDown));
+            }
         }
         catch
         {

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -43,7 +43,7 @@ public partial class App : Application
     {
         if (e.ExceptionObject != null)
         {
-            Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
+            Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject);
         }
     }
 

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -131,7 +131,6 @@ public partial class AddServerWindow : ReactiveWindow<AddServerViewModel>
                 sepa2.IsVisible = false;
                 gridTransport.IsVisible = false;
                 gridTls.IsVisible = false;
-                cmbCoreType.IsEnabled = false;
 
                 break;
         }

v2rayN/v2rayN.Desktop/Views/ClashConnectionsView.axaml.cs

@@ -52,9 +52,16 @@ public partial class ClashConnectionsView : ReactiveUserControl<ClashConnections
 
     private void AutofitColumnWidth()
     {
-        foreach (var it in lstConnections.Columns)
+        try
         {
-            it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            foreach (var it in lstConnections.Columns)
+            {
+                it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ClashConnectionsView", ex);
         }
     }
 

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -34,7 +34,7 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <TabControl HorizontalContentAlignment="Left">
+        <TabControl HorizontalContentAlignment="Stretch">
             <TabItem Header="{x:Static resx:ResUI.TbSettingsCoreDns}">
                 <DockPanel Margin="{StaticResource Margin8}">
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
@@ -90,16 +90,18 @@
                         </StackPanel>
                     </WrapPanel>
 
-                    <Grid Margin="{StaticResource Margin4}">
+                    <HeaderedContentControl
+                        Margin="{StaticResource Margin4}"
+                        BorderBrush="Gray"
+                        BorderThickness="1"
+                        Header="HTTP/SOCKS">
                         <TextBox
-                            x:Name="txtnormalDNS"
-                            Margin="{StaticResource Margin4}"
+                            Name="txtnormalDNS"
                             VerticalAlignment="Stretch"
-                            BorderThickness="1"
                             Classes="TextArea"
-                            TextWrapping="Wrap"
-                            Watermark="HTTP/SOCKS" />
-                    </Grid>
+                            MinLines="10"
+                            TextWrapping="Wrap" />
+                    </HeaderedContentControl>
                 </DockPanel>
             </TabItem>
 
@@ -144,31 +146,34 @@
 
                     <Grid Margin="{StaticResource Margin4}" ColumnDefinitions="*,10,*">
 
-                        <TextBox
-                            x:Name="txtnormalDNS2"
+                        <HeaderedContentControl
                             Grid.Column="0"
-                            Width="400"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                            BorderBrush="Gray"
                             BorderThickness="1"
-                            Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
-                            TextWrapping="Wrap"
-                            Watermark="HTTP/SOCKS" />
+                            Header="HTTP/SOCKS">
+                            <TextBox
+                                Name="txtnormalDNS2"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
 
                         <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" />
 
-                        <TextBox
-                            x:Name="txttunDNS2"
+                        <HeaderedContentControl
                             Grid.Column="2"
-                            Width="400"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Stretch"
+                            BorderBrush="Gray"
                             BorderThickness="1"
-                            Classes="TextArea"
-                            Margin="{StaticResource Margin4}"
-                            TextWrapping="Wrap"
-                            Watermark="{x:Static resx:ResUI.TbSettingsTunMode}" />
+                            Header="{x:Static resx:ResUI.TbSettingsTunMode}">
+                            <TextBox
+                                Name="txttunDNS2"
+                                VerticalAlignment="Stretch"
+                                Classes="TextArea"
+                                MinLines="10"
+                                TextWrapping="Wrap" />
+                        </HeaderedContentControl>
+
                     </Grid>
                 </DockPanel>
             </TabItem>

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -39,13 +39,13 @@
                         <MenuItem x:Name="menuAddVmessServer" Header="{x:Static resx:ResUI.menuAddVmessServer}" />
                         <MenuItem x:Name="menuAddVlessServer" Header="{x:Static resx:ResUI.menuAddVlessServer}" />
                         <MenuItem x:Name="menuAddShadowsocksServer" Header="{x:Static resx:ResUI.menuAddShadowsocksServer}" />
+                        <MenuItem x:Name="menuAddTrojanServer" Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
+                        <MenuItem x:Name="menuAddWireguardServer" Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
                         <MenuItem x:Name="menuAddSocksServer" Header="{x:Static resx:ResUI.menuAddSocksServer}" />
                         <MenuItem x:Name="menuAddHttpServer" Header="{x:Static resx:ResUI.menuAddHttpServer}" />
-                        <MenuItem x:Name="menuAddTrojanServer" Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
                         <Separator />
                         <MenuItem x:Name="menuAddHysteria2Server" Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
                         <MenuItem x:Name="menuAddTuicServer" Header="{x:Static resx:ResUI.menuAddTuicServer}" />
-                        <MenuItem x:Name="menuAddWireguardServer" Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
                     </MenuItem>
 
                     <MenuItem Padding="8,0">

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -29,7 +29,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
         InitializeComponent();
 
         _config = AppHandler.Instance.Config;
-        _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.BottomRight };
+        _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.TopRight };
 
         this.KeyDown += MainWindow_KeyDown;
         menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
@@ -143,7 +143,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
         }
         else
         {
-            if (AppHandler.Instance.IsAdministrator)
+            if (Utils.IsAdministrator())
             {
                 this.Title = $"{Utils.GetVersion()} - {ResUI.TbSettingsLinuxSudoPasswordNotSudoRunApp}";
                 NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordNotSudoRunApp);
@@ -388,7 +388,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
 
     private async void MenuClose_Click(object? sender, RoutedEventArgs e)
     {
-        if (await UI.ShowYesNo(this, ResUI.menuExitTips) == ButtonResult.No)
+        if (await UI.ShowYesNo(this, ResUI.menuExitTips) != ButtonResult.Yes)
         {
             return;
         }

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -343,7 +343,7 @@
                     <Grid
                         Margin="{StaticResource Margin4}"
                         ColumnDefinitions="Auto,Auto,*"
-                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                        RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
                         <TextBlock
                             x:Name="tbAutoRun"
@@ -655,6 +655,20 @@
                             VerticalAlignment="Center"
                             Text="{x:Static resx:ResUI.TbSettingsChinaUserTip}"
                             TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="25"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin4}"
+                            VerticalAlignment="Center"
+                            Text="{x:Static resx:ResUI.TbSettingsIPAPIUrl}" />
+                        <ComboBox
+                            x:Name="cmbIPAPIUrl"
+                            Grid.Row="25"
+                            Grid.Column="1"
+                            Width="300"
+                            Margin="{StaticResource Margin4}" />
+
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -784,28 +798,6 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
-                    <TextBlock
-                        x:Name="labLinuxSudoPassword"
-                        Grid.Row="7"
-                        Grid.Column="0"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPassword}" />
-                    <TextBox
-                        x:Name="txtLinuxSudoPassword"
-                        Grid.Row="7"
-                        Grid.Column="1"
-                        Width="200"
-                        Margin="{StaticResource Margin4}"
-                        HorizontalAlignment="Left" />
-                    <TextBlock
-                        x:Name="labLinuxSudoPasswordTip"
-                        Grid.Row="7"
-                        Grid.Column="2"
-                        Margin="{StaticResource Margin4}"
-                        VerticalAlignment="Center"
-                        Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPasswordTip}"
-                        TextWrapping="Wrap" />
                 </Grid>
             </TabItem>
 
@@ -813,7 +805,7 @@
                 <Grid
                     Margin="{StaticResource Margin4}"
                     ColumnDefinitions="Auto,Auto"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
                     <TextBlock
                         Grid.Row="1"
                         Grid.Column="0"
@@ -891,6 +883,19 @@
                         Grid.Column="1"
                         Width="200"
                         Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="Wireguard" />
+                    <ComboBox
+                        x:Name="cmbCoreType9"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}" />
                 </Grid>
             </TabItem>
         </TabControl>

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -64,6 +64,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             cmbCoreType4.Items.Add(it);
             cmbCoreType5.Items.Add(it);
             cmbCoreType6.Items.Add(it);
+            cmbCoreType9.Items.Add(it);
         });
 
         for (var i = 2; i <= 8; i++)
@@ -91,6 +92,10 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
         {
             cmbRoutingRulesSourceUrl.Items.Add(it);
         });
+        Global.IPAPIUrls.ForEach(it =>
+        {
+            cmbIPAPIUrl.Items.Add(it);
+        });
         foreach (EGirdOrientation it in Enum.GetValues(typeof(EGirdOrientation)))
         {
             cmbMainGirdOrientation.Items.Add(it.ToString());
@@ -142,6 +147,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.RoutingRulesSourceUrl, v => v.cmbRoutingRulesSourceUrl.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.IPAPIUrl, v => v.cmbIPAPIUrl.SelectedValue).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.notProxyLocalAddress, v => v.tognotProxyLocalAddress.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.SelectedValue).DisposeWith(disposables);
@@ -152,7 +158,6 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.TunLinuxSudoPassword, v => v.txtLinuxSudoPassword.Text).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.SelectedValue).DisposeWith(disposables);
@@ -160,6 +165,7 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
             this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.CoreType9, v => v.cmbCoreType9.SelectedValue).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });
@@ -168,10 +174,6 @@ public partial class OptionSettingWindow : ReactiveWindow<OptionSettingViewModel
         {
             txbSettingsExceptionTip2.IsVisible = false;
 
-            txtLinuxSudoPassword.IsVisible = false;
-            labLinuxSudoPassword.IsVisible = false;
-            labLinuxSudoPasswordTip.IsVisible = false;
-
             labHide2TrayWhenClose.IsVisible = false;
             togHide2TrayWhenClose.IsVisible = false;
         }

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -138,7 +138,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
                 break;
 
             case EViewAction.ShowYesNo:
-                if (await UI.ShowYesNo(_window, ResUI.RemoveServer) == ButtonResult.No)
+                if (await UI.ShowYesNo(_window, ResUI.RemoveServer) != ButtonResult.Yes)
                 {
                     return false;
                 }
@@ -215,7 +215,7 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
             await ViewModel.RefreshServersBiz();
         }
 
-        if (lstProfiles.SelectedIndex > 0)
+        if (lstProfiles.SelectedIndex >= 0)
         {
             lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, null);
         }
@@ -345,9 +345,34 @@ public partial class ProfilesView : ReactiveUserControl<ProfilesViewModel>
 
     private void AutofitColumnWidth()
     {
-        foreach (var it in lstProfiles.Columns)
+        try
         {
-            it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            //First scroll horizontally to the initial position to avoid the control crash bug
+            if (lstProfiles.SelectedIndex >= 0)
+            {
+                lstProfiles.ScrollIntoView(lstProfiles.SelectedItem, lstProfiles.Columns[0]);
+            }
+            else
+            {
+                var model = lstProfiles.ItemsSource.Cast<ProfileItemModel>();
+                if (model.Any())
+                {
+                    lstProfiles.ScrollIntoView(model.First(), lstProfiles.Columns[0]);
+                }
+                else
+                {
+                    return;
+                }
+            }
+
+            foreach (var it in lstProfiles.Columns)
+            {
+                it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ProfilesView", ex);
         }
     }
 

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml.cs

@@ -80,14 +80,14 @@ public partial class RoutingRuleSettingWindow : ReactiveWindow<RoutingRuleSettin
                 break;
 
             case EViewAction.ShowYesNo:
-                if (await UI.ShowYesNo(this, ResUI.RemoveServer) == ButtonResult.No)
+                if (await UI.ShowYesNo(this, ResUI.RemoveServer) != ButtonResult.Yes)
                 {
                     return false;
                 }
                 break;
 
             case EViewAction.AddBatchRoutingRulesYesNo:
-                if (await UI.ShowYesNo(this, ResUI.AddBatchRoutingRulesYesNo) == ButtonResult.No)
+                if (await UI.ShowYesNo(this, ResUI.AddBatchRoutingRulesYesNo) != ButtonResult.Yes)
                 {
                     return false;
                 }

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -24,28 +24,11 @@
                 <MenuItem x:Name="menuRoutingAdvancedAdd2" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
                 <MenuItem x:Name="menuRoutingAdvancedImportRules2" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
             </Menu>
-
-            <TextBlock VerticalAlignment="Center">
-                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
-                </HyperlinkButton>
-            </TextBlock>
-            <ComboBox x:Name="cmbdomainStrategy" Width="110" />
-            <Separator />
-            <TextBlock VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox x:Name="cmbdomainMatcher" Width="60" />
-            <Separator />
-            <TextBlock VerticalAlignment="Center">
-                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
-                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
-                </HyperlinkButton>
-            </TextBlock>
-            <ComboBox x:Name="cmbdomainStrategy4Singbox" Width="100" />
         </StackPanel>
 
         <StackPanel
-            HorizontalAlignment="Right"
             Margin="{StaticResource Margin4}"
+            HorizontalAlignment="Right"
             DockPanel.Dock="Bottom"
             Orientation="Horizontal">
             <StackPanel
@@ -69,58 +52,112 @@
                 IsCancel="True" />
         </StackPanel>
 
-        <DockPanel>
-            <TabControl x:Name="tabAdvanced">
-                <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
-                    <DataGrid
-                        x:Name="lstRoutings"
-                        AutoGenerateColumns="False"
-                        BorderThickness="1"
-                        CanUserResizeColumns="True"
-                        GridLinesVisibility="All"
-                        HeadersVisibility="Column"
-                        IsReadOnly="True"
-                        ItemsSource="{Binding RoutingItems}">
-                        <DataGrid.KeyBindings>
-                            <KeyBinding Command="{Binding RoutingAdvancedSetDefaultCmd}" Gesture="Enter" />
-                        </DataGrid.KeyBindings>
-                        <DataGrid.ContextMenu>
-                            <ContextMenu>
-                                <MenuItem x:Name="menuRoutingAdvancedAdd" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
-                                <MenuItem x:Name="menuRoutingAdvancedRemove" Header="{x:Static resx:ResUI.menuRoutingAdvancedRemove}" />
-                                <MenuItem x:Name="menuRoutingAdvancedSelectAll" Header="{x:Static resx:ResUI.menuSelectAll}" />
-                                <MenuItem x:Name="menuRoutingAdvancedSetDefault" Header="{x:Static resx:ResUI.menuRoutingAdvancedSetDefault}" />
-                                <Separator />
-                                <MenuItem x:Name="menuRoutingAdvancedImportRules" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
-                            </ContextMenu>
-                        </DataGrid.ContextMenu>
+        <Grid
+            Margin="{StaticResource Margin4}"
+            ColumnDefinitions="Auto,Auto"
+            DockPanel.Dock="Top"
+            RowDefinitions="Auto,Auto,Auto">
 
-                        <DataGrid.Columns>
-                            <DataGridCheckBoxColumn Width="40" Binding="{Binding IsActive}" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding Remarks}"
-                                Header="{x:Static resx:ResUI.LvRemarks}" />
-                            <DataGridTextColumn
-                                Width="60"
-                                Binding="{Binding RuleNum}"
-                                Header="{x:Static resx:ResUI.LvCount}" />
-                            <DataGridTextColumn
-                                Width="60"
-                                Binding="{Binding Sort}"
-                                Header="{x:Static resx:ResUI.LvSort}" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding Url}"
-                                Header="{x:Static resx:ResUI.LvUrl}" />
-                            <DataGridTextColumn
-                                Width="300"
-                                Binding="{Binding CustomIcon}"
-                                Header="{x:Static resx:ResUI.LvCustomIcon}" />
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </TabItem>
-            </TabControl>
-        </DockPanel>
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center">
+                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                </HyperlinkButton>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy"
+                Grid.Row="0"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+            <ComboBox
+                x:Name="cmbdomainMatcher"
+                Grid.Row="1"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}" />
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center">
+                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                </HyperlinkButton>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy4Singbox"
+                Grid.Row="2"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center" />
+        </Grid>
+
+        <TabControl x:Name="tabAdvanced">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
+                <DataGrid
+                    x:Name="lstRoutings"
+                    AutoGenerateColumns="False"
+                    BorderThickness="1"
+                    CanUserResizeColumns="True"
+                    GridLinesVisibility="All"
+                    HeadersVisibility="Column"
+                    IsReadOnly="True"
+                    ItemsSource="{Binding RoutingItems}">
+                    <DataGrid.KeyBindings>
+                        <KeyBinding Command="{Binding RoutingAdvancedSetDefaultCmd}" Gesture="Enter" />
+                    </DataGrid.KeyBindings>
+                    <DataGrid.ContextMenu>
+                        <ContextMenu>
+                            <MenuItem x:Name="menuRoutingAdvancedAdd" Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
+                            <MenuItem x:Name="menuRoutingAdvancedRemove" Header="{x:Static resx:ResUI.menuRoutingAdvancedRemove}" />
+                            <MenuItem x:Name="menuRoutingAdvancedSelectAll" Header="{x:Static resx:ResUI.menuSelectAll}" />
+                            <MenuItem x:Name="menuRoutingAdvancedSetDefault" Header="{x:Static resx:ResUI.menuRoutingAdvancedSetDefault}" />
+                            <Separator />
+                            <MenuItem x:Name="menuRoutingAdvancedImportRules" Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
+                        </ContextMenu>
+                    </DataGrid.ContextMenu>
+
+                    <DataGrid.Columns>
+                        <DataGridCheckBoxColumn Width="40" Binding="{Binding IsActive}" />
+                        <DataGridTextColumn
+                            Width="*"
+                            Binding="{Binding Remarks}"
+                            Header="{x:Static resx:ResUI.LvRemarks}" />
+                        <DataGridTextColumn
+                            Width="60"
+                            Binding="{Binding RuleNum}"
+                            Header="{x:Static resx:ResUI.LvCount}" />
+                        <DataGridTextColumn
+                            Width="60"
+                            Binding="{Binding Sort}"
+                            Header="{x:Static resx:ResUI.LvSort}" />
+                        <DataGridTextColumn
+                            Width="*"
+                            Binding="{Binding Url}"
+                            Header="{x:Static resx:ResUI.LvUrl}" />
+                        <DataGridTextColumn
+                            Width="300"
+                            Binding="{Binding CustomIcon}"
+                            Header="{x:Static resx:ResUI.LvCustomIcon}" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </TabItem>
+        </TabControl>
     </DockPanel>
 </Window>

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs

@@ -68,7 +68,7 @@ public partial class RoutingSettingWindow : ReactiveWindow<RoutingSettingViewMod
                 break;
 
             case EViewAction.ShowYesNo:
-                if (await UI.ShowYesNo(this, ResUI.RemoveRules) == ButtonResult.No)
+                if (await UI.ShowYesNo(this, ResUI.RemoveRules) != ButtonResult.Yes)
                 {
                     return false;
                 }

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
+using DialogHostAvalonia;
 using ReactiveUI;
 using Splat;
 using v2rayN.Desktop.Common;
@@ -81,6 +82,10 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
                     return false;
                 await AvaUtils.SetClipboardData(this, (string)obj);
                 break;
+
+            case EViewAction.PasswordInput:
+                return await PasswordInputAsync();
+                break;
         }
         return await Task.FromResult(true);
     }
@@ -96,6 +101,20 @@ public partial class StatusBarView : ReactiveUserControl<StatusBarViewModel>
         }
     }
 
+    private async Task<bool> PasswordInputAsync()
+    {
+        var dialog = new SudoPasswordInputView();
+        var obj = await DialogHost.Show(dialog);
+        if (obj == null)
+        {
+            togEnableTun.IsChecked = false;
+            return false;
+        }
+
+        AppHandler.Instance.LinuxSudoPwd = obj.ToString() ?? string.Empty;
+        return true;
+    }
+
     private void TxtRunningServerDisplay_Tapped(object? sender, Avalonia.Input.TappedEventArgs e)
     {
         ViewModel?.TestServerAvailability();

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml.cs

@@ -45,7 +45,7 @@ public partial class SubSettingWindow : ReactiveWindow<SubSettingViewModel>
                 break;
 
             case EViewAction.ShowYesNo:
-                if (await UI.ShowYesNo(this, ResUI.RemoveServer) == ButtonResult.No)
+                if (await UI.ShowYesNo(this, ResUI.RemoveServer) != ButtonResult.Yes)
                 {
                     return false;
                 }

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml

@@ -0,0 +1,70 @@
+<UserControl
+    x:Class="v2rayN.Desktop.Views.SudoPasswordInputView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
+    d:DesignHeight="200"
+    d:DesignWidth="400"
+    mc:Ignorable="d">
+    <DockPanel Margin="{StaticResource Margin8}">
+
+        <Border
+            Margin="{StaticResource Margin4}"
+            VerticalAlignment="Center"
+            DockPanel.Dock="Bottom"
+            Theme="{DynamicResource CardBorder}">
+
+            <StackPanel
+                Margin="{StaticResource Margin4}"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    x:Name="btnSave"
+                    Width="100"
+                    Content="{x:Static resx:ResUI.TbConfirm}"
+                    Cursor="Hand"
+                    IsDefault="True" />
+                <Button
+                    x:Name="btnCancel"
+                    Width="100"
+                    Margin="{StaticResource MarginLr8}"
+                    Content="{x:Static resx:ResUI.TbCancel}"
+                    Cursor="Hand"
+                    IsCancel="True" />
+            </StackPanel>
+        </Border>
+
+        <Border
+            Margin="{StaticResource Margin4}"
+            VerticalAlignment="Center"
+            Theme="{DynamicResource CardBorder}">
+
+            <Grid ColumnDefinitions="Auto,400" RowDefinitions="Auto,Auto,Auto">
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPassword}" />
+
+                <TextBox
+                    x:Name="txtPassword"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
+                    Classes="revealPasswordButton"
+                    Focusable="True" />
+
+                <TextBlock
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="{StaticResource Margin4}"
+                    VerticalAlignment="Center"
+                    Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPasswordTip}"
+                    TextWrapping="Wrap" />
+            </Grid>
+        </Border>
+    </DockPanel>
+</UserControl>

v2rayN/v2rayN.Desktop/Views/SudoPasswordInputView.axaml.cs

@@ -0,0 +1,33 @@
+using Avalonia.Controls;
+using Avalonia.Threading;
+using DialogHostAvalonia;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class SudoPasswordInputView : UserControl
+{
+    public SudoPasswordInputView()
+    {
+        InitializeComponent();
+
+        this.Loaded += (s, e) => txtPassword.Focus();
+
+        btnSave.Click += (_, _) =>
+        {
+            if (string.IsNullOrEmpty(txtPassword.Text))
+            {
+                txtPassword.Focus();
+                return;
+            }
+            Dispatcher.UIThread.Post(() =>
+            {
+                DialogHost.Close(null, txtPassword.Text);
+            });
+        };
+
+        btnCancel.Click += (_, _) =>
+        {
+            DialogHost.Close(null);
+        };
+    }
+}

v2rayN/v2rayN/App.xaml

@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>

v2rayN/v2rayN/App.xaml.cs

@@ -19,7 +19,7 @@ public partial class App : Application
     }
 
     /// <summary>
-    /// 只打开一个进程
+    /// Open only one process
     /// </summary>
     /// <param name="e"></param>
     protected override void OnStartup(StartupEventArgs e)
@@ -56,7 +56,7 @@ public partial class App : Application
     {
         if (e.ExceptionObject != null)
         {
-            Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject!);
+            Logging.SaveLog("CurrentDomain_UnhandledException", (Exception)e.ExceptionObject);
         }
     }
 

v2rayN/v2rayN/Common/WindowsUtils.cs

@@ -12,10 +12,6 @@ internal static class WindowsUtils
 {
     private static readonly string _tag = "WindowsUtils";
 
-    /// <summary>
-    /// 获取剪贴板数
-    /// </summary>
-    /// <returns></returns>
     public static string? GetClipboardData()
     {
         var strData = string.Empty;
@@ -35,10 +31,6 @@ internal static class WindowsUtils
         return strData;
     }
 
-    /// <summary>
-    /// 拷贝至剪贴板
-    /// </summary>
-    /// <returns></returns>
     public static void SetClipboardData(string strData)
     {
         try

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -125,7 +125,6 @@ public partial class AddServerWindow
                 sepa2.Visibility = Visibility.Collapsed;
                 gridTransport.Visibility = Visibility.Collapsed;
                 gridTls.Visibility = Visibility.Collapsed;
-                cmbCoreType.IsEnabled = false;
 
                 break;
         }

v2rayN/v2rayN/Views/ClashConnectionsView.xaml.cs

@@ -55,9 +55,16 @@ public partial class ClashConnectionsView
 
     private void AutofitColumnWidth()
     {
-        foreach (var it in lstConnections.Columns)
+        try
         {
-            it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            foreach (var it in lstConnections.Columns)
+            {
+                it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ClashConnectionsView", ex);
         }
     }
 

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
-    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     xmlns:view="clr-namespace:v2rayN.Views"
+    xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="v2rayN"
     Width="900"
     Height="700"
@@ -40,9 +40,10 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         ClipToBounds="True"
-                        Style="{StaticResource MaterialDesignToolBar}">
+                        Style="{StaticResource MaterialDesignToolBar}"
+                        KeyboardNavigation.TabNavigation="Continue">
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0">
+                            <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -81,6 +82,14 @@
                                     x:Name="menuAddShadowsocksServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddShadowsocksServer}" />
+                                <MenuItem
+                                    x:Name="menuAddTrojanServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
+                                <MenuItem
+                                    x:Name="menuAddWireguardServer"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
                                 <MenuItem
                                     x:Name="menuAddSocksServer"
                                     Height="{StaticResource MenuItemHeight}"
@@ -89,10 +98,6 @@
                                     x:Name="menuAddHttpServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddHttpServer}" />
-                                <MenuItem
-                                    x:Name="menuAddTrojanServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
                                 <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuAddHysteria2Server"
@@ -102,15 +107,11 @@
                                     x:Name="menuAddTuicServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddTuicServer}" />
-                                <MenuItem
-                                    x:Name="menuAddWireguardServer"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuAddWireguardServer}" />
                             </MenuItem>
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0">
+                            <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -145,7 +146,7 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Padding="8,0">
+                            <MenuItem Padding="8,0" AutomationProperties.Name="{x:Static resx:ResUI.menuSetting}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -211,7 +212,10 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuReload" Padding="8,0">
+                            <MenuItem
+                                x:Name="menuReload"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuReload}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -225,7 +229,10 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem Name="menuCheckUpdate" Padding="8,0">
+                            <MenuItem
+                                Name="menuCheckUpdate"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuCheckUpdate}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -239,7 +246,10 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuHelp" Padding="8,0">
+                            <MenuItem
+                                x:Name="menuHelp"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuHelp}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -253,7 +263,10 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuPromotion" Padding="8,0">
+                            <MenuItem
+                                x:Name="menuPromotion"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuPromotion}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon
@@ -267,7 +280,10 @@
                         </Menu>
                         <Separator />
                         <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                            <MenuItem x:Name="menuClose" Padding="8,0">
+                            <MenuItem
+                                x:Name="menuClose"
+                                Padding="8,0"
+                                AutomationProperties.Name="{x:Static resx:ResUI.menuClose}">
                                 <MenuItem.Header>
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -132,7 +132,7 @@ public partial class MainWindow
             }
         });
 
-        this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
+        this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
 
         if (!_config.GuiItem.EnableHWA)
         {

v2rayN/v2rayN/Views/MsgView.xaml

@@ -26,6 +26,7 @@
                 Margin="{StaticResource MarginLeftRight8}"
                 materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgFilterTitle}"
                 materialDesign:TextFieldAssist.HasClearButton="True"
+                AutomationProperties.Name="{x:Static resx:ResUI.MsgFilterTitle}"
                 IsEditable="True"
                 Style="{StaticResource DefComboBox}" />
             <Button
@@ -33,6 +34,7 @@
                 Width="24"
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
+                AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewCopyAll}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewCopyAll}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentCopy" />
@@ -42,6 +44,7 @@
                 Width="24"
                 Height="24"
                 Margin="{StaticResource MarginLeftRight8}"
+                AutomationProperties.Name="{x:Static resx:ResUI.menuMsgViewClear}"
                 Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                 ToolTip="{x:Static resx:ResUI.menuMsgViewClear}">
                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Delete" />
@@ -55,6 +58,7 @@
                 x:Name="togAutoRefresh"
                 Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left"
+                AutomationProperties.Name="{x:Static resx:ResUI.TbAutoRefresh}"
                 IsChecked="True" />
             <TextBlock
                 Margin="{StaticResource MarginLeftRight8}"
@@ -65,6 +69,7 @@
                 x:Name="togScrollToEnd"
                 Margin="{StaticResource MarginLeftRight8}"
                 HorizontalAlignment="Left"
+                AutomationProperties.Name="{x:Static resx:ResUI.TbAutoScrollToEnd}"
                 IsChecked="True" />
         </WrapPanel>
         <TextBox
@@ -103,4 +108,4 @@
             </TextBox.ContextMenu>
         </TextBox>
     </DockPanel>
-</reactiveui:ReactiveUserControl>
+</reactiveui:ReactiveUserControl>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -552,6 +552,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -942,6 +943,22 @@
                             Style="{StaticResource ToolbarTextBlock}"
                             Text="{x:Static resx:ResUI.TbSettingsChinaUserTip}"
                             TextWrapping="Wrap" />
+
+                        <TextBlock
+                            Grid.Row="25"
+                            Grid.Column="0"
+                            Margin="{StaticResource Margin8}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsIPAPIUrl}" />
+                        <ComboBox
+                            x:Name="cmbIPAPIUrl"
+                            Grid.Row="25"
+                            Grid.Column="1"
+                            Width="300"
+                            Margin="{StaticResource Margin8}"
+                            IsEditable="True"
+                            Style="{StaticResource DefComboBox}" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -1098,6 +1115,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -1192,6 +1210,21 @@
                         Width="200"
                         Margin="{StaticResource Margin8}"
                         Style="{StaticResource DefComboBox}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="Wireguard" />
+                    <ComboBox
+                        x:Name="cmbCoreType9"
+                        Grid.Row="7"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin8}"
+                        Style="{StaticResource DefComboBox}" />
                 </Grid>
             </TabItem>
         </TabControl>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -66,6 +66,7 @@ public partial class OptionSettingWindow
             cmbCoreType4.Items.Add(it);
             cmbCoreType5.Items.Add(it);
             cmbCoreType6.Items.Add(it);
+            cmbCoreType9.Items.Add(it);
         });
 
         for (var i = 2; i <= 8; i++)
@@ -100,6 +101,10 @@ public partial class OptionSettingWindow
         {
             cmbRoutingRulesSourceUrl.Items.Add(it);
         });
+        Global.IPAPIUrls.ForEach(it =>
+        {
+            cmbIPAPIUrl.Items.Add(it);
+        });
         foreach (EGirdOrientation it in Enum.GetValues(typeof(EGirdOrientation)))
         {
             cmbMainGirdOrientation.Items.Add(it.ToString());
@@ -161,6 +166,7 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.RoutingRulesSourceUrl, v => v.cmbRoutingRulesSourceUrl.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.IPAPIUrl, v => v.cmbIPAPIUrl.Text).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.notProxyLocalAddress, v => v.tognotProxyLocalAddress.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);
@@ -178,6 +184,7 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.CoreType4, v => v.cmbCoreType4.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType5, v => v.cmbCoreType5.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CoreType6, v => v.cmbCoreType6.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.CoreType9, v => v.cmbCoreType9.Text).DisposeWith(disposables);
 
             this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
         });

v2rayN/v2rayN/Views/ProfilesView.xaml

@@ -25,6 +25,7 @@
                 <ListBox
                     x:Name="lstGroup"
                     MaxHeight="200"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubscription}"
                     FontSize="{DynamicResource StdFontSize}"
                     ItemContainerStyle="{StaticResource MyChipListBoxItem}"
                     Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
@@ -40,6 +41,7 @@
                     Width="30"
                     Height="30"
                     Margin="{StaticResource MarginLeftRight4}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubEdit}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubEdit}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Edit" />
@@ -49,6 +51,7 @@
                     Width="30"
                     Height="30"
                     Margin="{StaticResource MarginLeftRight4}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuSubAdd}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuSubAdd}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="Plus" />
@@ -59,6 +62,7 @@
                     Width="30"
                     Height="30"
                     Margin="{StaticResource MarginLeftRight8}"
+                    AutomationProperties.Name="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}"
                     Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
                     ToolTip="{x:Static resx:ResUI.menuProfileAutofitColumnWidth}">
                     <materialDesign:PackIcon VerticalAlignment="Center" Kind="ArrowSplitVertical" />
@@ -70,6 +74,7 @@
                     VerticalContentAlignment="Center"
                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.MsgServerTitle}"
                     materialDesign:TextFieldAssist.HasClearButton="True"
+                    AutomationProperties.Name="{x:Static resx:ResUI.MsgServerTitle}"
                     Style="{StaticResource DefTextBox}" />
             </WrapPanel>
             <DataGrid

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -323,9 +323,16 @@ public partial class ProfilesView
 
     private void AutofitColumnWidth()
     {
-        foreach (var it in lstProfiles.Columns)
+        try
         {
-            it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            foreach (var it in lstProfiles.Columns)
+            {
+                it.Width = new DataGridLength(1, DataGridLengthUnitType.Auto);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog("ProfilesView", ex);
         }
     }
 

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -1,4 +1,4 @@
-<reactiveui:ReactiveWindow
+<reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -29,68 +29,25 @@
                 VerticalAlignment="Center"
                 ClipToBounds="True"
                 Style="{StaticResource MaterialDesignToolBar}">
-                <Menu Margin="0,1" Style="{StaticResource ToolbarMenu}">
-                    <MenuItem x:Name="menuRoutingAdvanced" Padding="8,0">
-                        <MenuItem.Header>
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon
-                                    Margin="{StaticResource MarginRight8}"
-                                    VerticalAlignment="Center"
-                                    Kind="Routes" />
-                                <TextBlock Text="{x:Static resx:ResUI.menuRoutingAdvanced}" />
-                            </StackPanel>
-                        </MenuItem.Header>
-                        <MenuItem
-                            x:Name="menuRoutingAdvancedAdd2"
-                            Height="{StaticResource MenuItemHeight}"
-                            Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
-                        <MenuItem
-                            x:Name="menuRoutingAdvancedImportRules2"
-                            Height="{StaticResource MenuItemHeight}"
-                            Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
-                    </MenuItem>
-                </Menu>
+                <Button x:Name="menuRoutingAdvancedAdd2">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon
+                            Margin="{StaticResource MarginRight8}"
+                            VerticalAlignment="Center"
+                            Kind="Plus" />
+                        <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
+                    </StackPanel>
+                </Button>
                 <Separator />
-                <TextBlock
-                    Margin="{StaticResource MarginLeft8}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}">
-                    <Hyperlink Click="linkdomainStrategy_Click">
-                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
-                        <materialDesign:PackIcon Kind="Link" />
-                    </Hyperlink>
-                </TextBlock>
-                <ComboBox
-                    x:Name="cmbdomainStrategy"
-                    Width="110"
-                    Margin="{StaticResource MarginLeft8}"
-                    Style="{StaticResource DefComboBox}" />
-                <Separator />
-                <TextBlock
-                    Margin="{StaticResource MarginLeft8}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}"
-                    Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-                <ComboBox
-                    x:Name="cmbdomainMatcher"
-                    Width="60"
-                    Margin="{StaticResource MarginLeft8}"
-                    Style="{StaticResource DefComboBox}" />
-                <Separator />
-                <TextBlock
-                    Margin="{StaticResource MarginLeft8}"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource ToolbarTextBlock}">
-                    <Hyperlink Click="linkdomainStrategy4Singbox_Click">
-                        <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
-                        <materialDesign:PackIcon Kind="Link" />
-                    </Hyperlink>
-                </TextBlock>
-                <ComboBox
-                    x:Name="cmbdomainStrategy4Singbox"
-                    Width="100"
-                    Margin="{StaticResource MarginLeft8}"
-                    Style="{StaticResource DefComboBox}" />
+                <Button x:Name="menuRoutingAdvancedImportRules2">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon
+                            Margin="{StaticResource MarginRight8}"
+                            VerticalAlignment="Center"
+                            Kind="Import" />
+                        <TextBlock Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
+                    </StackPanel>
+                </Button>
             </ToolBar>
         </ToolBarTray>
 
@@ -122,82 +79,145 @@
                 Style="{StaticResource DefButton}" />
         </StackPanel>
 
-        <DockPanel>
-            <TabControl x:Name="tabAdvanced">
-                <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
-                    <DataGrid
-                        x:Name="lstRoutings"
-                        AutoGenerateColumns="False"
-                        BorderThickness="1"
-                        CanUserAddRows="False"
-                        CanUserResizeRows="False"
-                        CanUserSortColumns="False"
-                        EnableRowVirtualization="True"
-                        GridLinesVisibility="All"
-                        HeadersVisibility="Column"
-                        IsReadOnly="True"
-                        Style="{StaticResource DefDataGrid}">
-                        <DataGrid.ContextMenu>
-                            <ContextMenu Style="{StaticResource DefContextMenu}">
-                                <MenuItem
-                                    x:Name="menuRoutingAdvancedAdd"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
-                                <MenuItem
-                                    x:Name="menuRoutingAdvancedRemove"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuRoutingAdvancedRemove}" />
-                                <MenuItem
-                                    x:Name="menuRoutingAdvancedSelectAll"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuSelectAll}" />
-                                <MenuItem
-                                    x:Name="menuRoutingAdvancedSetDefault"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuRoutingAdvancedSetDefault}" />
-                                <Separator />
-                                <MenuItem
-                                    x:Name="menuRoutingAdvancedImportRules"
-                                    Height="{StaticResource MenuItemHeight}"
-                                    Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
-                            </ContextMenu>
-                        </DataGrid.ContextMenu>
-                        <DataGrid.Resources>
-                            <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsActive}" Value="True">
-                                        <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
-                                        <Setter Property="Foreground" Value="Black" />
-                                        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </DataGrid.Resources>
-                        <DataGrid.Columns>
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding Remarks}"
-                                Header="{x:Static resx:ResUI.LvRemarks}" />
-                            <DataGridTextColumn
-                                Width="60"
-                                Binding="{Binding RuleNum}"
-                                Header="{x:Static resx:ResUI.LvCount}" />
-                            <DataGridTextColumn
-                                Width="60"
-                                Binding="{Binding Sort}"
-                                Header="{x:Static resx:ResUI.LvSort}" />
-                            <DataGridTextColumn
-                                Width="*"
-                                Binding="{Binding Url}"
-                                Header="{x:Static resx:ResUI.LvUrl}" />
-                            <DataGridTextColumn
-                                Width="300"
-                                Binding="{Binding CustomIcon}"
-                                Header="{x:Static resx:ResUI.LvCustomIcon}" />
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </TabItem>
-            </TabControl>
-        </DockPanel>
+        <Grid Margin="{StaticResource Margin8}" DockPanel.Dock="Top">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock
+                Grid.Row="0"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}">
+                <Hyperlink Click="linkdomainStrategy_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy}" />
+                    <materialDesign:PackIcon Kind="Link" />
+                </Hyperlink>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy"
+                Grid.Row="0"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="1"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
+                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
+            <ComboBox
+                x:Name="cmbdomainMatcher"
+                Grid.Row="1"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="2"
+                Grid.Column="0"
+                Margin="{StaticResource Margin4}"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}">
+                <Hyperlink Click="linkdomainStrategy4Singbox_Click">
+                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
+                    <materialDesign:PackIcon Kind="Link" />
+                </Hyperlink>
+            </TextBlock>
+            <ComboBox
+                x:Name="cmbdomainStrategy4Singbox"
+                Grid.Row="2"
+                Grid.Column="1"
+                Width="300"
+                Margin="{StaticResource Margin4}"
+                Style="{StaticResource DefComboBox}" />
+        </Grid>
+
+        <TabControl x:Name="tabAdvanced">
+            <TabItem HorizontalAlignment="Left" Header="{x:Static resx:ResUI.TbRoutingTabRuleList}">
+                <DataGrid
+                    x:Name="lstRoutings"
+                    AutoGenerateColumns="False"
+                    BorderThickness="1"
+                    CanUserAddRows="False"
+                    CanUserResizeRows="False"
+                    CanUserSortColumns="False"
+                    EnableRowVirtualization="True"
+                    GridLinesVisibility="All"
+                    HeadersVisibility="Column"
+                    IsReadOnly="True"
+                    Style="{StaticResource DefDataGrid}">
+                    <DataGrid.ContextMenu>
+                        <ContextMenu Style="{StaticResource DefContextMenu}">
+                            <MenuItem
+                                x:Name="menuRoutingAdvancedAdd"
+                                Height="{StaticResource MenuItemHeight}"
+                                Header="{x:Static resx:ResUI.menuRoutingAdvancedAdd}" />
+                            <MenuItem
+                                x:Name="menuRoutingAdvancedRemove"
+                                Height="{StaticResource MenuItemHeight}"
+                                Header="{x:Static resx:ResUI.menuRoutingAdvancedRemove}" />
+                            <MenuItem
+                                x:Name="menuRoutingAdvancedSelectAll"
+                                Height="{StaticResource MenuItemHeight}"
+                                Header="{x:Static resx:ResUI.menuSelectAll}" />
+                            <MenuItem
+                                x:Name="menuRoutingAdvancedSetDefault"
+                                Height="{StaticResource MenuItemHeight}"
+                                Header="{x:Static resx:ResUI.menuRoutingAdvancedSetDefault}" />
+                            <Separator />
+                            <MenuItem
+                                x:Name="menuRoutingAdvancedImportRules"
+                                Height="{StaticResource MenuItemHeight}"
+                                Header="{x:Static resx:ResUI.menuRoutingAdvancedImportRules}" />
+                        </ContextMenu>
+                    </DataGrid.ContextMenu>
+                    <DataGrid.Resources>
+                        <Style BasedOn="{StaticResource MaterialDesignDataGridCell}" TargetType="DataGridCell">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding IsActive}" Value="True">
+                                    <Setter Property="Background" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                    <Setter Property="Foreground" Value="Black" />
+                                    <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesign.Brush.Primary.Light}" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </DataGrid.Resources>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="*"
+                            Binding="{Binding Remarks}"
+                            Header="{x:Static resx:ResUI.LvRemarks}" />
+                        <DataGridTextColumn
+                            Width="60"
+                            Binding="{Binding RuleNum}"
+                            Header="{x:Static resx:ResUI.LvCount}" />
+                        <DataGridTextColumn
+                            Width="60"
+                            Binding="{Binding Sort}"
+                            Header="{x:Static resx:ResUI.LvSort}" />
+                        <DataGridTextColumn
+                            Width="*"
+                            Binding="{Binding Url}"
+                            Header="{x:Static resx:ResUI.LvUrl}" />
+                        <DataGridTextColumn
+                            Width="300"
+                            Binding="{Binding CustomIcon}"
+                            Header="{x:Static resx:ResUI.LvCustomIcon}" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </TabItem>
+        </TabControl>
     </DockPanel>
-</reactiveui:ReactiveWindow>
+</reactiveui:ReactiveWindow>

v2rayN/v2rayN/Views/StatusBarView.xaml

@@ -61,7 +61,8 @@
                         x:Name="togEnableTun"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
-                        VerticalAlignment="Center" />
+                        VerticalAlignment="Center"
+                        AutomationProperties.Name="{x:Static resx:ResUI.TbEnableTunAs}" />
                 </StackPanel>
 
                 <StackPanel
@@ -74,6 +75,7 @@
                         Width="160"
                         Margin="{StaticResource MarginLeftRight8}"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuSystemproxy}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemproxy}"
                         FontSize="{DynamicResource StdFontSize}"
                         Style="{StaticResource MaterialDesignFloatingHintComboBox}">
                         <ComboBoxItem Content="{x:Static resx:ResUI.menuSystemProxyClear}" />
@@ -87,9 +89,11 @@
                         Width="160"
                         Margin="{StaticResource MarginLeftRight8}"
                         materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                         DisplayMemberPath="Remarks"
                         FontSize="{DynamicResource StdFontSize}"
-                        Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
+                        Style="{StaticResource MaterialDesignFloatingHintComboBox}">                        
+                    </ComboBox>
                 </StackPanel>
 
                 <StackPanel Margin="{StaticResource MarginLeftRight8}" VerticalAlignment="Center">
@@ -107,7 +111,10 @@
             ToolTipText="v2rayN">
             <tb:TaskbarIcon.ContextMenu>
                 <ContextMenu Style="{StaticResource DefContextMenu}">
-                    <MenuItem x:Name="menuSystemProxyClear" Height="{StaticResource MenuItemHeight}">
+                    <MenuItem
+                        x:Name="menuSystemProxyClear"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyClear}">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
@@ -119,7 +126,10 @@
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem x:Name="menuSystemProxySet" Height="{StaticResource MenuItemHeight}">
+                    <MenuItem
+                        x:Name="menuSystemProxySet"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxySet}">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
@@ -131,7 +141,10 @@
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem x:Name="menuSystemProxyNothing" Height="{StaticResource MenuItemHeight}">
+                    <MenuItem
+                        x:Name="menuSystemProxyNothing"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyNothing}">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
@@ -143,7 +156,10 @@
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem x:Name="menuSystemProxyPac" Height="{StaticResource MenuItemHeight}">
+                    <MenuItem
+                        x:Name="menuSystemProxyPac"
+                        Height="{StaticResource MenuItemHeight}"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuSystemProxyPac}">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon
@@ -156,29 +172,36 @@
                         </MenuItem.Header>
                     </MenuItem>
                     <Separator x:Name="sepRoutings" />
-                    <MenuItem x:Name="menuRoutings" Height="Auto">
+                    <MenuItem
+                        x:Name="menuRoutings"
+                        Height="Auto"
+                        AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}">
                         <MenuItem.Header>
                             <DockPanel>
                                 <ComboBox
                                     x:Name="cmbRoutings"
                                     MaxWidth="300"
                                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuRouting}"
+                                    AutomationProperties.Name="{x:Static resx:ResUI.menuRouting}"
                                     DisplayMemberPath="Remarks"
                                     FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
+                                    Style="{StaticResource MaterialDesignFilledComboBox}">                               
+                                </ComboBox>
                             </DockPanel>
                         </MenuItem.Header>
                     </MenuItem>
-                    <MenuItem Height="Auto">
+                    <MenuItem Height="Auto" AutomationProperties.Name="{x:Static resx:ResUI.menuServers}">
                         <MenuItem.Header>
                             <DockPanel>
                                 <ComboBox
                                     x:Name="cmbServers"
                                     MaxWidth="300"
                                     materialDesign:HintAssist.Hint="{x:Static resx:ResUI.menuServers}"
+                                    AutomationProperties.Name="{x:Static resx:ResUI.menuServers}"
                                     DisplayMemberPath="Text"
                                     FontSize="{DynamicResource StdFontSize}"
-                                    Style="{StaticResource MaterialDesignFilledComboBox}" />
+                                    Style="{StaticResource MaterialDesignFilledComboBox}">                               
+                                </ComboBox>
                             </DockPanel>
                         </MenuItem.Header>
                     </MenuItem>

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"

v2rayN/v2rayN/Views/ThemeSettingView.xaml

@@ -1,10 +1,10 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ThemeSettingView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     d:DesignHeight="450"