diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 8ab48a1d..8464565a 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -324,7 +324,7 @@ namespace v2rayN.Forms { toolSslSocksPort.Text = toolSslHttpPort.Text = - toolSslPacPort.Text = "NONE"; + toolSslPacPort.Text = "OFF"; toolSslSocksPort.Text = $"{Global.Loopback}:{config.inbound[0].localPort}"; diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index cde6dfff..646fbc58 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -657,7 +657,7 @@ 49, 17 - SOCKS5 + SOCKS5: 0, 17 @@ -675,7 +675,7 @@ 36, 17 - HTTP + HTTP: 0, 17 @@ -693,7 +693,7 @@ 30, 17 - PAC + PAC: 0, 17 diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx index 1659d54e..24220d6c 100644 --- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx @@ -420,19 +420,19 @@ 232, 22 - 检查更新v2rayN + v2rayN 232, 22 - 检查更新v2rayCore + v2rayCore 232, 22 - 检查更新PAC + PAC 232, 22 diff --git a/v2rayN/v2rayN/Handler/V2rayHandler.cs b/v2rayN/v2rayN/Handler/V2rayHandler.cs index 653efece..65e73792 100644 --- a/v2rayN/v2rayN/Handler/V2rayHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayHandler.cs @@ -152,9 +152,9 @@ namespace v2rayN.Handler { //查找v2ray文件是否存在 string fileName = string.Empty; - for (int k = 0; k < lstV2ray.Count; k++) + foreach (string name in lstV2ray) { - string vName = string.Format("{0}.exe", lstV2ray[k]); + string vName = string.Format("{0}.exe", name); vName = Utils.GetPath(vName); if (File.Exists(vName)) { diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index e80f0555..0e5092df 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -19,7 +19,7 @@ namespace v2rayN.Resx { // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen // (以 /str 作为命令选项),或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ResUI { @@ -691,7 +691,7 @@ namespace v2rayN.Resx { } /// - /// 查找类似 PAC failed to start. Pls with an administrator. 的本地化字符串。 + /// 查找类似 PAC failed to start. Run it with Admin right. 的本地化字符串。 /// internal static string StartPacFailed { get { diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 74280a36..b62bbc98 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -344,6 +344,6 @@ Total upload traffic - PAC failed to start. Pls with an administrator. + PAC failed to start. Run it with Admin right. \ No newline at end of file diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index cf7cab26..c7378691 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -254,7 +254,7 @@ 端口 - 服务类型 + 类型 订阅 diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs index 2e840ecd..b7da94e8 100644 --- a/v2rayN/v2rayN/Tool/Utils.cs +++ b/v2rayN/v2rayN/Tool/Utils.cs @@ -317,7 +317,7 @@ namespace v2rayN double result; string unit; ToHumanReadable(amount, out result, out unit); - return $"{string.Format("{0:f1}", result)}{unit}"; + return $"{string.Format("{0:f1}", result)} {unit}"; } public static void DedupServerList(List source, out List result)