From 577e0e01a7c20c09e0eefb8456c9c9057fe162fb Mon Sep 17 00:00:00 2001 From: Amazing_DM Date: Thu, 7 May 2020 13:37:19 +0800 Subject: [PATCH] =?UTF-8?q?:globe=5Fwith=5Fmeridians:=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=86=85=E9=83=A8=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Netch/Forms/MainForm.cs | 2 +- Netch/Models/Mode.cs | 27 ++++++++++++++++++++++++++- Netch/Resources/zh-CN | 9 ++++++++- modes | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Netch/Forms/MainForm.cs b/Netch/Forms/MainForm.cs index 9338043d..ccd7a7fa 100644 --- a/Netch/Forms/MainForm.cs +++ b/Netch/Forms/MainForm.cs @@ -173,7 +173,7 @@ namespace Netch.Forms if (splited.Length >= 1) { - mode.Remark = splited[0].Trim(); + mode.Remark = Utils.i18N.Translate(splited[0].Trim()); } if (splited.Length >= 2) diff --git a/Netch/Models/Mode.cs b/Netch/Models/Mode.cs index e65d6ab6..6b8f4d37 100644 --- a/Netch/Models/Mode.cs +++ b/Netch/Models/Mode.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Globalization; namespace Netch.Models { @@ -41,7 +42,31 @@ namespace Netch.Models /// 备注 public override string ToString() { - return string.Format("[{0}] {1}", Type + 1, Remark); + if (CultureInfo.CurrentCulture.Name == "zh-CN") + { + string Stype; + if (Type == 0) + { + Stype = "[进程模式] "; + } + else if (Type == 1) + { + Stype = "[TAP黑名单模式] "; + } + else if (Type == 2) + { + Stype = "[TAP白名单模式] "; + } + else + { + Stype = ""; + } + return string.Format("{0}{1}", Stype, Remark); + } + else + { + return string.Format("[{0}] {1}", Type + 1, Remark); + } } /// diff --git a/Netch/Resources/zh-CN b/Netch/Resources/zh-CN index 1276bf30..18323bb2 100644 --- a/Netch/Resources/zh-CN +++ b/Netch/Resources/zh-CN @@ -180,5 +180,12 @@ "None": "无", "Show": "显示", - "Exit": "退出" + "Exit": "退出", + + "Bypass LAN": "网页代理-绕过局域网", + "Bypass LAN (Non System Proxy)": "网页代理-绕过局域网(不设置系统代理)", + "Bypass LAN (TUN/TAP)": "全局模式-绕过局域网(TUN-TAP)", + "Bypass LAN and China": "网页代理-绕过局域网和中国大陆", + "Bypass LAN and China (Non System Proxy)": "网页代理-绕过局域网和中国大陆 (不设置系统代理)", + "Bypass LAN and China (TUN/TAP)": "全局模式-绕过局域网和中国大陆(TUN-TAP)" } \ No newline at end of file diff --git a/modes b/modes index a9329cd3..314f2d14 160000 --- a/modes +++ b/modes @@ -1 +1 @@ -Subproject commit a9329cd3f10688d179b521d1cdcd260540886063 +Subproject commit 314f2d14b494799586ff5eedb370dfffaeadffa4