diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 18467531..6bd0b4b6 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -202,6 +202,7 @@ namespace v2rayN.Forms lvServers.Columns.Add(UIRes.I18N("LvPort"), 50); lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 90); lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 70); + lvServers.Columns.Add(UIRes.I18N("LvTLS"), 70); lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 50); lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 70, HorizontalAlignment.Right); @@ -258,6 +259,7 @@ namespace v2rayN.Forms Utils.AddSubItem(lvItem, EServerColName.port.ToString(), item.port.ToString()); Utils.AddSubItem(lvItem, EServerColName.security.ToString(), item.security); Utils.AddSubItem(lvItem, EServerColName.network.ToString(), item.network); + Utils.AddSubItem(lvItem, EServerColName.streamSecurity.ToString(), item.streamSecurity); Utils.AddSubItem(lvItem, EServerColName.subRemarks.ToString(), item.getSubRemarks(config)); Utils.AddSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult); if (stats) diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx index 7f62c293..0707411b 100644 --- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx @@ -137,7 +137,7 @@ 336, 16 - 底层传输安全选tls时,默认跳过证书验证(allowInsecure) + 传输层安全选tls时,默认跳过证书验证(allowInsecure) 96, 16 diff --git a/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx b/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx index 34a92e99..4ca97072 100644 --- a/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx @@ -146,7 +146,7 @@ 107, 12 - 底层传输安全(tls) + 传输层安全(tls) 127, 92 diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index b1c16c6b..db9e81a8 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -914,6 +914,7 @@ namespace v2rayN.Handler case EServerColName.port: case EServerColName.security: case EServerColName.network: + case EServerColName.streamSecurity: case EServerColName.testResult: propertyName = name.ToString(); break; diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index b3dfa5c8..f3425e8c 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -554,7 +554,7 @@ namespace v2rayN.Mode } /// - /// 底层传输安全 + /// 传输层安全 /// public string streamSecurity { diff --git a/v2rayN/v2rayN/Mode/EServerColName.cs b/v2rayN/v2rayN/Mode/EServerColName.cs index 0704e47e..554a520e 100644 --- a/v2rayN/v2rayN/Mode/EServerColName.cs +++ b/v2rayN/v2rayN/Mode/EServerColName.cs @@ -10,6 +10,7 @@ namespace v2rayN.Mode port, security, network, + streamSecurity, subRemarks, testResult, diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index a6515acf..1842e7f0 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -47,8 +47,8 @@ namespace v2rayN.Resx { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性,对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -402,6 +402,15 @@ namespace v2rayN.Resx { } } + /// + /// 查找类似 TLS 的本地化字符串。 + /// + internal static string LvTLS { + get { + return ResourceManager.GetString("LvTLS", resourceCulture); + } + } + /// /// 查找类似 Today download traffic 的本地化字符串。 /// diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index e8a03fc9..0c9a42b3 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -436,4 +436,7 @@ *grpc mode + + TLS + \ 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 6633c1a8..ce915bca 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -436,4 +436,7 @@ *grpc 模式 + + 传输层安全 + \ No newline at end of file