diff --git a/Netch/Controllers/TUNTAPController.cs b/Netch/Controllers/TUNTAPController.cs index b650984e..fef05966 100644 --- a/Netch/Controllers/TUNTAPController.cs +++ b/Netch/Controllers/TUNTAPController.cs @@ -68,7 +68,7 @@ namespace Netch.Controllers public bool SetupBypass() { MainForm.Instance.StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("SetupBypass")}"); - Logging.Info("设置绕行规则->设置让服务器 IP 走直连"); + Logging.Info("设置绕行规则 → 设置让服务器 IP 走直连"); // 让服务器 IP 走直连 foreach (var address in ServerAddresses) { @@ -81,7 +81,7 @@ namespace Netch.Controllers // 处理模式的绕过中国 if (SavedMode.BypassChina) { - Logging.Info("设置绕行规则->处理模式的绕过中国"); + Logging.Info("设置绕行规则 → 处理模式的绕过中国"); using (var sr = new StringReader(Encoding.UTF8.GetString(Properties.Resources.CNIP))) { string text; @@ -95,7 +95,7 @@ namespace Netch.Controllers } } - Logging.Info("设置绕行规则->处理全局绕过 IP"); + Logging.Info("设置绕行规则 → 处理全局绕过 IP"); // 处理全局绕过 IP foreach (var ip in Global.Settings.BypassIPs) { @@ -108,7 +108,7 @@ namespace Netch.Controllers } } - Logging.Info("设置绕行规则->处理绕过局域网 IP"); + Logging.Info("设置绕行规则 → 处理绕过局域网 IP"); // 处理绕过局域网 IP foreach (var ip in BypassLanIPs) { @@ -123,7 +123,7 @@ namespace Netch.Controllers if (SavedMode.Type == 2) // 处理仅规则内走直连 { - Logging.Info("设置绕行规则->处理仅规则内走直连"); + Logging.Info("设置绕行规则 → 处理仅规则内走直连"); // 将 TUN/TAP 网卡权重放到最高 var instance = new Process { @@ -138,7 +138,7 @@ namespace Netch.Controllers }; instance.Start(); - Logging.Info("设置绕行规则->创建默认路由"); + Logging.Info("设置绕行规则 → 创建默认路由"); // 创建默认路由 if (!NativeMethods.CreateRoute("0.0.0.0", 0, Global.Settings.TUNTAP.Gateway, Global.TUNTAP.Index, 10)) { @@ -152,7 +152,7 @@ namespace Netch.Controllers return false; } - Logging.Info("设置绕行规则->创建规则路由"); + Logging.Info("设置绕行规则 → 创建规则路由"); // 创建规则路由 foreach (var ip in SavedMode.Rule) { @@ -182,7 +182,7 @@ namespace Netch.Controllers } } } - //处理NAT类型检测，由于协议的原因，无法仅通过域名确定需要代理的IP，自己记录解析了返回的IP，仅支持默认检测服务器 + //处理 NAT 类型检测，由于协议的原因，无法仅通过域名确定需要代理的 IP，自己记录解析了返回的 IP，仅支持默认检测服务器 if (Global.Settings.STUN_Server == "stun.stunprotocol.org") { try @@ -200,13 +200,13 @@ namespace Netch.Controllers } catch { - Logging.Info("NAT类型测试域名解析失败，将不会被添加到代理列表。"); + Logging.Info("NAT 类型测试域名解析失败，将不会被添加到代理列表"); } } //处理DNS代理 if (Global.Settings.TUNTAP.ProxyDNS) { - Logging.Info("设置绕行规则->处理自定义DNS代理"); + Logging.Info("设置绕行规则 → 处理自定义 DNS 代理"); if (Global.Settings.TUNTAP.UseCustomDNS) { string dns = ""; diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index ec537d2c..60055472 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -1425,15 +1425,10 @@ namespace Netch.Forms NotifyIcon.ShowBalloonTip(5, UpdateChecker.Name, Utils.i18N.Translate("ACL updated successfully"), ToolTipIcon.Info); - //MessageBox.Show(Utils.i18N.Translate("ACL updated successfully")); } else { - Utils.Logging.Info("ACL更新失败！" + args.Error); - /*NotifyIcon.ShowBalloonTip(5, - UpdateChecker.Name, - Utils.i18N.Translate("ACL update failed") + args.Error, - ToolTipIcon.Error);*/ + Utils.Logging.Info("ACL 更新失败！" + args.Error); MessageBox.Show(Utils.i18N.Translate("ACL update failed") + "\n" + args.Error); } } @@ -1483,11 +1478,7 @@ namespace Netch.Forms } catch (Exception e) { - Utils.Logging.Info("使用代理更新ACL失败！" + e.Message); - /*NotifyIcon.ShowBalloonTip(5, - UpdateChecker.Name, - Utils.i18N.Translate("ACL update failed") + args.Error, - ToolTipIcon.Error);*/ + Utils.Logging.Info("使用代理更新 ACL 失败！" + e.Message); MessageBox.Show(Utils.i18N.Translate("ACL update failed") + "\n" + e.Message); } finally @@ -1506,20 +1497,20 @@ namespace Netch.Forms { Task.Run(() => { - StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Reinstalling Tap driver")}"); + StatusText($"{Utils.i18N.Translate("Status")}{Utils.i18N.Translate(": ")}{Utils.i18N.Translate("Reinstalling TUN/TAP driver")}"); Enabled = false; try { Configuration.deltapall(); Configuration.addtap(); NotifyIcon.ShowBalloonTip(5, - UpdateChecker.Name, Utils.i18N.Translate("Reinstall Tap driver successfully"), + UpdateChecker.Name, Utils.i18N.Translate("Reinstall TUN/TAP driver successfully"), ToolTipIcon.Info); } catch { NotifyIcon.ShowBalloonTip(5, - UpdateChecker.Name, Utils.i18N.Translate("Reinstall Tap driver failed"), + UpdateChecker.Name, Utils.i18N.Translate("Reinstall TUN/TAP driver failed"), ToolTipIcon.Error); } finally diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN index ac2528c3..031df1bd 100644 --- a/Netch/Resources/zh-CN +++ b/Netch/Resources/zh-CN @@ -95,10 +95,10 @@ "Update ACL with proxy": "使用代理更新 ACL 规则", "ACL updated successfully": "ACL 更新成功", "ACL update failed": "ACL更新失败", - "Reinstall Tap driver": "重新安装 TUN/TAP 驱动", - "Reinstall Tap driver successfully": "重装 TUN/TAP 驱动成功", - "Reinstall Tap driver failed": "重装 TUN/TAP 驱动失败", - "Reinstalling Tap driver": "正在重装 TUN/TAP 驱动", + "Reinstall TUN/TAP driver": "重新安装 TUN/TAP 驱动", + "Reinstall TUN/TAP driver successfully": "重装 TUN/TAP 驱动成功", + "Reinstall TUN/TAP driver failed": "重装 TUN/TAP 驱动失败", + "Reinstalling TUN/TAP driver": "正在重装 TUN/TAP 驱动", "About": "关于", "Telegram Channel": "Telegram 频道", @@ -156,13 +156,14 @@ "Gateway": "网关", "Use Custom DNS": "使用自定义 DNS", "Proxy DNS in Mode 2": "在模式 2 下代理 DNS", - "Use Fake DNS (Suggest open if NTT is Udpblock)": "使用 Fake DNS (建议节点 NAT 测试为 UdpBlocked 时开启)", + "Use Fake DNS": "使用 Fake DNS", "Behavior": "行为", "Exit when closed": "关闭时退出", "Stop when exited": "退出时停止", "Global Bypass IPs": "全局直连 IP", "Port value illegal. Try again.": "端口值非法。请重试。", "Check update when opened": "打开软件时检查更新", + "Start Shadowsocks from DLL (No support for ACL)": "SS DLL（推荐使用，不支持 ACL）", "ProfileCount": "快捷配置数量（重启软件生效）", "ProfileCount value illegal. Try again.": "快捷配置数值非法。请重试。", "STUN_ServerPort value illegal. Try again.": "STUN 端口数值非法。请重试。", @@ -170,12 +171,12 @@ "TUN/TAP driver is not detected. Is it installed now?": "未检测到 TUN/TAP 驱动，是否现在安装？", "Failed to set the system proxy, it may be caused by the lack of dependent programs. Do you want to jump to Netch's official website to download dependent programs?": "设置系统代理失败，可能是缺少依赖导致，是否跳转 Netch 官网下载依赖程序？", "Experimental function": "实验性功能", - "Delay test after startup": "启动后延迟测试", + "Delay test after start": "启动后延迟测试", "Enable": "启用", - "Detection interval(/s)": "检测间隔（/秒）", + "Detection interval(sec)": "检测间隔（秒）", + "STUN Server": "STUN 服务器", + "STUN Server Port": "STUN 服务器端口", "Custom ACL": "自定义 ACL 规则", - "Process whitelist mode": "进程白名单模式", - "Boot Shadowsocks from DLL(No support ACL)": "SS DLL（推荐使用，不支持 ACL）", "Profile": "配置名", "Profiles": "配置",