diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.resx b/v2rayN/v2rayN/Forms/AddServer3Form.resx
index f17e4d82..bfe58c25 100644
--- a/v2rayN/v2rayN/Forms/AddServer3Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.resx
@@ -143,11 +143,174 @@
<data name=">>btnClose.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name=">>label13.Name" xml:space="preserve">
+ <value>label13</value>
+ </data>
+ <data name=">>label13.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label13.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label13.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>cmbSecurity.Name" xml:space="preserve">
+ <value>cmbSecurity</value>
+ </data>
+ <data name=">>cmbSecurity.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbSecurity.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>cmbSecurity.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>txtRemarks.Name" xml:space="preserve">
+ <value>txtRemarks</value>
+ </data>
+ <data name=">>txtRemarks.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtRemarks.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtRemarks.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name=">>label6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label6.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>label5.Name" xml:space="preserve">
+ <value>label5</value>
+ </data>
+ <data name=">>label5.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label5.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label5.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name=">>txtId.Name" xml:space="preserve">
+ <value>txtId</value>
+ </data>
+ <data name=">>txtId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtId.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name=">>txtPort.Name" xml:space="preserve">
+ <value>txtPort</value>
+ </data>
+ <data name=">>txtPort.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtPort.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtPort.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name=">>txtAddress.Name" xml:space="preserve">
+ <value>txtAddress</value>
+ </data>
+ <data name=">>txtAddress.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtAddress.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtAddress.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>10</value>
+ </data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 35</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>547, 196</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Server</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="label13.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
+ <data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
- <value>337, 158</value>
+ <value>426, 158</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>113, 12</value>
@@ -192,7 +355,7 @@
<value>127, 123</value>
</data>
<data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 20</value>
+ <value>278, 20</value>
</data>
<data name="cmbSecurity.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -213,7 +376,7 @@
<value>127, 154</value>
</data>
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 21</value>
+ <value>278, 21</value>
</data>
<data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@@ -431,46 +594,6 @@
<data name=">>label1.ZOrder" xml:space="preserve">
<value>10</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 35</value>
- </data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>547, 196</value>
- </data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>Server</value>
- </data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
- <value>303, 17</value>
- </data>
- <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
- <value>75, 23</value>
- </data>
- <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name="btnOK.Text" xml:space="preserve">
- <value>&OK</value>
- </data>
<data name=">>btnOK.Name" xml:space="preserve">
<value>btnOK</value>
</data>
@@ -507,6 +630,30 @@
<data name=">>panel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+ <value>303, 17</value>
+ </data>
+ <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="btnOK.Text" xml:space="preserve">
+ <value>&OK</value>
+ </data>
+ <data name=">>btnOK.Name" xml:space="preserve">
+ <value>btnOK</value>
+ </data>
+ <data name=">>btnOK.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnOK.Parent" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>btnOK.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
@@ -534,18 +681,6 @@
<metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
- <value>235, 22</value>
- </data>
- <data name="menuItemImportClipboard.Text" xml:space="preserve">
- <value>Import URL from clipboard</value>
- </data>
- <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
- <value>162, 21</value>
- </data>
- <data name="MenuItem1.Text" xml:space="preserve">
- <value>Import configuration file</value>
- </data>
<data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@@ -567,6 +702,21 @@
<data name=">>menuServer.ZOrder" xml:space="preserve">
<value>3</value>
</data>
+ <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>162, 21</value>
+ </data>
+ <data name="MenuItem1.Text" xml:space="preserve">
+ <value>Import configuration file</value>
+ </data>
+ <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+ <value>235, 22</value>
+ </data>
+ <data name="menuItemImportClipboard.Text" xml:space="preserve">
+ <value>Import URL from clipboard</value>
+ </data>
+ <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>zh-CN</value>
+ </metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
diff --git a/v2rayN/v2rayN/Forms/AddServer4Form.resx b/v2rayN/v2rayN/Forms/AddServer4Form.resx
index d245b984..5cfed0ed 100644
--- a/v2rayN/v2rayN/Forms/AddServer4Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.resx
@@ -328,7 +328,7 @@
<value>AddServer4Form</value>
</data>
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 21</value>
+ <value>278, 21</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -448,7 +448,7 @@
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+ <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>label3.Name" xml:space="preserve">
<value>label3</value>
@@ -532,7 +532,7 @@
<value>127, 89</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
- <value>337, 155</value>
+ <value>422, 155</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -582,6 +582,9 @@
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>zh-Hans</value>
+ </metadata>
<metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
index 2e8e0912..eb8fc4d7 100644
--- a/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
@@ -120,22 +120,13 @@
<data name="btnClose.Text" xml:space="preserve">
<value>取消(&C)</value>
</data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>服务器</value>
- </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 21</value>
- </data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 12</value>
</data>
<data name="label4.Text" xml:space="preserve">
<value>用户名(可选)</value>
</data>
- <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 21</value>
- </data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 12</value>
</data>
@@ -163,21 +154,24 @@
<data name="label1.Text" xml:space="preserve">
<value>服务器地址</value>
</data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>服务器</value>
+ </data>
<data name="btnOK.Text" xml:space="preserve">
<value>确定(&O)</value>
</data>
- <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
- <value>92, 21</value>
- </data>
- <data name="MenuItem1.Text" xml:space="preserve">
- <value>导入配置文件</value>
- </data>
<data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
<value>171, 22</value>
</data>
<data name="menuItemImportClipboard.Text" xml:space="preserve">
<value>从剪贴板导入URL</value>
</data>
+ <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>92, 21</value>
+ </data>
+ <data name="MenuItem1.Text" xml:space="preserve">
+ <value>导入配置文件</value>
+ </data>
<data name="$this.Text" xml:space="preserve">
<value>编辑或添加[Socks]服务器</value>
</data>
diff --git a/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs b/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
index fc67c5ec..a50084f4 100644
--- a/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs
@@ -55,15 +55,14 @@
//
// btnClose
//
- resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// groupBox1
//
- resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.label21);
this.groupBox1.Controls.Add(this.cmbAllowInsecure);
this.groupBox1.Controls.Add(this.label15);
@@ -79,6 +78,7 @@
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.txtAddress);
this.groupBox1.Controls.Add(this.label1);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
@@ -89,13 +89,13 @@
//
// cmbAllowInsecure
//
- resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure");
this.cmbAllowInsecure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAllowInsecure.FormattingEnabled = true;
this.cmbAllowInsecure.Items.AddRange(new object[] {
resources.GetString("cmbAllowInsecure.Items"),
resources.GetString("cmbAllowInsecure.Items1"),
resources.GetString("cmbAllowInsecure.Items2")});
+ resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure");
this.cmbAllowInsecure.Name = "cmbAllowInsecure";
//
// label15
@@ -105,12 +105,12 @@
//
// cmbStreamSecurity
//
- resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
this.cmbStreamSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbStreamSecurity.FormattingEnabled = true;
this.cmbStreamSecurity.Items.AddRange(new object[] {
resources.GetString("cmbStreamSecurity.Items"),
resources.GetString("cmbStreamSecurity.Items1")});
+ resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
this.cmbStreamSecurity.Name = "cmbStreamSecurity";
//
// label4
@@ -170,9 +170,9 @@
//
// panel2
//
- resources.ApplyResources(this.panel2, "panel2");
this.panel2.Controls.Add(this.btnClose);
this.panel2.Controls.Add(this.btnOK);
+ resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
//
// btnOK
diff --git a/v2rayN/v2rayN/Forms/AddServer6Form.resx b/v2rayN/v2rayN/Forms/AddServer6Form.resx
index 7add00f3..9bf31819 100644
--- a/v2rayN/v2rayN/Forms/AddServer6Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer6Form.resx
@@ -118,382 +118,94 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
- <value>113, 12</value>
+ <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+ <value>396, 17</value>
</data>
- <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
- <value>312, 185</value>
- </data>
- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>53, 12</value>
- </data>
- <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="label15.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name=">>label6.Name" xml:space="preserve">
- <value>label6</value>
- </data>
- <data name="label6.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name=">>txtSNI.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>panel2.Name" xml:space="preserve">
- <value>panel2</value>
- </data>
- <data name="label4.TabIndex" type="System.Int32, mscorlib">
- <value>24</value>
- </data>
- <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
- </data>
- <data name="label21.Text" xml:space="preserve">
- <value>allowInsecure</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Bottom</value>
- </data>
- <data name="label6.Text" xml:space="preserve">
- <value>Alias (remarks)</value>
- </data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="label3.Text" xml:space="preserve">
- <value>Password</value>
- </data>
- <data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="label21.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name=">>label6.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>cmbStreamSecurity.Name" xml:space="preserve">
- <value>cmbStreamSecurity</value>
- </data>
- <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name=">>label3.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>89, 12</value>
- </data>
- <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
- <value>127, 27</value>
- </data>
- <data name=">>label13.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name="$this.Text" xml:space="preserve">
- <value>Edit or add a [Trojan] server</value>
- </data>
- <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
- <value>60, 20</value>
- </data>
- <data name="txtId.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name=">>cmbStreamSecurity.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
- <value>303, 17</value>
- </data>
- <data name=">>panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="label3.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name=">>btnClose.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
- <value>359, 21</value>
- </data>
- <data name=">>cmbAllowInsecure.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="label21.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name=">>txtAddress.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>label2.ZOrder" xml:space="preserve">
- <value>12</value>
- </data>
- <data name=">>label21.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>label1.Name" xml:space="preserve">
- <value>label1</value>
- </data>
- <data name="cmbStreamSecurity.TabIndex" type="System.Int32, mscorlib">
- <value>25</value>
- </data>
- <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name=">>txtRemarks.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label13.TabIndex" type="System.Int32, mscorlib">
- <value>22</value>
- </data>
- <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name=">>txtAddress.ZOrder" xml:space="preserve">
- <value>13</value>
- </data>
- <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
- <value>127, 91</value>
- </data>
- <data name=">>btnOK.Parent" xml:space="preserve">
- <value>panel2</value>
- </data>
- <data name=">>cmbStreamSecurity.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name=">>panel1.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name=">>txtSNI.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtId.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>label13.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>cmbAllowInsecure.Name" xml:space="preserve">
- <value>cmbAllowInsecure</value>
- </data>
- <data name=">>txtId.Name" xml:space="preserve">
- <value>txtId</value>
- </data>
- <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 156</value>
- </data>
- <data name=">>txtId.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtRemarks.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 31</value>
- </data>
- <data name=">>panel2.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name=">>btnOK.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name=">>$this.Name" xml:space="preserve">
- <value>AddServer6Form</value>
- </data>
- <data name=">>label15.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtPort.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>cmbStreamSecurity.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
- <value>127, 59</value>
- </data>
- <data name="cmbAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
- <value>80, 20</value>
- </data>
- <data name=">>label4.ZOrder" xml:space="preserve">
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name=">>btnOK.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="cmbAllowInsecure.TabIndex" type="System.Int32, mscorlib">
- <value>32</value>
- </data>
- <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
- <value>547, 60</value>
- </data>
- <data name=">>txtPort.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>71, 12</value>
- </data>
- <data name=">>panel1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>label2.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name="cmbAllowInsecure.Items" xml:space="preserve">
- <value />
- </data>
- <data name="txtSNI.TabIndex" type="System.Int32, mscorlib">
- <value>23</value>
- </data>
- <data name=">>txtPort.Name" xml:space="preserve">
- <value>txtPort</value>
- </data>
- <data name=">>btnClose.Parent" xml:space="preserve">
- <value>panel2</value>
- </data>
- <data name=">>txtPort.ZOrder" xml:space="preserve">
- <value>11</value>
- </data>
- <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>547, 10</value>
- </data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 10</value>
- </data>
- <data name=">>txtId.ZOrder" xml:space="preserve">
- <value>9</value>
- </data>
- <data name="label15.TabIndex" type="System.Int32, mscorlib">
- <value>26</value>
- </data>
- <data name=">>label4.Name" xml:space="preserve">
- <value>label4</value>
- </data>
- <data name="btnOK.Text" xml:space="preserve">
- <value>&OK</value>
- </data>
- <data name=">>txtSNI.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
- <data name=">>label15.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <data name="btnClose.Text" xml:space="preserve">
+ <value>&Cancel</value>
</data>
<data name=">>btnClose.Name" xml:space="preserve">
<value>btnClose</value>
</data>
- <data name=">>txtSNI.Name" xml:space="preserve">
- <value>txtSNI</value>
- </data>
- <data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 12</value>
- </data>
- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 93</value>
- </data>
- <data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 21</value>
- </data>
- <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
- <value>194, 21</value>
- </data>
- <data name=">>label13.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="cmbAllowInsecure.Items1" xml:space="preserve">
- <value>true</value>
- </data>
- <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
<data name=">>btnClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="panel1.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
+ <data name=">>btnClose.Parent" xml:space="preserve">
+ <value>panel2</value>
</data>
- <data name="panel2.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
+ <data name=">>btnClose.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name=">>label13.Name" xml:space="preserve">
- <value>label13</value>
+ <data name="label21.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="txtSNI.Size" type="System.Drawing.Size, System.Drawing">
- <value>359, 21</value>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="label21.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="label21.Location" type="System.Drawing.Point, System.Drawing">
+ <value>224, 189</value>
</data>
- <data name=">>label1.Parent" xml:space="preserve">
- <value>groupBox1</value>
+ <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
+ <value>83, 12</value>
</data>
- <data name=">>$this.Type" xml:space="preserve">
- <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+ <data name="label21.TabIndex" type="System.Int32, mscorlib">
+ <value>33</value>
</data>
- <data name=">>label3.Name" xml:space="preserve">
- <value>label3</value>
+ <data name="label21.Text" xml:space="preserve">
+ <value>allowInsecure</value>
</data>
- <data name="label2.Text" xml:space="preserve">
- <value>Server port</value>
- </data>
- <data name=">>panel2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
- <value>396, 17</value>
+ <data name=">>label21.Name" xml:space="preserve">
+ <value>label21</value>
</data>
<data name=">>label21.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 231</value>
+ <data name=">>label21.Parent" xml:space="preserve">
+ <value>groupBox1</value>
</data>
- <data name="cmbStreamSecurity.Items" xml:space="preserve">
- <value>tls</value>
+ <data name=">>label21.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name=">>txtRemarks.Name" xml:space="preserve">
- <value>txtRemarks</value>
+ <data name="cmbAllowInsecure.Items" xml:space="preserve">
+ <value />
</data>
- <data name="label21.TabIndex" type="System.Int32, mscorlib">
- <value>33</value>
+ <data name="cmbAllowInsecure.Items1" xml:space="preserve">
+ <value>true</value>
+ </data>
+ <data name="cmbAllowInsecure.Items2" xml:space="preserve">
+ <value>false</value>
+ </data>
+ <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+ <value>312, 185</value>
+ </data>
+ <data name="cmbAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+ <value>80, 20</value>
+ </data>
+ <data name="cmbAllowInsecure.TabIndex" type="System.Int32, mscorlib">
+ <value>32</value>
+ </data>
+ <data name=">>cmbAllowInsecure.Name" xml:space="preserve">
+ <value>cmbAllowInsecure</value>
+ </data>
+ <data name=">>cmbAllowInsecure.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbAllowInsecure.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>cmbAllowInsecure.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="label15.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
<data name="label15.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@@ -501,157 +213,442 @@
<data name="label15.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 189</value>
</data>
- <data name="btnClose.Text" xml:space="preserve">
- <value>&Cancel</value>
+ <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 12</value>
</data>
- <data name="label13.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="cmbStreamSecurity.Items1" xml:space="preserve">
- <value>xtls</value>
- </data>
- <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
- <value>6, 12</value>
- </data>
- <data name=">>label21.Name" xml:space="preserve">
- <value>label21</value>
- </data>
- <data name="label1.Text" xml:space="preserve">
- <value>Server address</value>
- </data>
- <data name="cmbAllowInsecure.Items2" xml:space="preserve">
- <value>false</value>
+ <data name="label15.TabIndex" type="System.Int32, mscorlib">
+ <value>26</value>
</data>
<data name="label15.Text" xml:space="preserve">
<value>TLS</value>
</data>
- <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>95, 12</value>
- </data>
- <data name=">>cmbAllowInsecure.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
- <value>127, 185</value>
- </data>
- <data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name="label13.Text" xml:space="preserve">
- <value>* Fill in manually</value>
- </data>
- <data name=">>label1.ZOrder" xml:space="preserve">
- <value>14</value>
- </data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
- </data>
- <data name=">>cmbAllowInsecure.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>panel1.Name" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 62</value>
- </data>
- <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>547, 291</value>
- </data>
- <data name=">>btnOK.Name" xml:space="preserve">
- <value>btnOK</value>
- </data>
- <data name=">>label21.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name=">>panel2.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>547, 221</value>
- </data>
- <data name=">>label6.ZOrder" xml:space="preserve">
- <value>8</value>
- </data>
- <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
- <value>75, 23</value>
- </data>
- <data name=">>label3.ZOrder" xml:space="preserve">
- <value>10</value>
+ <data name=">>label15.Name" xml:space="preserve">
+ <value>label15</value>
</data>
<data name=">>label15.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
- <value>83, 12</value>
- </data>
- <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
- <value>337, 125</value>
- </data>
- <data name="label1.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name=">>txtRemarks.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
- <value>127, 121</value>
- </data>
- <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
- <value>*</value>
- </data>
- <data name=">>txtAddress.Name" xml:space="preserve">
- <value>txtAddress</value>
- </data>
- <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 12</value>
- </data>
- <data name="label21.Location" type="System.Drawing.Point, System.Drawing">
- <value>224, 189</value>
- </data>
- <data name=">>txtAddress.Parent" xml:space="preserve">
+ <data name=">>label15.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name=">>label15.Name" xml:space="preserve">
- <value>label15</value>
+ <data name=">>label15.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
- <data name=">>label4.Parent" xml:space="preserve">
+ <data name="cmbStreamSecurity.Items" xml:space="preserve">
+ <value>tls</value>
+ </data>
+ <data name="cmbStreamSecurity.Items1" xml:space="preserve">
+ <value>xtls</value>
+ </data>
+ <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+ <value>127, 185</value>
+ </data>
+ <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
+ <value>60, 20</value>
+ </data>
+ <data name="cmbStreamSecurity.TabIndex" type="System.Int32, mscorlib">
+ <value>25</value>
+ </data>
+ <data name=">>cmbStreamSecurity.Name" xml:space="preserve">
+ <value>cmbStreamSecurity</value>
+ </data>
+ <data name=">>cmbStreamSecurity.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbStreamSecurity.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>Server</value>
- </data>
- <data name="txtSNI.Location" type="System.Drawing.Point, System.Drawing">
- <value>127, 152</value>
- </data>
- <data name="label6.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 125</value>
+ <data name=">>cmbStreamSecurity.ZOrder" xml:space="preserve">
+ <value>3</value>
</data>
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
+ <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 156</value>
+ </data>
+ <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 12</value>
+ </data>
+ <data name="label4.TabIndex" type="System.Int32, mscorlib">
+ <value>24</value>
+ </data>
<data name="label4.Text" xml:space="preserve">
<value>SNI</value>
</data>
- <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="txtSNI.Location" type="System.Drawing.Point, System.Drawing">
+ <value>127, 152</value>
+ </data>
+ <data name="txtSNI.Size" type="System.Drawing.Size, System.Drawing">
<value>359, 21</value>
</data>
- <data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="txtSNI.TabIndex" type="System.Int32, mscorlib">
+ <value>23</value>
+ </data>
+ <data name=">>txtSNI.Name" xml:space="preserve">
+ <value>txtSNI</value>
+ </data>
+ <data name=">>txtSNI.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtSNI.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtSNI.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+ <value>428, 124</value>
+ </data>
+ <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+ <value>113, 12</value>
+ </data>
+ <data name="label13.TabIndex" type="System.Int32, mscorlib">
+ <value>22</value>
+ </data>
+ <data name="label13.Text" xml:space="preserve">
+ <value>* Fill in manually</value>
+ </data>
+ <data name=">>label13.Name" xml:space="preserve">
+ <value>label13</value>
+ </data>
+ <data name=">>label13.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label13.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label13.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+ <value>127, 121</value>
+ </data>
+ <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+ <value>265, 21</value>
+ </data>
+ <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name=">>txtRemarks.Name" xml:space="preserve">
+ <value>txtRemarks</value>
+ </data>
+ <data name=">>txtRemarks.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtRemarks.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtRemarks.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 125</value>
+ </data>
+ <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>95, 12</value>
+ </data>
+ <data name="label6.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="label6.Text" xml:space="preserve">
+ <value>Alias (remarks)</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name=">>label6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label6.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+ <value>127, 91</value>
+ </data>
+ <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
+ <value>*</value>
+ </data>
+ <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+ <value>265, 21</value>
+ </data>
+ <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name=">>txtId.Name" xml:space="preserve">
+ <value>txtId</value>
+ </data>
+ <data name=">>txtId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtId.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 93</value>
+ </data>
+ <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>53, 12</value>
+ </data>
+ <data name="label3.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="label3.Text" xml:space="preserve">
+ <value>Password</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>10</value>
+ </data>
+ <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+ <value>127, 59</value>
+ </data>
+ <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+ <value>194, 21</value>
</data>
<data name="txtPort.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
+ <data name=">>txtPort.Name" xml:space="preserve">
+ <value>txtPort</value>
+ </data>
+ <data name=">>txtPort.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtPort.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtPort.ZOrder" xml:space="preserve">
+ <value>11</value>
+ </data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 62</value>
+ </data>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>71, 12</value>
+ </data>
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Server port</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>12</value>
+ </data>
+ <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+ <value>127, 27</value>
+ </data>
+ <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+ <value>359, 21</value>
+ </data>
+ <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name=">>txtAddress.Name" xml:space="preserve">
+ <value>txtAddress</value>
+ </data>
+ <data name=">>txtAddress.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtAddress.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtAddress.ZOrder" xml:space="preserve">
+ <value>13</value>
+ </data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 31</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>89, 12</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>Server address</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>14</value>
+ </data>
+ <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 10</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>547, 221</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Server</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+ <value>303, 17</value>
+ </data>
+ <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="btnOK.Text" xml:space="preserve">
+ <value>&OK</value>
+ </data>
+ <data name=">>btnOK.Name" xml:space="preserve">
+ <value>btnOK</value>
+ </data>
+ <data name=">>btnOK.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnOK.Parent" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>btnOK.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 231</value>
+ </data>
+ <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>547, 60</value>
+ </data>
+ <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name=">>panel2.Name" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>panel2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panel2.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>panel2.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
+ </data>
+ <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>547, 10</value>
+ </data>
+ <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name=">>panel1.Name" xml:space="preserve">
+ <value>panel1</value>
+ </data>
+ <data name=">>panel1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panel1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>panel1.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>zh-Hans</value>
- </metadata>
+ <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+ <value>6, 12</value>
+ </data>
+ <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+ <value>547, 291</value>
+ </data>
+ <data name="$this.Text" xml:space="preserve">
+ <value>Edit or add a [Trojan] server</value>
+ </data>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>AddServer6Form</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
index 22f776c2..3f862d35 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
@@ -34,6 +34,7 @@
this.btnGUID = new System.Windows.Forms.Button();
this.label13 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label25 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
this.panTlsMore = new System.Windows.Forms.Panel();
@@ -80,7 +81,6 @@
this.MenuItemImportServer = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.MenuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
- this.label25 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panTlsMore.SuspendLayout();
@@ -157,6 +157,11 @@
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
+ // label25
+ //
+ resources.ApplyResources(this.label25, "label25");
+ this.label25.Name = "label25";
+ //
// label24
//
resources.ApplyResources(this.label24, "label24");
@@ -326,7 +331,8 @@
resources.GetString("cmbSecurity.Items"),
resources.GetString("cmbSecurity.Items1"),
resources.GetString("cmbSecurity.Items2"),
- resources.GetString("cmbSecurity.Items3")});
+ resources.GetString("cmbSecurity.Items3"),
+ resources.GetString("cmbSecurity.Items4")});
resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
this.cmbSecurity.Name = "cmbSecurity";
//
@@ -444,11 +450,6 @@
resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard");
this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click);
//
- // label25
- //
- resources.ApplyResources(this.label25, "label25");
- this.label25.Name = "label25";
- //
// AddServerForm
//
resources.ApplyResources(this, "$this");
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx
index 7e9939e7..8289c639 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -143,6 +143,226 @@
<data name=">>btnClose.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name=">>btnGUID.Name" xml:space="preserve">
+ <value>btnGUID</value>
+ </data>
+ <data name=">>btnGUID.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnGUID.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>btnGUID.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>label13.Name" xml:space="preserve">
+ <value>label13</value>
+ </data>
+ <data name=">>label13.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label13.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label13.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>groupBox2.Name" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>groupBox2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>label8.Name" xml:space="preserve">
+ <value>label8</value>
+ </data>
+ <data name=">>label8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label8.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label8.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>cmbSecurity.Name" xml:space="preserve">
+ <value>cmbSecurity</value>
+ </data>
+ <data name=">>cmbSecurity.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbSecurity.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>cmbSecurity.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name=">>txtRemarks.Name" xml:space="preserve">
+ <value>txtRemarks</value>
+ </data>
+ <data name=">>txtRemarks.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtRemarks.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtRemarks.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name=">>label6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label6.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name=">>label5.Name" xml:space="preserve">
+ <value>label5</value>
+ </data>
+ <data name=">>label5.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label5.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label5.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>txtAlterId.Name" xml:space="preserve">
+ <value>txtAlterId</value>
+ </data>
+ <data name=">>txtAlterId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtAlterId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtAlterId.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name=">>txtId.Name" xml:space="preserve">
+ <value>txtId</value>
+ </data>
+ <data name=">>txtId.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtId.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtId.ZOrder" xml:space="preserve">
+ <value>10</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>11</value>
+ </data>
+ <data name=">>txtPort.Name" xml:space="preserve">
+ <value>txtPort</value>
+ </data>
+ <data name=">>txtPort.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtPort.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtPort.ZOrder" xml:space="preserve">
+ <value>12</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>13</value>
+ </data>
+ <data name=">>txtAddress.Name" xml:space="preserve">
+ <value>txtAddress</value>
+ </data>
+ <data name=">>txtAddress.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtAddress.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtAddress.ZOrder" xml:space="preserve">
+ <value>14</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>15</value>
+ </data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 35</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>729, 499</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Server</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="btnGUID.Location" type="System.Drawing.Point, System.Drawing">
<value>411, 83</value>
</data>
@@ -171,7 +391,7 @@
<value>True</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
- <value>285, 175</value>
+ <value>411, 175</value>
</data>
<data name="label13.Size" type="System.Drawing.Size, System.Drawing">
<value>113, 12</value>
@@ -194,10 +414,288 @@
<data name=">>label13.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name=">>label25.Name" xml:space="preserve">
+ <value>label25</value>
+ </data>
+ <data name=">>label25.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label25.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label25.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>label24.Name" xml:space="preserve">
+ <value>label24</value>
+ </data>
+ <data name=">>label24.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label24.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label24.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>label23.Name" xml:space="preserve">
+ <value>label23</value>
+ </data>
+ <data name=">>label23.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label23.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label23.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>panTlsMore.Name" xml:space="preserve">
+ <value>panTlsMore</value>
+ </data>
+ <data name=">>panTlsMore.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panTlsMore.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>panTlsMore.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>label9.Name" xml:space="preserve">
+ <value>label9</value>
+ </data>
+ <data name=">>label9.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label9.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label9.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name=">>label20.Name" xml:space="preserve">
+ <value>label20</value>
+ </data>
+ <data name=">>label20.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label20.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label20.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name=">>txtPath.Name" xml:space="preserve">
+ <value>txtPath</value>
+ </data>
+ <data name=">>txtPath.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtPath.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>txtPath.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name=">>cmbNetwork.Name" xml:space="preserve">
+ <value>cmbNetwork</value>
+ </data>
+ <data name=">>cmbNetwork.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbNetwork.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>cmbNetwork.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>label7.Name" xml:space="preserve">
+ <value>label7</value>
+ </data>
+ <data name=">>label7.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label7.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label7.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name=">>label19.Name" xml:space="preserve">
+ <value>label19</value>
+ </data>
+ <data name=">>label19.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label19.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label19.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name=">>label18.Name" xml:space="preserve">
+ <value>label18</value>
+ </data>
+ <data name=">>label18.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label18.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label18.ZOrder" xml:space="preserve">
+ <value>10</value>
+ </data>
+ <data name=">>label17.Name" xml:space="preserve">
+ <value>label17</value>
+ </data>
+ <data name=">>label17.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label17.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label17.ZOrder" xml:space="preserve">
+ <value>11</value>
+ </data>
+ <data name=">>label16.Name" xml:space="preserve">
+ <value>label16</value>
+ </data>
+ <data name=">>label16.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label16.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label16.ZOrder" xml:space="preserve">
+ <value>12</value>
+ </data>
+ <data name=">>label14.Name" xml:space="preserve">
+ <value>label14</value>
+ </data>
+ <data name=">>label14.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label14.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label14.ZOrder" xml:space="preserve">
+ <value>13</value>
+ </data>
+ <data name=">>label15.Name" xml:space="preserve">
+ <value>label15</value>
+ </data>
+ <data name=">>label15.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label15.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label15.ZOrder" xml:space="preserve">
+ <value>14</value>
+ </data>
+ <data name=">>cmbStreamSecurity.Name" xml:space="preserve">
+ <value>cmbStreamSecurity</value>
+ </data>
+ <data name=">>cmbStreamSecurity.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbStreamSecurity.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>cmbStreamSecurity.ZOrder" xml:space="preserve">
+ <value>15</value>
+ </data>
+ <data name=">>label12.Name" xml:space="preserve">
+ <value>label12</value>
+ </data>
+ <data name=">>label12.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label12.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label12.ZOrder" xml:space="preserve">
+ <value>16</value>
+ </data>
+ <data name=">>txtRequestHost.Name" xml:space="preserve">
+ <value>txtRequestHost</value>
+ </data>
+ <data name=">>txtRequestHost.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtRequestHost.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>txtRequestHost.ZOrder" xml:space="preserve">
+ <value>17</value>
+ </data>
+ <data name=">>label11.Name" xml:space="preserve">
+ <value>label11</value>
+ </data>
+ <data name=">>label11.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label11.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label11.ZOrder" xml:space="preserve">
+ <value>18</value>
+ </data>
+ <data name=">>label10.Name" xml:space="preserve">
+ <value>label10</value>
+ </data>
+ <data name=">>label10.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label10.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>label10.ZOrder" xml:space="preserve">
+ <value>19</value>
+ </data>
+ <data name=">>cmbHeaderType.Name" xml:space="preserve">
+ <value>cmbHeaderType</value>
+ </data>
+ <data name=">>cmbHeaderType.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbHeaderType.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>cmbHeaderType.ZOrder" xml:space="preserve">
+ <value>20</value>
+ </data>
+ <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 215</value>
+ </data>
+ <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>723, 281</value>
+ </data>
+ <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+ <value>21</value>
+ </data>
+ <data name="groupBox2.Text" xml:space="preserve">
+ <value>Transport</value>
+ </data>
+ <data name=">>groupBox2.Name" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>groupBox2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
<data name="label25.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label25.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -285,11 +783,80 @@
<data name=">>label23.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name=">>txtSNI.Name" xml:space="preserve">
+ <value>txtSNI</value>
+ </data>
+ <data name=">>txtSNI.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtSNI.Parent" xml:space="preserve">
+ <value>panTlsMore</value>
+ </data>
+ <data name=">>txtSNI.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>label22.Name" xml:space="preserve">
+ <value>label22</value>
+ </data>
+ <data name=">>label22.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label22.Parent" xml:space="preserve">
+ <value>panTlsMore</value>
+ </data>
+ <data name=">>label22.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>label21.Name" xml:space="preserve">
+ <value>label21</value>
+ </data>
+ <data name=">>label21.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label21.Parent" xml:space="preserve">
+ <value>panTlsMore</value>
+ </data>
+ <data name=">>label21.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>cmbAllowInsecure.Name" xml:space="preserve">
+ <value>cmbAllowInsecure</value>
+ </data>
+ <data name=">>cmbAllowInsecure.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbAllowInsecure.Parent" xml:space="preserve">
+ <value>panTlsMore</value>
+ </data>
+ <data name=">>cmbAllowInsecure.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
+ <value>200, 234</value>
+ </data>
+ <data name="panTlsMore.Size" type="System.Drawing.Size, System.Drawing">
+ <value>500, 35</value>
+ </data>
+ <data name="panTlsMore.TabIndex" type="System.Int32, mscorlib">
+ <value>33</value>
+ </data>
+ <data name=">>panTlsMore.Name" xml:space="preserve">
+ <value>panTlsMore</value>
+ </data>
+ <data name=">>panTlsMore.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panTlsMore.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>panTlsMore.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
<data name="txtSNI.Location" type="System.Drawing.Point, System.Drawing">
<value>300, 7</value>
</data>
<data name="txtSNI.Size" type="System.Drawing.Size, System.Drawing">
- <value>200, 21</value>
+ <value>197, 21</value>
</data>
<data name="txtSNI.TabIndex" type="System.Int32, mscorlib">
<value>33</value>
@@ -393,27 +960,6 @@
<data name=">>cmbAllowInsecure.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
- <value>200, 234</value>
- </data>
- <data name="panTlsMore.Size" type="System.Drawing.Size, System.Drawing">
- <value>500, 35</value>
- </data>
- <data name="panTlsMore.TabIndex" type="System.Int32, mscorlib">
- <value>33</value>
- </data>
- <data name=">>panTlsMore.Name" xml:space="preserve">
- <value>panTlsMore</value>
- </data>
- <data name=">>panTlsMore.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>panTlsMore.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>panTlsMore.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
<data name="label9.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@@ -894,38 +1440,11 @@
<data name=">>cmbHeaderType.ZOrder" xml:space="preserve">
<value>20</value>
</data>
- <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Bottom</value>
- </data>
- <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
- <value>3, 215</value>
- </data>
- <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>723, 281</value>
- </data>
- <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
- <value>21</value>
- </data>
- <data name="groupBox2.Text" xml:space="preserve">
- <value>Transport</value>
- </data>
- <data name=">>groupBox2.Name" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>groupBox2.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox2.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox2.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
- <value>353, 147</value>
+ <value>411, 147</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>119, 12</value>
@@ -960,11 +1479,14 @@
<data name="cmbSecurity.Items3" xml:space="preserve">
<value>none</value>
</data>
+ <data name="cmbSecurity.Items4" xml:space="preserve">
+ <value>zero</value>
+ </data>
<data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
<value>195, 143</value>
</data>
<data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
- <value>143, 20</value>
+ <value>210, 20</value>
</data>
<data name="cmbSecurity.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -985,7 +1507,7 @@
<value>127, 171</value>
</data>
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
- <value>143, 21</value>
+ <value>278, 21</value>
</data>
<data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@@ -1248,45 +1770,6 @@
<data name=">>label1.ZOrder" xml:space="preserve">
<value>15</value>
</data>
- <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 35</value>
- </data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>729, 499</value>
- </data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>Server</value>
- </data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
- <value>303, 17</value>
- </data>
- <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
- <value>75, 23</value>
- </data>
- <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name="btnOK.Text" xml:space="preserve">
- <value>&OK</value>
- </data>
<data name=">>btnOK.Name" xml:space="preserve">
<value>btnOK</value>
</data>
@@ -1323,6 +1806,30 @@
<data name=">>panel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+ <value>303, 17</value>
+ </data>
+ <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="btnOK.Text" xml:space="preserve">
+ <value>&OK</value>
+ </data>
+ <data name=">>btnOK.Name" xml:space="preserve">
+ <value>btnOK</value>
+ </data>
+ <data name=">>btnOK.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnOK.Parent" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>btnOK.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
</data>
@@ -1350,33 +1857,6 @@
<metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
- <value>237, 22</value>
- </data>
- <data name="MenuItemImportClient.Text" xml:space="preserve">
- <value>Import client configuration</value>
- </data>
- <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
- <value>237, 22</value>
- </data>
- <data name="MenuItemImportServer.Text" xml:space="preserve">
- <value>Import server configuration</value>
- </data>
- <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
- <value>234, 6</value>
- </data>
- <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
- <value>237, 22</value>
- </data>
- <data name="MenuItemImportClipboard.Text" xml:space="preserve">
- <value>Import URL from clipboard</value>
- </data>
- <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
- <value>162, 21</value>
- </data>
- <data name="MenuItem1.Text" xml:space="preserve">
- <value>Import configuration file</value>
- </data>
<data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@@ -1398,6 +1878,36 @@
<data name=">>menuServer.ZOrder" xml:space="preserve">
<value>3</value>
</data>
+ <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>162, 21</value>
+ </data>
+ <data name="MenuItem1.Text" xml:space="preserve">
+ <value>Import configuration file</value>
+ </data>
+ <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
+ <value>237, 22</value>
+ </data>
+ <data name="MenuItemImportClient.Text" xml:space="preserve">
+ <value>Import client configuration</value>
+ </data>
+ <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
+ <value>237, 22</value>
+ </data>
+ <data name="MenuItemImportServer.Text" xml:space="preserve">
+ <value>Import server configuration</value>
+ </data>
+ <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>234, 6</value>
+ </data>
+ <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+ <value>237, 22</value>
+ </data>
+ <data name="MenuItemImportClipboard.Text" xml:space="preserve">
+ <value>Import URL from clipboard</value>
+ </data>
+ <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>zh-CN</value>
+ </metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
index ddbc4857..8a2f03e2 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -92,31 +92,32 @@
//
// btnClose
//
- this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
resources.ApplyResources(this.btnClose, "btnClose");
+ this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// tabControl1
//
+ resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage6);
this.tabControl1.Controls.Add(this.tabPage7);
- resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
//
// tabPage1
//
- this.tabPage1.Controls.Add(this.groupBox1);
resources.ApplyResources(this.tabPage1, "tabPage1");
+ this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Name = "tabPage1";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox1
//
+ resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.chkdefAllowInsecure);
this.groupBox1.Controls.Add(this.chksniffingEnabled2);
this.groupBox1.Controls.Add(this.chksniffingEnabled);
@@ -134,7 +135,6 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtlocalPort);
this.groupBox1.Controls.Add(this.label2);
- resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
@@ -177,12 +177,12 @@
//
// cmbprotocol2
//
+ resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbprotocol2.FormattingEnabled = true;
this.cmbprotocol2.Items.AddRange(new object[] {
resources.GetString("cmbprotocol2.Items"),
resources.GetString("cmbprotocol2.Items1")});
- resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
this.cmbprotocol2.Name = "cmbprotocol2";
//
// label3
@@ -197,8 +197,8 @@
//
// cmbprotocol
//
- this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
+ this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbprotocol.FormattingEnabled = true;
this.cmbprotocol.Items.AddRange(new object[] {
resources.GetString("cmbprotocol.Items"),
@@ -224,6 +224,7 @@
//
// cmbloglevel
//
+ resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbloglevel.FormattingEnabled = true;
this.cmbloglevel.Items.AddRange(new object[] {
@@ -232,7 +233,6 @@
resources.GetString("cmbloglevel.Items2"),
resources.GetString("cmbloglevel.Items3"),
resources.GetString("cmbloglevel.Items4")});
- resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
this.cmbloglevel.Name = "cmbloglevel";
//
// label5
@@ -252,10 +252,10 @@
//
// tabPage2
//
+ resources.ApplyResources(this.tabPage2, "tabPage2");
this.tabPage2.Controls.Add(this.linkDnsObjectDoc);
this.tabPage2.Controls.Add(this.txtremoteDNS);
this.tabPage2.Controls.Add(this.label14);
- resources.ApplyResources(this.tabPage2, "tabPage2");
this.tabPage2.Name = "tabPage2";
this.tabPage2.UseVisualStyleBackColor = true;
//
@@ -278,6 +278,7 @@
//
// tabPage6
//
+ resources.ApplyResources(this.tabPage6, "tabPage6");
this.tabPage6.Controls.Add(this.chkKcpcongestion);
this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
this.tabPage6.Controls.Add(this.label10);
@@ -291,7 +292,6 @@
this.tabPage6.Controls.Add(this.label7);
this.tabPage6.Controls.Add(this.txtKcpmtu);
this.tabPage6.Controls.Add(this.label6);
- resources.ApplyResources(this.tabPage6, "tabPage6");
this.tabPage6.Name = "tabPage6";
this.tabPage6.UseVisualStyleBackColor = true;
//
@@ -363,6 +363,7 @@
//
// tabPage7
//
+ resources.ApplyResources(this.tabPage7, "tabPage7");
this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore);
this.tabPage7.Controls.Add(this.cmbCoreType);
this.tabPage7.Controls.Add(this.label4);
@@ -372,7 +373,6 @@
this.tabPage7.Controls.Add(this.chkEnableStatistics);
this.tabPage7.Controls.Add(this.chkAllowLANConn);
this.tabPage7.Controls.Add(this.chkAutoRun);
- resources.ApplyResources(this.tabPage7, "tabPage7");
this.tabPage7.Name = "tabPage7";
this.tabPage7.UseVisualStyleBackColor = true;
//
@@ -384,12 +384,12 @@
//
// cmbCoreType
//
+ resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
this.cmbCoreType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCoreType.FormattingEnabled = true;
this.cmbCoreType.Items.AddRange(new object[] {
resources.GetString("cmbCoreType.Items"),
resources.GetString("cmbCoreType.Items1")});
- resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
this.cmbCoreType.Name = "cmbCoreType";
//
// label4
@@ -405,9 +405,9 @@
//
// cbFreshrate
//
+ resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbFreshrate.FormattingEnabled = true;
- resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
this.cbFreshrate.Name = "cbFreshrate";
//
// lbFreshrate
@@ -435,9 +435,9 @@
//
// panel2
//
+ resources.ApplyResources(this.panel2, "panel2");
this.panel2.Controls.Add(this.btnClose);
this.panel2.Controls.Add(this.btnOK);
- resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
//
// btnOK
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
index 4ce51c06..99b34537 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
@@ -117,1420 +117,1423 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
- <value>355, 16</value>
- </data>
- <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
- <value>75, 23</value>
- </data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
- </data>
- <data name="btnClose.Text" xml:space="preserve">
- <value>&Cancel</value>
- </data>
- <data name=">>btnClose.Name" xml:space="preserve">
- <value>btnClose</value>
- </data>
- <data name=">>btnClose.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>btnClose.Parent" xml:space="preserve">
- <value>panel2</value>
- </data>
- <data name=">>btnClose.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="chkdefAllowInsecure.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="chkdefAllowInsecure.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="chkdefAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 192</value>
- </data>
- <data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
- <value>102, 16</value>
- </data>
- <data name="chkdefAllowInsecure.TabIndex" type="System.Int32, mscorlib">
- <value>35</value>
- </data>
- <data name="chkdefAllowInsecure.Text" xml:space="preserve">
- <value>allowInsecure</value>
- </data>
- <data name=">>chkdefAllowInsecure.Name" xml:space="preserve">
- <value>chkdefAllowInsecure</value>
- </data>
- <data name=">>chkdefAllowInsecure.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkdefAllowInsecure.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chkdefAllowInsecure.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="chksniffingEnabled2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chksniffingEnabled2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="chksniffingEnabled2.Location" type="System.Drawing.Point, System.Drawing">
- <value>468, 60</value>
- </data>
- <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
- <value>120, 16</value>
- </data>
- <data name="chksniffingEnabled2.TabIndex" type="System.Int32, mscorlib">
- <value>32</value>
- </data>
- <data name="chksniffingEnabled2.Text" xml:space="preserve">
- <value>Turn on Sniffing</value>
- </data>
- <data name="chksniffingEnabled2.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name=">>chksniffingEnabled2.Name" xml:space="preserve">
- <value>chksniffingEnabled2</value>
- </data>
- <data name=">>chksniffingEnabled2.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chksniffingEnabled2.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chksniffingEnabled2.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="chksniffingEnabled.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chksniffingEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="chksniffingEnabled.Location" type="System.Drawing.Point, System.Drawing">
- <value>468, 27</value>
- </data>
- <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
- <value>120, 16</value>
- </data>
- <data name="chksniffingEnabled.TabIndex" type="System.Int32, mscorlib">
- <value>31</value>
- </data>
- <data name="chksniffingEnabled.Text" xml:space="preserve">
- <value>Turn on Sniffing</value>
- </data>
- <data name=">>chksniffingEnabled.Name" xml:space="preserve">
- <value>chksniffingEnabled</value>
- </data>
- <data name=">>chksniffingEnabled.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chksniffingEnabled.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chksniffingEnabled.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="chkmuxEnabled.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkmuxEnabled.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 129</value>
- </data>
- <data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
- <value>174, 16</value>
- </data>
- <data name="chkmuxEnabled.TabIndex" type="System.Int32, mscorlib">
- <value>20</value>
- </data>
- <data name="chkmuxEnabled.Text" xml:space="preserve">
- <value>Turn on Mux Multiplexing </value>
- </data>
- <data name=">>chkmuxEnabled.Name" xml:space="preserve">
- <value>chkmuxEnabled</value>
- </data>
- <data name=">>chkmuxEnabled.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkmuxEnabled.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chkmuxEnabled.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
<data name="chkAllowIn2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="chkAllowIn2.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 63</value>
+ <data name="cmbCoreType.Items1" xml:space="preserve">
+ <value>Xray_core</value>
</data>
- <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
- <value>120, 16</value>
+ <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
</data>
- <data name="chkAllowIn2.TabIndex" type="System.Int32, mscorlib">
- <value>19</value>
+ <data name=">>txtremoteDNS.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="chkAllowIn2.Text" xml:space="preserve">
- <value>listening port 2</value>
+ <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
+ <value>Keep older when deduplication</value>
</data>
- <data name="chkAllowIn2.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
- <data name=">>chkAllowIn2.Name" xml:space="preserve">
- <value>chkAllowIn2</value>
+ <data name="chklogEnabled.Text" xml:space="preserve">
+ <value>Record local logs</value>
</data>
- <data name=">>chkAllowIn2.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>chkIgnoreGeoUpdateCore.Parent" xml:space="preserve">
+ <value>tabPage7</value>
</data>
- <data name=">>chkAllowIn2.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chkAllowIn2.ZOrder" xml:space="preserve">
+ <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
- <data name="chkudpEnabled2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>0</value>
</data>
- <data name="chkudpEnabled2.Location" type="System.Drawing.Point, System.Drawing">
- <value>369, 62</value>
+ <data name=">>txtKcpwriteBufferSize.Name" xml:space="preserve">
+ <value>txtKcpwriteBufferSize</value>
</data>
- <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
- <value>84, 16</value>
- </data>
- <data name="chkudpEnabled2.TabIndex" type="System.Int32, mscorlib">
- <value>18</value>
- </data>
- <data name="chkudpEnabled2.Text" xml:space="preserve">
- <value>Enable UDP</value>
- </data>
- <data name="chkudpEnabled2.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name=">>chkudpEnabled2.Name" xml:space="preserve">
- <value>chkudpEnabled2</value>
- </data>
- <data name=">>chkudpEnabled2.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkudpEnabled2.Parent" xml:space="preserve">
+ <data name=">>txtlocalPort.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name=">>chkudpEnabled2.ZOrder" xml:space="preserve">
+ <data name=">>lbFreshrate.ZOrder" xml:space="preserve">
<value>5</value>
</data>
- <data name="cmbprotocol2.Items" xml:space="preserve">
- <value>socks</value>
+ <data name="label7.Text" xml:space="preserve">
+ <value>tti</value>
</data>
- <data name="cmbprotocol2.Items1" xml:space="preserve">
- <value>http</value>
+ <data name=">>label5.ZOrder" xml:space="preserve">
+ <value>14</value>
</data>
- <data name="cmbprotocol2.Location" type="System.Drawing.Point, System.Drawing">
- <value>257, 60</value>
+ <data name=">>chkAllowLANConn.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="cmbprotocol2.Size" type="System.Drawing.Size, System.Drawing">
- <value>97, 20</value>
+ <data name=">>tabPage6.Parent" xml:space="preserve">
+ <value>tabControl1</value>
</data>
- <data name="cmbprotocol2.TabIndex" type="System.Int32, mscorlib">
- <value>17</value>
- </data>
- <data name="cmbprotocol2.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name=">>cmbprotocol2.Name" xml:space="preserve">
- <value>cmbprotocol2</value>
- </data>
- <data name=">>cmbprotocol2.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>cmbprotocol2.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>cmbprotocol2.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>206, 64</value>
- </data>
- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>53, 12</value>
- </data>
- <data name="label3.TabIndex" type="System.Int32, mscorlib">
- <value>16</value>
- </data>
- <data name="label3.Text" xml:space="preserve">
- <value>protocol</value>
- </data>
- <data name="label3.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
- </data>
- <data name=">>label3.Name" xml:space="preserve">
- <value>label3</value>
- </data>
- <data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>label10.Name" xml:space="preserve">
+ <value>label10</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name=">>label3.ZOrder" xml:space="preserve">
- <value>7</value>
+ <data name="txtKcpuplinkCapacity.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
</data>
- <data name="txtlocalPort2.Location" type="System.Drawing.Point, System.Drawing">
- <value>124, 60</value>
+ <data name=">>chkudpEnabled.Parent" xml:space="preserve">
+ <value>groupBox1</value>
</data>
- <data name="txtlocalPort2.Size" type="System.Drawing.Size, System.Drawing">
- <value>78, 21</value>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+ <value>662, 523</value>
</data>
- <data name="txtlocalPort2.TabIndex" type="System.Int32, mscorlib">
+ <data name="label4.TabIndex" type="System.Int32, mscorlib">
+ <value>35</value>
+ </data>
+ <data name=">>panel2.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="chksniffingEnabled2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>468, 60</value>
+ </data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
+ </data>
+ <data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+ <value>102, 16</value>
+ </data>
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
- <data name="txtlocalPort2.Visible" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>12</value>
</data>
- <data name=">>txtlocalPort2.Name" xml:space="preserve">
- <value>txtlocalPort2</value>
+ <data name="lbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
+ <value>30, 88</value>
+ </data>
+ <data name="txtKcpreadBufferSize.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 100</value>
+ </data>
+ <data name="label14.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>label14.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label8.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
+ <value>84, 16</value>
+ </data>
+ <data name="linkDnsObjectDoc.TabIndex" type="System.Int32, mscorlib">
+ <value>40</value>
+ </data>
+ <data name="chkEnableStatistics.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
+ <value>120, 16</value>
+ </data>
+ <data name="chksniffingEnabled2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
+ <value>234, 16</value>
+ </data>
+ <data name="tabPage6.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name=">>chksniffingEnabled2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkIgnoreGeoUpdateCore.TabIndex" type="System.Int32, mscorlib">
+ <value>36</value>
+ </data>
+ <data name=">>txtKcpuplinkCapacity.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>chkAutoRun.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name="label11.TabIndex" type="System.Int32, mscorlib">
+ <value>12</value>
+ </data>
+ <data name=">>label7.Name" xml:space="preserve">
+ <value>label7</value>
+ </data>
+ <data name="cmbprotocol2.Items1" xml:space="preserve">
+ <value>http</value>
+ </data>
+ <data name="txtKcptti.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name=">>chkdefAllowInsecure.Name" xml:space="preserve">
+ <value>chkdefAllowInsecure</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>648, 421</value>
+ </data>
+ <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>206, 64</value>
+ </data>
+ <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
+ <value>95, 12</value>
+ </data>
+ <data name=">>txtKcpdownlinkCapacity.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name="chkAllowIn2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 63</value>
+ </data>
+ <data name=">>tabPage6.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="chkudpEnabled2.Text" xml:space="preserve">
+ <value>Enable UDP</value>
</data>
<data name=">>txtlocalPort2.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>txtlocalPort2.Parent" xml:space="preserve">
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="btnClose.Text" xml:space="preserve">
+ <value>&Cancel</value>
+ </data>
+ <data name="txtKcpuplinkCapacity.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 62</value>
+ </data>
+ <data name=">>label5.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name=">>txtlocalPort2.ZOrder" xml:space="preserve">
- <value>8</value>
+ <data name=">>chkudpEnabled2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="cmbprotocol.Enabled" type="System.Boolean, mscorlib">
- <value>False</value>
+ <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>662, 10</value>
</data>
- <data name="cmbprotocol.Items" xml:space="preserve">
- <value>socks</value>
+ <data name="$this.Text" xml:space="preserve">
+ <value>Settings</value>
</data>
- <data name="cmbprotocol.Items1" xml:space="preserve">
- <value>http</value>
+ <data name=">>chkAllowIn2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="cmbprotocol.Location" type="System.Drawing.Point, System.Drawing">
- <value>257, 25</value>
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
</data>
- <data name="cmbprotocol.Size" type="System.Drawing.Size, System.Drawing">
- <value>97, 20</value>
+ <data name=">>txtKcpmtu.Name" xml:space="preserve">
+ <value>txtKcpmtu</value>
</data>
- <data name="cmbprotocol.TabIndex" type="System.Int32, mscorlib">
+ <data name=">>lbFreshrate.Name" xml:space="preserve">
+ <value>lbFreshrate</value>
+ </data>
+ <data name=">>chklogEnabled.ZOrder" xml:space="preserve">
<value>12</value>
</data>
- <data name=">>cmbprotocol.Name" xml:space="preserve">
- <value>cmbprotocol</value>
- </data>
- <data name=">>cmbprotocol.Type" xml:space="preserve">
+ <data name=">>cmbCoreType.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>cmbprotocol.Parent" xml:space="preserve">
+ <data name=">>label11.Name" xml:space="preserve">
+ <value>label11</value>
+ </data>
+ <data name="chkEnableStatistics.TabIndex" type="System.Int32, mscorlib">
+ <value>29</value>
+ </data>
+ <data name="chkIgnoreGeoUpdateCore.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 10</value>
+ </data>
+ <data name="cbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+ <value>58, 20</value>
+ </data>
+ <data name="linkDnsObjectDoc.Text" xml:space="preserve">
+ <value>Support DnsObject</value>
+ </data>
+ <data name=">>txtKcpwriteBufferSize.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name="chksniffingEnabled2.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name=">>chksniffingEnabled.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name=">>cmbprotocol.ZOrder" xml:space="preserve">
- <value>9</value>
+ <data name=">>tabControl1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>chkmuxEnabled.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>chkAllowLANConn.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>label7.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="lbFreshrate.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name=">>lbFreshrate.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name="chkAllowIn2.TabIndex" type="System.Int32, mscorlib">
+ <value>19</value>
+ </data>
+ <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+ <value>576, 16</value>
+ </data>
+ <data name="chkudpEnabled2.TabIndex" type="System.Int32, mscorlib">
+ <value>18</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>206, 29</value>
- </data>
- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>53, 12</value>
- </data>
- <data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
- </data>
- <data name="label1.Text" xml:space="preserve">
- <value>protocol</value>
- </data>
- <data name=">>label1.Name" xml:space="preserve">
- <value>label1</value>
- </data>
- <data name=">>label1.Type" xml:space="preserve">
+ <data name=">>label10.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>label1.Parent" xml:space="preserve">
+ <data name="chkAllowLANConn.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 40</value>
+ </data>
+ <data name="chkKcpcongestion.Text" xml:space="preserve">
+ <value>congestion</value>
+ </data>
+ <data name="chkdefAllowInsecure.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name=">>btnClose.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtKcptti.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>89, 12</value>
+ </data>
+ <data name="cmbloglevel.Items1" xml:space="preserve">
+ <value>info</value>
+ </data>
+ <data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>chkEnableStatistics.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name="tabPage7.Text" xml:space="preserve">
+ <value>v2rayN settings</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>16</value>
+ </data>
+ <data name=">>chkdefAllowInsecure.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
<value>10</value>
</data>
- <data name="chkudpEnabled.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="chksniffingEnabled2.TabIndex" type="System.Int32, mscorlib">
+ <value>32</value>
</data>
- <data name="chkudpEnabled.Location" type="System.Drawing.Point, System.Drawing">
- <value>369, 27</value>
+ <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+ <value>6, 12</value>
</data>
- <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
- <value>84, 16</value>
- </data>
- <data name="chkudpEnabled.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name="chkudpEnabled.Text" xml:space="preserve">
- <value>Enable UDP</value>
- </data>
- <data name=">>chkudpEnabled.Name" xml:space="preserve">
- <value>chkudpEnabled</value>
- </data>
- <data name=">>chkudpEnabled.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkudpEnabled.Parent" xml:space="preserve">
+ <data name=">>chkudpEnabled2.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
- <data name=">>chkudpEnabled.ZOrder" xml:space="preserve">
- <value>11</value>
- </data>
- <data name="chklogEnabled.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chklogEnabled.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 160</value>
- </data>
- <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
- <value>126, 16</value>
- </data>
- <data name="chklogEnabled.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
- </data>
- <data name="chklogEnabled.Text" xml:space="preserve">
- <value>Record local logs</value>
- </data>
- <data name=">>chklogEnabled.Name" xml:space="preserve">
- <value>chklogEnabled</value>
- </data>
- <data name=">>chklogEnabled.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chklogEnabled.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>chklogEnabled.ZOrder" xml:space="preserve">
- <value>12</value>
- </data>
- <data name="cmbloglevel.Items" xml:space="preserve">
- <value>debug</value>
- </data>
- <data name="cmbloglevel.Items1" xml:space="preserve">
- <value>info</value>
- </data>
- <data name="cmbloglevel.Items2" xml:space="preserve">
- <value>warning</value>
- </data>
- <data name="cmbloglevel.Items3" xml:space="preserve">
- <value>error</value>
- </data>
- <data name="cmbloglevel.Items4" xml:space="preserve">
- <value>none</value>
- </data>
- <data name="cmbloglevel.Location" type="System.Drawing.Point, System.Drawing">
- <value>257, 158</value>
- </data>
- <data name="cmbloglevel.Size" type="System.Drawing.Size, System.Drawing">
- <value>97, 20</value>
- </data>
- <data name="cmbloglevel.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
- </data>
- <data name=">>cmbloglevel.Name" xml:space="preserve">
- <value>cmbloglevel</value>
- </data>
- <data name=">>cmbloglevel.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>cmbloglevel.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>cmbloglevel.ZOrder" xml:space="preserve">
- <value>13</value>
- </data>
- <data name="label5.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
- <value>193, 162</value>
- </data>
- <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 12</value>
- </data>
- <data name="label5.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
- </data>
- <data name="label5.Text" xml:space="preserve">
- <value>Log level</value>
- </data>
- <data name=">>label5.Name" xml:space="preserve">
- <value>label5</value>
- </data>
- <data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label5.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>label5.ZOrder" xml:space="preserve">
- <value>14</value>
- </data>
- <data name="txtlocalPort.Location" type="System.Drawing.Point, System.Drawing">
- <value>124, 25</value>
- </data>
- <data name="txtlocalPort.Size" type="System.Drawing.Size, System.Drawing">
- <value>78, 21</value>
- </data>
- <data name="txtlocalPort.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name=">>txtlocalPort.Name" xml:space="preserve">
- <value>txtlocalPort</value>
- </data>
- <data name=">>txtlocalPort.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtlocalPort.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>txtlocalPort.ZOrder" xml:space="preserve">
- <value>15</value>
- </data>
- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>33, 29</value>
- </data>
- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>89, 12</value>
- </data>
- <data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="label2.Text" xml:space="preserve">
- <value>Listening port</value>
- </data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
- </data>
- <data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label2.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>label2.ZOrder" xml:space="preserve">
- <value>16</value>
- </data>
- <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>3, 3</value>
- </data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>648, 421</value>
- </data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
- </data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
- <value>tabPage1</value>
- </data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
- <value>4, 22</value>
- </data>
- <data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
- <value>3, 3, 3, 3</value>
- </data>
- <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
- <value>654, 427</value>
- </data>
- <data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="tabPage1.Text" xml:space="preserve">
- <value>Core: basic settings</value>
- </data>
- <data name=">>tabPage1.Name" xml:space="preserve">
- <value>tabPage1</value>
- </data>
- <data name=">>tabPage1.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>tabPage1.Parent" xml:space="preserve">
- <value>tabControl1</value>
- </data>
- <data name=">>tabPage1.ZOrder" xml:space="preserve">
- <value>0</value>
+ <data name=">>btnOK.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
<data name="linkDnsObjectDoc.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="linkDnsObjectDoc.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name="label9.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
</data>
- <data name="linkDnsObjectDoc.Location" type="System.Drawing.Point, System.Drawing">
- <value>342, 17</value>
- </data>
- <data name="linkDnsObjectDoc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
- <value>0, 0, 0, 0</value>
- </data>
- <data name="linkDnsObjectDoc.Size" type="System.Drawing.Size, System.Drawing">
- <value>107, 12</value>
- </data>
- <data name="linkDnsObjectDoc.TabIndex" type="System.Int32, mscorlib">
- <value>40</value>
- </data>
- <data name="linkDnsObjectDoc.Text" xml:space="preserve">
- <value>Support DnsObject</value>
- </data>
- <data name=">>linkDnsObjectDoc.Name" xml:space="preserve">
- <value>linkDnsObjectDoc</value>
- </data>
- <data name=">>linkDnsObjectDoc.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>linkDnsObjectDoc.Parent" xml:space="preserve">
- <value>tabPage2</value>
- </data>
- <data name=">>linkDnsObjectDoc.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="txtremoteDNS.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 41</value>
- </data>
- <data name="txtremoteDNS.Multiline" type="System.Boolean, mscorlib">
+ <data name="chklogEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
+ <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
+ <value>198, 16</value>
+ </data>
+ <data name="chkAutoRun.Text" xml:space="preserve">
+ <value>Automatically start at system startup</value>
+ </data>
+ <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>654, 427</value>
+ </data>
+ <data name=">>txtKcpwriteBufferSize.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>4, 4, 4, 4</value>
+ </data>
+ <data name=">>txtKcptti.Name" xml:space="preserve">
+ <value>txtKcptti</value>
+ </data>
<data name="txtremoteDNS.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
<value>Vertical</value>
</data>
- <data name="txtremoteDNS.Size" type="System.Drawing.Size, System.Drawing">
- <value>638, 356</value>
- </data>
- <data name="txtremoteDNS.TabIndex" type="System.Int32, mscorlib">
- <value>39</value>
- </data>
- <data name=">>txtremoteDNS.Name" xml:space="preserve">
- <value>txtremoteDNS</value>
- </data>
- <data name=">>txtremoteDNS.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtremoteDNS.Parent" xml:space="preserve">
- <value>tabPage2</value>
- </data>
- <data name=">>txtremoteDNS.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="label14.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 17</value>
+ <data name="chksniffingEnabled2.Text" xml:space="preserve">
+ <value>Turn on Sniffing</value>
</data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>281, 12</value>
</data>
- <data name="label14.TabIndex" type="System.Int32, mscorlib">
- <value>38</value>
+ <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
+ <value>Ignore Geo files when updating core</value>
</data>
- <data name="label14.Text" xml:space="preserve">
- <value>Custom DNS (multiple, separated by commas (,))</value>
+ <data name=">>label10.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
- <data name=">>label14.Name" xml:space="preserve">
- <value>label14</value>
+ <data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
</data>
- <data name=">>label14.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="tabPage7.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>662, 453</value>
+ </data>
+ <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>33, 29</value>
+ </data>
+ <data name="cmbCoreType.Location" type="System.Drawing.Point, System.Drawing">
+ <value>325, 130</value>
+ </data>
+ <data name="txtlocalPort2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>124, 60</value>
+ </data>
+ <data name="txtlocalPort.Size" type="System.Drawing.Size, System.Drawing">
+ <value>78, 21</value>
+ </data>
+ <data name="label5.Text" xml:space="preserve">
+ <value>Log level</value>
+ </data>
+ <data name=">>tabPage1.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 12</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+ </data>
+ <data name="cmbloglevel.Items2" xml:space="preserve">
+ <value>warning</value>
</data>
<data name=">>label14.Parent" xml:space="preserve">
<value>tabPage2</value>
</data>
- <data name=">>label14.ZOrder" xml:space="preserve">
- <value>2</value>
+ <data name=">>btnOK.Parent" xml:space="preserve">
+ <value>panel2</value>
</data>
- <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
- <value>4, 22</value>
+ <data name="lbFreshrate.Text" xml:space="preserve">
+ <value>Statistics freshrate</value>
</data>
- <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
- <value>654, 427</value>
+ <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>120, 16</value>
</data>
- <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
+ <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+ <value>89, 12</value>
</data>
- <data name="tabPage2.Text" xml:space="preserve">
- <value>Core: DNS settings</value>
+ <data name=">>btnOK.Name" xml:space="preserve">
+ <value>btnOK</value>
</data>
- <data name=">>tabPage2.Name" xml:space="preserve">
- <value>tabPage2</value>
- </data>
- <data name=">>tabPage2.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>tabPage2.Parent" xml:space="preserve">
- <value>tabControl1</value>
- </data>
- <data name=">>tabPage2.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="chkKcpcongestion.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
+ <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
+ <value>18, 66</value>
</data>
<data name="chkKcpcongestion.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 143</value>
</data>
- <data name="chkKcpcongestion.Size" type="System.Drawing.Size, System.Drawing">
- <value>84, 16</value>
+ <data name="txtKcpdownlinkCapacity.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
</data>
- <data name="chkKcpcongestion.TabIndex" type="System.Int32, mscorlib">
- <value>20</value>
+ <data name="chkmuxEnabled.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="chkKcpcongestion.Text" xml:space="preserve">
- <value>congestion</value>
- </data>
- <data name=">>chkKcpcongestion.Name" xml:space="preserve">
- <value>chkKcpcongestion</value>
- </data>
- <data name=">>chkKcpcongestion.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkKcpcongestion.Parent" xml:space="preserve">
+ <data name=">>label7.Parent" xml:space="preserve">
<value>tabPage6</value>
</data>
- <data name=">>chkKcpcongestion.ZOrder" xml:space="preserve">
+ <data name=">>label9.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name=">>txtKcpuplinkCapacity.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name="txtKcpmtu.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name="chksniffingEnabled.Text" xml:space="preserve">
+ <value>Turn on Sniffing</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+ <value>18, 28</value>
+ </data>
+ <data name=">>label11.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkmuxEnabled.TabIndex" type="System.Int32, mscorlib">
+ <value>20</value>
+ </data>
+ <data name="chkAllowLANConn.TabIndex" type="System.Int32, mscorlib">
+ <value>29</value>
+ </data>
+ <data name=">>tabPage1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="txtlocalPort2.TabIndex" type="System.Int32, mscorlib">
+ <value>14</value>
+ </data>
+ <data name=">>txtKcpdownlinkCapacity.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="label4.Text" xml:space="preserve">
+ <value>Core Type</value>
+ </data>
+ <data name="label8.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>chksniffingEnabled.Name" xml:space="preserve">
+ <value>chksniffingEnabled</value>
+ </data>
+ <data name=">>label14.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
+ <value>174, 16</value>
+ </data>
+ <data name=">>chkdefAllowInsecure.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>chkIgnoreGeoUpdateCore.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="txtKcpwriteBufferSize.Location" type="System.Drawing.Point, System.Drawing">
- <value>345, 100</value>
+ <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+ <value>18, 104</value>
+ </data>
+ <data name=">>tabPage2.Name" xml:space="preserve">
+ <value>tabPage2</value>
+ </data>
+ <data name="label6.Text" xml:space="preserve">
+ <value>mtu</value>
+ </data>
+ <data name="cmbprotocol2.Items" xml:space="preserve">
+ <value>socks</value>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>tabPage1</value>
+ </data>
+ <data name=">>groupBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtKcpmtu.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panel1.Name" xml:space="preserve">
+ <value>panel1</value>
+ </data>
+ <data name="lbFreshrate.TabIndex" type="System.Int32, mscorlib">
+ <value>30</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>53, 12</value>
+ </data>
+ <data name=">>cmbloglevel.ZOrder" xml:space="preserve">
+ <value>13</value>
+ </data>
+ <data name=">>label8.Name" xml:space="preserve">
+ <value>label8</value>
+ </data>
+ <data name="chksniffingEnabled.Location" type="System.Drawing.Point, System.Drawing">
+ <value>468, 27</value>
+ </data>
+ <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+ <value>236, 28</value>
+ </data>
+ <data name=">>chkAutoRun.Name" xml:space="preserve">
+ <value>chkAutoRun</value>
</data>
<data name="txtKcpwriteBufferSize.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 21</value>
</data>
- <data name="txtKcpwriteBufferSize.TabIndex" type="System.Int32, mscorlib">
- <value>15</value>
+ <data name="txtKcpdownlinkCapacity.Location" type="System.Drawing.Point, System.Drawing">
+ <value>345, 62</value>
</data>
- <data name=">>txtKcpwriteBufferSize.Name" xml:space="preserve">
- <value>txtKcpwriteBufferSize</value>
+ <data name=">>chkudpEnabled.ZOrder" xml:space="preserve">
+ <value>11</value>
</data>
- <data name=">>txtKcpwriteBufferSize.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="chkmuxEnabled.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 129</value>
</data>
- <data name=">>txtKcpwriteBufferSize.Parent" xml:space="preserve">
- <value>tabPage6</value>
+ <data name=">>chkudpEnabled.Name" xml:space="preserve">
+ <value>chkudpEnabled</value>
</data>
- <data name=">>txtKcpwriteBufferSize.ZOrder" xml:space="preserve">
+ <data name=">>cmbCoreType.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label10.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
- <value>236, 104</value>
- </data>
- <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
- <value>95, 12</value>
- </data>
- <data name="label10.TabIndex" type="System.Int32, mscorlib">
- <value>14</value>
- </data>
- <data name="label10.Text" xml:space="preserve">
- <value>writeBufferSize</value>
- </data>
- <data name=">>label10.Name" xml:space="preserve">
- <value>label10</value>
- </data>
- <data name=">>label10.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label10.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>label10.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="txtKcpreadBufferSize.Location" type="System.Drawing.Point, System.Drawing">
- <value>111, 100</value>
- </data>
- <data name="txtKcpreadBufferSize.Size" type="System.Drawing.Size, System.Drawing">
- <value>94, 21</value>
- </data>
- <data name="txtKcpreadBufferSize.TabIndex" type="System.Int32, mscorlib">
- <value>13</value>
- </data>
- <data name=">>txtKcpreadBufferSize.Name" xml:space="preserve">
- <value>txtKcpreadBufferSize</value>
- </data>
- <data name=">>txtKcpreadBufferSize.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtKcpreadBufferSize.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>txtKcpreadBufferSize.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name="label11.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
- <value>18, 104</value>
- </data>
- <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
- <value>89, 12</value>
- </data>
- <data name="label11.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
- </data>
- <data name="label11.Text" xml:space="preserve">
- <value>readBufferSize</value>
- </data>
- <data name=">>label11.Name" xml:space="preserve">
- <value>label11</value>
- </data>
- <data name=">>label11.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label11.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>label11.ZOrder" xml:space="preserve">
- <value>4</value>
- </data>
- <data name="txtKcpdownlinkCapacity.Location" type="System.Drawing.Point, System.Drawing">
- <value>345, 62</value>
- </data>
- <data name="txtKcpdownlinkCapacity.Size" type="System.Drawing.Size, System.Drawing">
- <value>94, 21</value>
- </data>
- <data name="txtKcpdownlinkCapacity.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
- </data>
- <data name=">>txtKcpdownlinkCapacity.Name" xml:space="preserve">
- <value>txtKcpdownlinkCapacity</value>
- </data>
- <data name=">>txtKcpdownlinkCapacity.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtKcpdownlinkCapacity.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>txtKcpdownlinkCapacity.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
- <data name="label8.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
- <value>236, 66</value>
- </data>
- <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
- <value>101, 12</value>
- </data>
- <data name="label8.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name="label8.Text" xml:space="preserve">
- <value>downlinkCapacity</value>
- </data>
- <data name=">>label8.Name" xml:space="preserve">
- <value>label8</value>
- </data>
- <data name=">>label8.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label8.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>label8.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name="txtKcpuplinkCapacity.Location" type="System.Drawing.Point, System.Drawing">
- <value>111, 62</value>
- </data>
- <data name="txtKcpuplinkCapacity.Size" type="System.Drawing.Size, System.Drawing">
- <value>94, 21</value>
- </data>
- <data name="txtKcpuplinkCapacity.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
- </data>
- <data name=">>txtKcpuplinkCapacity.Name" xml:space="preserve">
- <value>txtKcpuplinkCapacity</value>
- </data>
- <data name=">>txtKcpuplinkCapacity.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtKcpuplinkCapacity.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>txtKcpuplinkCapacity.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name="label9.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
- <value>18, 66</value>
- </data>
- <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
- <value>89, 12</value>
- </data>
- <data name="label9.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
- </data>
- <data name="label9.Text" xml:space="preserve">
- <value>uplinkCapacity</value>
+ <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 17</value>
</data>
<data name=">>label9.Name" xml:space="preserve">
<value>label9</value>
</data>
- <data name=">>label9.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label9.Parent" xml:space="preserve">
+ <data name=">>txtKcpreadBufferSize.Parent" xml:space="preserve">
<value>tabPage6</value>
</data>
- <data name=">>label9.ZOrder" xml:space="preserve">
- <value>8</value>
+ <data name=">>btnOK.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="txtKcptti.Location" type="System.Drawing.Point, System.Drawing">
- <value>345, 24</value>
+ <data name=">>txtremoteDNS.ZOrder" xml:space="preserve">
+ <value>1</value>
</data>
- <data name="txtKcptti.Size" type="System.Drawing.Size, System.Drawing">
- <value>94, 21</value>
+ <data name=">>linkDnsObjectDoc.Type" xml:space="preserve">
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="txtKcptti.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
+ <data name="chkKcpcongestion.Size" type="System.Drawing.Size, System.Drawing">
+ <value>84, 16</value>
</data>
- <data name=">>txtKcptti.Name" xml:space="preserve">
- <value>txtKcptti</value>
- </data>
- <data name=">>txtKcptti.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtKcptti.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>txtKcptti.ZOrder" xml:space="preserve">
- <value>9</value>
- </data>
- <data name="label7.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
- <value>236, 28</value>
- </data>
- <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 12</value>
+ <data name="txtKcpwriteBufferSize.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
</data>
<data name="label7.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
- <data name="label7.Text" xml:space="preserve">
- <value>tti</value>
+ <data name="cmbprotocol2.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
</data>
- <data name=">>label7.Name" xml:space="preserve">
- <value>label7</value>
+ <data name=">>label11.Parent" xml:space="preserve">
+ <value>tabPage6</value>
</data>
- <data name=">>label7.Type" xml:space="preserve">
+ <data name=">>txtlocalPort.Name" xml:space="preserve">
+ <value>txtlocalPort</value>
+ </data>
+ <data name=">>cbFreshrate.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name=">>lbFreshrate.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>label7.Parent" xml:space="preserve">
+ <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+ <value>125, 12</value>
+ </data>
+ <data name=">>label10.Parent" xml:space="preserve">
<value>tabPage6</value>
</data>
+ <data name=">>tabPage2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnClose.Name" xml:space="preserve">
+ <value>btnClose</value>
+ </data>
+ <data name="txtlocalPort.Location" type="System.Drawing.Point, System.Drawing">
+ <value>124, 25</value>
+ </data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>protocol</value>
+ </data>
+ <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 12</value>
+ </data>
+ <data name="txtremoteDNS.Size" type="System.Drawing.Size, System.Drawing">
+ <value>638, 356</value>
+ </data>
+ <data name="cmbprotocol.Items" xml:space="preserve">
+ <value>socks</value>
+ </data>
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 3</value>
+ </data>
+ <data name=">>chkAllowLANConn.Name" xml:space="preserve">
+ <value>chkAllowLANConn</value>
+ </data>
+ <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>84, 16</value>
+ </data>
+ <data name=">>tabPage7.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name="label7.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>txtKcpwriteBufferSize.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>chksniffingEnabled2.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="chkudpEnabled.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="chkudpEnabled2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>369, 62</value>
+ </data>
+ <data name="cbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
+ <value>161, 84</value>
+ </data>
+ <data name=">>cmbprotocol.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name=">>chkmuxEnabled.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
<data name=">>label7.ZOrder" xml:space="preserve">
<value>10</value>
</data>
- <data name="txtKcpmtu.Location" type="System.Drawing.Point, System.Drawing">
- <value>111, 24</value>
+ <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name="txtKcpmtu.Size" type="System.Drawing.Size, System.Drawing">
- <value>94, 21</value>
+ <data name=">>chkEnableStatistics.Name" xml:space="preserve">
+ <value>chkEnableStatistics</value>
</data>
- <data name="txtKcpmtu.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
+ <data name=">>chkAllowIn2.ZOrder" xml:space="preserve">
+ <value>4</value>
</data>
- <data name=">>txtKcpmtu.Name" xml:space="preserve">
- <value>txtKcpmtu</value>
+ <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+ <value>355, 16</value>
</data>
- <data name=">>txtKcpmtu.Type" xml:space="preserve">
+ <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>53, 12</value>
+ </data>
+ <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+ <value>193, 162</value>
+ </data>
+ <data name="chkKeepOlderDedupl.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkudpEnabled.Location" type="System.Drawing.Point, System.Drawing">
+ <value>369, 27</value>
+ </data>
+ <data name=">>txtKcpuplinkCapacity.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtKcpmtu.Parent" xml:space="preserve">
<value>tabPage6</value>
</data>
- <data name=">>txtKcpmtu.ZOrder" xml:space="preserve">
- <value>11</value>
- </data>
- <data name="label6.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
- <value>18, 28</value>
- </data>
- <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>23, 12</value>
- </data>
- <data name="label6.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name="label6.Text" xml:space="preserve">
- <value>mtu</value>
- </data>
- <data name=">>label6.Name" xml:space="preserve">
- <value>label6</value>
- </data>
- <data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label6.Parent" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>label6.ZOrder" xml:space="preserve">
- <value>12</value>
- </data>
- <data name="tabPage6.Location" type="System.Drawing.Point, System.Drawing">
- <value>4, 22</value>
- </data>
- <data name="tabPage6.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
- <value>3, 3, 3, 3</value>
- </data>
- <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
- <value>654, 427</value>
- </data>
- <data name="tabPage6.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="tabPage6.Text" xml:space="preserve">
- <value>Core: KCP settings</value>
- </data>
- <data name=">>tabPage6.Name" xml:space="preserve">
- <value>tabPage6</value>
- </data>
- <data name=">>tabPage6.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>tabPage6.Parent" xml:space="preserve">
- <value>tabControl1</value>
- </data>
- <data name=">>tabPage6.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="chkIgnoreGeoUpdateCore.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkIgnoreGeoUpdateCore.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
</data>
<data name="chkIgnoreGeoUpdateCore.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 132</value>
</data>
- <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
- <value>234, 16</value>
+ <data name="txtlocalPort2.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
</data>
- <data name="chkIgnoreGeoUpdateCore.TabIndex" type="System.Int32, mscorlib">
- <value>36</value>
- </data>
- <data name="chkIgnoreGeoUpdateCore.Text" xml:space="preserve">
- <value>Ignore Geo files when updating core</value>
- </data>
- <data name=">>chkIgnoreGeoUpdateCore.Name" xml:space="preserve">
- <value>chkIgnoreGeoUpdateCore</value>
- </data>
- <data name=">>chkIgnoreGeoUpdateCore.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkIgnoreGeoUpdateCore.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>chkIgnoreGeoUpdateCore.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="cmbCoreType.Items" xml:space="preserve">
- <value>v2fly_core</value>
- </data>
- <data name="cmbCoreType.Items1" xml:space="preserve">
- <value>Xray_core</value>
- </data>
- <data name="cmbCoreType.Location" type="System.Drawing.Point, System.Drawing">
- <value>325, 130</value>
- </data>
- <data name="cmbCoreType.Size" type="System.Drawing.Size, System.Drawing">
- <value>97, 20</value>
- </data>
- <data name="cmbCoreType.TabIndex" type="System.Int32, mscorlib">
- <value>34</value>
- </data>
- <data name=">>cmbCoreType.Name" xml:space="preserve">
- <value>cmbCoreType</value>
- </data>
- <data name=">>cmbCoreType.Type" xml:space="preserve">
+ <data name=">>cmbprotocol.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>cmbCoreType.Parent" xml:space="preserve">
- <value>tabPage7</value>
+ <data name="chklogEnabled.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
</data>
- <data name=">>cmbCoreType.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="label4.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
- <value>253, 134</value>
- </data>
- <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
- <value>59, 12</value>
- </data>
- <data name="label4.TabIndex" type="System.Int32, mscorlib">
- <value>35</value>
- </data>
- <data name="label4.Text" xml:space="preserve">
- <value>Core Type</value>
- </data>
- <data name=">>label4.Name" xml:space="preserve">
- <value>label4</value>
- </data>
- <data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label4.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>label4.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name="chkKeepOlderDedupl.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkKeepOlderDedupl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="chkKeepOlderDedupl.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 108</value>
- </data>
- <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
- <value>198, 16</value>
- </data>
- <data name="chkKeepOlderDedupl.TabIndex" type="System.Int32, mscorlib">
- <value>33</value>
- </data>
- <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
- <value>Keep older when deduplication</value>
- </data>
- <data name=">>chkKeepOlderDedupl.Name" xml:space="preserve">
- <value>chkKeepOlderDedupl</value>
- </data>
- <data name=">>chkKeepOlderDedupl.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkKeepOlderDedupl.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>chkKeepOlderDedupl.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name="cbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
- <value>161, 84</value>
- </data>
- <data name="cbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
- <value>58, 20</value>
- </data>
- <data name="cbFreshrate.TabIndex" type="System.Int32, mscorlib">
- <value>32</value>
- </data>
- <data name=">>cbFreshrate.Name" xml:space="preserve">
- <value>cbFreshrate</value>
- </data>
- <data name=">>cbFreshrate.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>cbFreshrate.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>cbFreshrate.ZOrder" xml:space="preserve">
- <value>4</value>
- </data>
- <data name="lbFreshrate.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="lbFreshrate.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="lbFreshrate.Location" type="System.Drawing.Point, System.Drawing">
- <value>30, 88</value>
- </data>
- <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
- <value>125, 12</value>
- </data>
- <data name="lbFreshrate.TabIndex" type="System.Int32, mscorlib">
- <value>30</value>
- </data>
- <data name="lbFreshrate.Text" xml:space="preserve">
- <value>Statistics freshrate</value>
- </data>
- <data name=">>lbFreshrate.Name" xml:space="preserve">
- <value>lbFreshrate</value>
- </data>
- <data name=">>lbFreshrate.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>lbFreshrate.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>lbFreshrate.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
- <data name="chkEnableStatistics.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkEnableStatistics.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="chkEnableStatistics.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 64</value>
- </data>
- <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
- <value>576, 16</value>
- </data>
- <data name="chkEnableStatistics.TabIndex" type="System.Int32, mscorlib">
- <value>29</value>
- </data>
- <data name="chkEnableStatistics.Text" xml:space="preserve">
- <value>Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client)</value>
- </data>
- <data name=">>chkEnableStatistics.Name" xml:space="preserve">
- <value>chkEnableStatistics</value>
- </data>
- <data name=">>chkEnableStatistics.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkEnableStatistics.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>chkEnableStatistics.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name="chkAllowLANConn.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkAllowLANConn.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 40</value>
- </data>
- <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
- <value>204, 16</value>
- </data>
- <data name="chkAllowLANConn.TabIndex" type="System.Int32, mscorlib">
- <value>29</value>
- </data>
- <data name="chkAllowLANConn.Text" xml:space="preserve">
- <value>Allow connections from the LAN</value>
- </data>
- <data name=">>chkAllowLANConn.Name" xml:space="preserve">
- <value>chkAllowLANConn</value>
- </data>
- <data name=">>chkAllowLANConn.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkAllowLANConn.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>chkAllowLANConn.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name="chkAutoRun.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="chkAutoRun.Location" type="System.Drawing.Point, System.Drawing">
- <value>15, 16</value>
- </data>
- <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
- <value>246, 16</value>
- </data>
- <data name="chkAutoRun.TabIndex" type="System.Int32, mscorlib">
- <value>23</value>
- </data>
- <data name="chkAutoRun.Text" xml:space="preserve">
- <value>Automatically start at system startup</value>
- </data>
- <data name=">>chkAutoRun.Name" xml:space="preserve">
- <value>chkAutoRun</value>
- </data>
- <data name=">>chkAutoRun.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>chkAutoRun.Parent" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>chkAutoRun.ZOrder" xml:space="preserve">
+ <data name=">>txtlocalPort2.ZOrder" xml:space="preserve">
<value>8</value>
</data>
- <data name="tabPage7.Location" type="System.Drawing.Point, System.Drawing">
- <value>4, 22</value>
- </data>
- <data name="tabPage7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
- <value>3, 3, 3, 3</value>
- </data>
- <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
- <value>654, 427</value>
- </data>
- <data name="tabPage7.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="tabPage7.Text" xml:space="preserve">
- <value>v2rayN settings</value>
- </data>
- <data name=">>tabPage7.Name" xml:space="preserve">
- <value>tabPage7</value>
- </data>
- <data name=">>tabPage7.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>tabPage7.Parent" xml:space="preserve">
- <value>tabControl1</value>
- </data>
- <data name=">>tabPage7.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name="tabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
- </data>
- <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 10</value>
- </data>
- <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
- <value>662, 453</value>
- </data>
- <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name=">>tabControl1.Name" xml:space="preserve">
- <value>tabControl1</value>
- </data>
- <data name=">>tabControl1.Type" xml:space="preserve">
- <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>tabControl1.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
<data name=">>tabControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
- <value>267, 16</value>
+ <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+ <value>101, 12</value>
</data>
- <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
- <value>75, 23</value>
+ <data name=">>chkEnableStatistics.ZOrder" xml:space="preserve">
+ <value>6</value>
</data>
- <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
+ <data name="cmbprotocol.TabIndex" type="System.Int32, mscorlib">
+ <value>12</value>
</data>
- <data name="btnOK.Text" xml:space="preserve">
- <value>&OK</value>
+ <data name="chkKcpcongestion.TabIndex" type="System.Int32, mscorlib">
+ <value>20</value>
</data>
- <data name=">>btnOK.Name" xml:space="preserve">
- <value>btnOK</value>
+ <data name=">>cmbprotocol.Name" xml:space="preserve">
+ <value>cmbprotocol</value>
</data>
- <data name=">>btnOK.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="chkEnableStatistics.Text" xml:space="preserve">
+ <value>Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client)</value>
</data>
- <data name=">>btnOK.Parent" xml:space="preserve">
- <value>panel2</value>
+ <data name="chkIgnoreGeoUpdateCore.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name=">>btnOK.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Bottom</value>
- </data>
- <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 463</value>
- </data>
- <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
- <value>662, 60</value>
- </data>
- <data name="panel2.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
- </data>
- <data name=">>panel2.Name" xml:space="preserve">
- <value>panel2</value>
- </data>
- <data name=">>panel2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>panel2.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>panel2.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>662, 10</value>
- </data>
- <data name="panel1.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
- </data>
- <data name=">>panel1.Name" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
+ <value>204, 16</value>
</data>
<data name=">>panel1.Parent" xml:space="preserve">
<value>$this</value>
</data>
+ <data name=">>label11.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Listening port</value>
+ </data>
+ <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name=">>cbFreshrate.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="cmbprotocol2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>257, 60</value>
+ </data>
+ <data name=">>tabPage1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="txtKcpmtu.Size" type="System.Drawing.Size, System.Drawing">
+ <value>94, 21</value>
+ </data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="cmbCoreType.TabIndex" type="System.Int32, mscorlib">
+ <value>34</value>
+ </data>
+ <data name=">>cmbprotocol2.Name" xml:space="preserve">
+ <value>cmbprotocol2</value>
+ </data>
+ <data name=">>chkKeepOlderDedupl.Name" xml:space="preserve">
+ <value>chkKeepOlderDedupl</value>
+ </data>
+ <data name="txtremoteDNS.Multiline" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label3.TabIndex" type="System.Int32, mscorlib">
+ <value>16</value>
+ </data>
+ <data name="chkudpEnabled2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkKcpcongestion.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chksniffingEnabled.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>chkKcpcongestion.Name" xml:space="preserve">
+ <value>chkKcpcongestion</value>
+ </data>
+ <data name="tabPage1.Text" xml:space="preserve">
+ <value>Core: basic settings</value>
+ </data>
+ <data name=">>chkKcpcongestion.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="cmbprotocol.Location" type="System.Drawing.Point, System.Drawing">
+ <value>257, 25</value>
+ </data>
+ <data name=">>linkDnsObjectDoc.Parent" xml:space="preserve">
+ <value>tabPage2</value>
+ </data>
+ <data name=">>tabPage2.Parent" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name="chkAllowIn2.Text" xml:space="preserve">
+ <value>listening port 2</value>
+ </data>
+ <data name="cmbloglevel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>97, 20</value>
+ </data>
+ <data name=">>chkAllowIn2.Name" xml:space="preserve">
+ <value>chkAllowIn2</value>
+ </data>
+ <data name=">>tabControl1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>panel2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkAllowLANConn.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chklogEnabled.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 160</value>
+ </data>
+ <data name="label14.TabIndex" type="System.Int32, mscorlib">
+ <value>38</value>
+ </data>
+ <data name="chkKeepOlderDedupl.TabIndex" type="System.Int32, mscorlib">
+ <value>33</value>
+ </data>
+ <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name="cmbCoreType.Items" xml:space="preserve">
+ <value>v2fly_core</value>
+ </data>
+ <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+ <value>9</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name="tabPage6.Text" xml:space="preserve">
+ <value>Core: KCP settings</value>
+ </data>
+ <data name="label8.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name=">>tabPage6.Name" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name="cmbloglevel.Items3" xml:space="preserve">
+ <value>error</value>
+ </data>
+ <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+ <value>59, 12</value>
+ </data>
+ <data name=">>chkEnableStatistics.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtKcpreadBufferSize.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="label8.Text" xml:space="preserve">
+ <value>downlinkCapacity</value>
+ </data>
+ <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>120, 16</value>
+ </data>
+ <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name=">>txtlocalPort2.Name" xml:space="preserve">
+ <value>txtlocalPort2</value>
+ </data>
+ <data name="tabPage6.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
+ <value>246, 16</value>
+ </data>
+ <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
+ <value>654, 427</value>
+ </data>
+ <data name="chkKeepOlderDedupl.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 108</value>
+ </data>
+ <data name="chkudpEnabled2.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>206, 29</value>
+ </data>
<data name=">>panel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name=">>chkudpEnabled2.Name" xml:space="preserve">
+ <value>chkudpEnabled2</value>
+ </data>
+ <data name=">>chkIgnoreGeoUpdateCore.Name" xml:space="preserve">
+ <value>chkIgnoreGeoUpdateCore</value>
+ </data>
+ <data name="chkAllowLANConn.Text" xml:space="preserve">
+ <value>Allow connections from the LAN</value>
+ </data>
+ <data name=">>tabPage1.Name" xml:space="preserve">
+ <value>tabPage1</value>
+ </data>
+ <data name=">>chksniffingEnabled.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkKcpcongestion.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name=">>chksniffingEnabled.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>btnClose.Parent" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name="txtremoteDNS.TabIndex" type="System.Int32, mscorlib">
+ <value>39</value>
+ </data>
+ <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name=">>linkDnsObjectDoc.Name" xml:space="preserve">
+ <value>linkDnsObjectDoc</value>
+ </data>
+ <data name=">>tabPage6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtKcpreadBufferSize.Name" xml:space="preserve">
+ <value>txtKcpreadBufferSize</value>
+ </data>
+ <data name="cmbloglevel.Items4" xml:space="preserve">
+ <value>none</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>cmbloglevel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="tabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="label3.Text" xml:space="preserve">
+ <value>protocol</value>
+ </data>
+ <data name="tabPage7.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name=">>txtlocalPort.ZOrder" xml:space="preserve">
+ <value>15</value>
+ </data>
+ <data name=">>chkAutoRun.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkEnableStatistics.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 64</value>
+ </data>
+ <data name=">>chkAutoRun.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name=">>chkudpEnabled.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkudpEnabled2.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="txtKcpreadBufferSize.TabIndex" type="System.Int32, mscorlib">
+ <value>13</value>
+ </data>
+ <data name="cmbCoreType.Size" type="System.Drawing.Size, System.Drawing">
+ <value>97, 20</value>
+ </data>
+ <data name=">>linkDnsObjectDoc.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="label11.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
- </metadata>
- <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
- <value>6, 12</value>
</data>
- <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>662, 523</value>
+ <data name="txtlocalPort2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>78, 21</value>
</data>
- <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
- <value>4, 4, 4, 4</value>
+ <data name=">>cmbCoreType.Parent" xml:space="preserve">
+ <value>tabPage7</value>
</data>
- <data name="$this.Text" xml:space="preserve">
- <value>Settings</value>
+ <data name=">>chkKeepOlderDedupl.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name="chkdefAllowInsecure.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkdefAllowInsecure.Text" xml:space="preserve">
+ <value>allowInsecure</value>
+ </data>
+ <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>label9.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+ <value>23, 12</value>
+ </data>
+ <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>654, 427</value>
+ </data>
+ <data name="label5.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name=">>tabControl1.Name" xml:space="preserve">
+ <value>tabControl1</value>
+ </data>
+ <data name="txtKcpwriteBufferSize.Location" type="System.Drawing.Point, System.Drawing">
+ <value>345, 100</value>
+ </data>
+ <data name="linkDnsObjectDoc.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="tabControl1.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="chksniffingEnabled2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="cmbprotocol2.TabIndex" type="System.Int32, mscorlib">
+ <value>17</value>
+ </data>
+ <data name="chkAutoRun.TabIndex" type="System.Int32, mscorlib">
+ <value>23</value>
+ </data>
+ <data name="txtKcpdownlinkCapacity.Size" type="System.Drawing.Size, System.Drawing">
+ <value>94, 21</value>
+ </data>
+ <data name=">>cmbprotocol2.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 463</value>
+ </data>
+ <data name=">>chksniffingEnabled2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>txtKcpreadBufferSize.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="cmbprotocol.Items1" xml:space="preserve">
+ <value>http</value>
+ </data>
+ <data name=">>btnClose.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="cmbprotocol2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>97, 20</value>
+ </data>
+ <data name=">>label6.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name=">>txtKcptti.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+ <value>7</value>
+ </data>
+ <data name="cmbprotocol.Enabled" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="cmbloglevel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>257, 158</value>
+ </data>
+ <data name=">>txtlocalPort.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="btnOK.Text" xml:space="preserve">
+ <value>&OK</value>
+ </data>
+ <data name="txtKcpuplinkCapacity.Size" type="System.Drawing.Size, System.Drawing">
+ <value>94, 21</value>
+ </data>
+ <data name=">>tabPage2.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="txtKcptti.Size" type="System.Drawing.Size, System.Drawing">
+ <value>94, 21</value>
+ </data>
+ <data name=">>txtKcpuplinkCapacity.Name" xml:space="preserve">
+ <value>txtKcpuplinkCapacity</value>
+ </data>
+ <data name=">>txtremoteDNS.Parent" xml:space="preserve">
+ <value>tabPage2</value>
+ </data>
+ <data name=">>chklogEnabled.Name" xml:space="preserve">
+ <value>chklogEnabled</value>
+ </data>
+ <data name=">>chksniffingEnabled2.Name" xml:space="preserve">
+ <value>chksniffingEnabled2</value>
+ </data>
+ <data name=">>tabPage7.Name" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>4, 22</value>
+ </data>
+ <data name=">>panel2.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>label5.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkAutoRun.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>cmbprotocol2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="chkKeepOlderDedupl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name=">>label8.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+ <value>236, 66</value>
+ </data>
+ <data name=">>chkAllowLANConn.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name="chkAutoRun.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 16</value>
+ </data>
+ <data name=">>chklogEnabled.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="lbFreshrate.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>chkKeepOlderDedupl.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>label9.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name=">>txtremoteDNS.Name" xml:space="preserve">
+ <value>txtremoteDNS</value>
+ </data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="chkudpEnabled.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name=">>tabPage7.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="label10.Text" xml:space="preserve">
+ <value>writeBufferSize</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name=">>panel1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+ <value>89, 12</value>
+ </data>
+ <data name=">>label6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chksniffingEnabled.TabIndex" type="System.Int32, mscorlib">
+ <value>31</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>cmbloglevel.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="tabPage2.Text" xml:space="preserve">
+ <value>Core: DNS settings</value>
+ </data>
+ <data name=">>txtlocalPort2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="cbFreshrate.TabIndex" type="System.Int32, mscorlib">
+ <value>32</value>
+ </data>
+ <data name=">>txtKcpdownlinkCapacity.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="txtKcptti.Location" type="System.Drawing.Point, System.Drawing">
+ <value>345, 24</value>
+ </data>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>tabPage7</value>
+ </data>
+ <data name=">>cbFreshrate.Name" xml:space="preserve">
+ <value>cbFreshrate</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>OptionSettingForm</value>
</data>
- <data name=">>$this.Type" xml:space="preserve">
- <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+ <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
+ <value>236, 104</value>
</data>
+ <data name=">>chkKeepOlderDedupl.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkEnableStatistics.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name=">>cmbprotocol2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="txtKcpreadBufferSize.Size" type="System.Drawing.Size, System.Drawing">
+ <value>94, 21</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="txtremoteDNS.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 41</value>
+ </data>
+ <data name="linkDnsObjectDoc.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>0, 0, 0, 0</value>
+ </data>
+ <data name="label9.Text" xml:space="preserve">
+ <value>uplinkCapacity</value>
+ </data>
+ <data name=">>txtKcpdownlinkCapacity.Name" xml:space="preserve">
+ <value>txtKcpdownlinkCapacity</value>
+ </data>
+ <data name="chkdefAllowInsecure.TabIndex" type="System.Int32, mscorlib">
+ <value>35</value>
+ </data>
+ <data name="cmbloglevel.TabIndex" type="System.Int32, mscorlib">
+ <value>6</value>
+ </data>
+ <data name=">>cbFreshrate.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name="tabPage6.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name="linkDnsObjectDoc.Size" type="System.Drawing.Size, System.Drawing">
+ <value>107, 12</value>
+ </data>
+ <data name=">>label5.Name" xml:space="preserve">
+ <value>label5</value>
+ </data>
+ <data name="chkdefAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+ <value>15, 192</value>
+ </data>
+ <data name=">>label8.Parent" xml:space="preserve">
+ <value>tabPage6</value>
+ </data>
+ <data name="label3.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="cmbloglevel.Items" xml:space="preserve">
+ <value>debug</value>
+ </data>
+ <data name=">>chkIgnoreGeoUpdateCore.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkmuxEnabled.Name" xml:space="preserve">
+ <value>chkmuxEnabled</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>chkmuxEnabled.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkAllowIn2.Visible" type="System.Boolean, mscorlib">
+ <value>False</value>
+ </data>
+ <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+ <value>253, 134</value>
+ </data>
+ <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="chkudpEnabled.Text" xml:space="preserve">
+ <value>Enable UDP</value>
+ </data>
+ <data name=">>cmbCoreType.Name" xml:space="preserve">
+ <value>cmbCoreType</value>
+ </data>
+ <data name="tabPage7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 3, 3, 3</value>
+ </data>
+ <data name=">>cmbprotocol.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
+ <value>126, 16</value>
+ </data>
+ <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+ <value>267, 16</value>
+ </data>
+ <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+ <value>75, 23</value>
+ </data>
+ <data name=">>chkAllowIn2.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label11.Text" xml:space="preserve">
+ <value>readBufferSize</value>
+ </data>
+ <data name=">>txtKcptti.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chklogEnabled.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name="linkDnsObjectDoc.Location" type="System.Drawing.Point, System.Drawing">
+ <value>342, 17</value>
+ </data>
+ <data name="cmbprotocol.Size" type="System.Drawing.Size, System.Drawing">
+ <value>97, 20</value>
+ </data>
+ <data name="txtlocalPort.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="label14.Text" xml:space="preserve">
+ <value>Custom DNS (multiple, separated by commas (,))</value>
+ </data>
+ <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>654, 427</value>
+ </data>
+ <data name=">>txtKcpmtu.ZOrder" xml:space="preserve">
+ <value>11</value>
+ </data>
+ <data name=">>tabPage7.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>chkdefAllowInsecure.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="chksniffingEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name=">>panel2.Name" xml:space="preserve">
+ <value>panel2</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>chkKcpcongestion.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="chkmuxEnabled.Text" xml:space="preserve">
+ <value>Turn on Mux Multiplexing </value>
+ </data>
+ <data name=">>cmbloglevel.Name" xml:space="preserve">
+ <value>cmbloglevel</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name="txtKcpmtu.Location" type="System.Drawing.Point, System.Drawing">
+ <value>111, 24</value>
+ </data>
+ <data name="label6.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>662, 60</value>
+ </data>
+ <data name=">>label14.Name" xml:space="preserve">
+ <value>label14</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>zh-Hans</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
index eccd6e2c..e2026b67 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -139,8 +139,11 @@
<data name="chksniffingEnabled.Text" xml:space="preserve">
<value>开启流量探测</value>
</data>
+ <data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
+ <value>114, 16</value>
+ </data>
<data name="chkmuxEnabled.Text" xml:space="preserve">
- <value>开启Mux多路复用(默认开启)</value>
+ <value>开启Mux多路复用</value>
</data>
<data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 16</value>
diff --git a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
index 3daed59a..b4384682 100644
--- a/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs
@@ -227,7 +227,7 @@ namespace v2rayN.Forms
if (lst.Count > 0)
{
Utils.SetClipboardData(Utils.ToJson(lst));
- UI.Show(UIRes.I18N("OperationSuccess"));
+ //UI.Show(UIRes.I18N("OperationSuccess"));
}
}
@@ -294,7 +294,7 @@ namespace v2rayN.Forms
return;
}
- if (ConfigHandler.AddBatchRoutingRules(ref routingItem, result) == 0)
+ if (AddBatchRoutingRules(ref routingItem, result) == 0)
{
RefreshRoutingsView();
UI.Show(UIRes.I18N("OperationSuccess"));
@@ -304,7 +304,7 @@ namespace v2rayN.Forms
private void menuImportRulesFromClipboard_Click(object sender, EventArgs e)
{
string clipboardData = Utils.GetClipboardData();
- if (ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
+ if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
{
RefreshRoutingsView();
UI.Show(UIRes.I18N("OperationSuccess"));
@@ -320,12 +320,21 @@ namespace v2rayN.Forms
}
DownloadHandle downloadHandle = new DownloadHandle();
string clipboardData = downloadHandle.WebDownloadStringSync(url);
- if (ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
+ if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
{
RefreshRoutingsView();
UI.Show(UIRes.I18N("OperationSuccess"));
}
}
+ private int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
+ {
+ bool blReplace = false;
+ if (UI.ShowYesNo(UIRes.I18N("AddBatchRoutingRulesYesNo")) == DialogResult.No)
+ {
+ blReplace = true;
+ }
+ return ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData, blReplace);
+ }
#endregion
diff --git a/v2rayN/v2rayN/Forms/RoutingSettingForm.cs b/v2rayN/v2rayN/Forms/RoutingSettingForm.cs
index c0fc32b4..52a10bbd 100644
--- a/v2rayN/v2rayN/Forms/RoutingSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/RoutingSettingForm.cs
@@ -290,6 +290,7 @@ namespace v2rayN.Forms
private void menuImportBasicRules_Click(object sender, EventArgs e)
{
//Extra to bypass the mainland
+ txtProxyDomain.Text = "geosite:google";
txtDirectDomain.Text = "geosite:cn";
txtDirectIp.Text = "geoip:private,geoip:cn";
diff --git a/v2rayN/v2rayN/Forms/SubSettingForm.resx b/v2rayN/v2rayN/Forms/SubSettingForm.resx
index 0f5ca1f3..923a69e4 100644
--- a/v2rayN/v2rayN/Forms/SubSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/SubSettingForm.resx
@@ -157,7 +157,7 @@
<value>0, 0</value>
</data>
<data name="panCon.Size" type="System.Drawing.Size, System.Drawing">
- <value>614, 569</value>
+ <value>614, 351</value>
</data>
<data name="panCon.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
@@ -232,7 +232,7 @@
<value>Bottom</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 569</value>
+ <value>0, 351</value>
</data>
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>614, 60</value>
@@ -259,7 +259,7 @@
<value>6, 12</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
- <value>614, 629</value>
+ <value>614, 411</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>Subscription settings</value>
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 61cd330f..2443ec06 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -1045,7 +1045,7 @@ namespace v2rayN.Handler
/// <param name="config"></param>
/// <param name="clipboardData"></param>
/// <returns></returns>
- public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
+ public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData, bool blReplace = true)
{
if (Utils.IsNullOrEmpty(clipboardData))
{
@@ -1057,8 +1057,10 @@ namespace v2rayN.Handler
{
return -1;
}
-
- routingItem.rules.Clear();
+ if (blReplace)
+ {
+ routingItem.rules.Clear();
+ }
foreach (var item in lstRules)
{
routingItem.rules.Add(item);
@@ -1175,7 +1177,7 @@ namespace v2rayN.Handler
config.routingIndex = 0;
}
-
+
if (GetLockedRoutingItem(ref config) == null)
{
var item1 = new RoutingItem();
@@ -1190,7 +1192,7 @@ namespace v2rayN.Handler
SaveRouting(ref config);
return 0;
- }
+ }
public static RoutingItem GetLockedRoutingItem(ref Config config)
{
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 810dbc1c..ce69371a 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -40,6 +40,7 @@ namespace v2rayN.Handler
port = item.port.ToString(),
id = item.id,
aid = item.alterId.ToString(),
+ scy = item.security,
net = item.network,
type = item.headerType,
host = item.requestHost,
@@ -279,18 +280,26 @@ namespace v2rayN.Handler
msg = UIRes.I18N("FailedConversionConfiguration");
return null;
}
- vmessItem.security = Global.DefaultSecurity;
+
vmessItem.network = Global.DefaultNetwork;
vmessItem.headerType = Global.None;
-
vmessItem.configVersion = Utils.ToInt(vmessQRCode.v);
vmessItem.remarks = Utils.ToString(vmessQRCode.ps);
vmessItem.address = Utils.ToString(vmessQRCode.add);
vmessItem.port = Utils.ToInt(vmessQRCode.port);
vmessItem.id = Utils.ToString(vmessQRCode.id);
vmessItem.alterId = Utils.ToInt(vmessQRCode.aid);
+ vmessItem.security = Utils.ToString(vmessQRCode.scy);
+ if (!Utils.IsNullOrEmpty(vmessQRCode.scy))
+ {
+ vmessItem.security = vmessQRCode.scy;
+ }
+ else
+ {
+ vmessItem.security = Global.DefaultSecurity;
+ }
if (!Utils.IsNullOrEmpty(vmessQRCode.net))
{
vmessItem.network = vmessQRCode.net;
diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
index de013922..988cc7c8 100644
--- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs
@@ -111,7 +111,7 @@ namespace v2rayN.Handler
}
catch (Exception ex)
{
- Utils.SaveLog(ex.Message, ex);
+ //Utils.SaveLog(ex.Message, ex);
}
if (res != null)
@@ -138,7 +138,7 @@ namespace v2rayN.Handler
}
catch (Exception ex)
{
- Utils.SaveLog(ex.Message, ex);
+ //Utils.SaveLog(ex.Message, ex);
}
}
}
@@ -271,7 +271,7 @@ namespace v2rayN.Handler
}
catch (Exception ex)
{
- Utils.SaveLog(ex.Message, ex);
+ //Utils.SaveLog(ex.Message, ex);
}
}
diff --git a/v2rayN/v2rayN/Mode/VmessQRCode.cs b/v2rayN/v2rayN/Mode/VmessQRCode.cs
index 32fdbbd1..34317b74 100644
--- a/v2rayN/v2rayN/Mode/VmessQRCode.cs
+++ b/v2rayN/v2rayN/Mode/VmessQRCode.cs
@@ -14,21 +14,26 @@ namespace v2rayN.Mode
/// </summary>
public string ps { get; set; } = string.Empty;
/// <summary>
- /// 远程服务器地址
+ /// VMess 远程服务器地址
/// </summary>
public string add { get; set; } = string.Empty;
/// <summary>
- /// 远程服务器端口
+ /// VMess 远程服务器端口
/// </summary>
public string port { get; set; } = string.Empty;
/// <summary>
- /// 远程服务器ID
+ /// VMess 远程服务器ID
/// </summary>
public string id { get; set; } = string.Empty;
/// <summary>
- /// 远程服务器额外ID
+ /// VMess 远程服务器额外ID
/// </summary>
public string aid { get; set; } = string.Empty;
+ /// <summary>
+ /// VMess Security
+ /// </summary>
+ public string scy { get; set; } = string.Empty;
+
/// <summary>
/// 传输协议tcp,kcp,ws
/// </summary>
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index 705703f6..a26e5f34 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
// 方法是按如下所示使用“*”:
//[assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("4.13")]
+[assembly: AssemblyFileVersion("4.14")]
diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs
index df456572..b88f7983 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 {
@@ -60,6 +60,15 @@ namespace v2rayN.Resx {
}
}
+ /// <summary>
+ /// 查找类似 Do you want to append rules? Choose yes to append, choose otherwise to replace 的本地化字符串。
+ /// </summary>
+ internal static string AddBatchRoutingRulesYesNo {
+ get {
+ return ResourceManager.GetString("AddBatchRoutingRulesYesNo", resourceCulture);
+ }
+ }
+
/// <summary>
/// 查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
/// </summary>
@@ -448,7 +457,7 @@ namespace v2rayN.Resx {
}
/// <summary>
- /// 查找类似 Download V2ray successfully 的本地化字符串。
+ /// 查找类似 Download Core successfully 的本地化字符串。
/// </summary>
internal static string MsgDownloadV2rayCoreSuccessfully {
get {
@@ -592,7 +601,7 @@ namespace v2rayN.Resx {
}
/// <summary>
- /// 查找类似 Update V2rayCore successfully 的本地化字符串。
+ /// 查找类似 Update Core successfully 的本地化字符串。
/// </summary>
internal static string MsgUpdateV2rayCoreSuccessfully {
get {
@@ -601,7 +610,7 @@ namespace v2rayN.Resx {
}
/// <summary>
- /// 查找类似 Update V2rayCore successfully! Restarting service... 的本地化字符串。
+ /// 查找类似 Update Core successfully! Restarting service... 的本地化字符串。
/// </summary>
internal static string MsgUpdateV2rayCoreSuccessfullyMore {
get {
@@ -637,7 +646,7 @@ namespace v2rayN.Resx {
}
/// <summary>
- /// 查找类似 V2ray-core not found, please download: {0} 的本地化字符串。
+ /// 查找类似 Core not found, please download: {0} 的本地化字符串。
/// </summary>
internal static string NotFoundCore {
get {
diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx
index 0b848e00..8ad2a6f6 100644
--- a/v2rayN/v2rayN/Resx/ResUI.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.resx
@@ -385,4 +385,7 @@
<data name="MsgNeedUrl" xml:space="preserve">
<value>Please fill in the address (Url)</value>
</data>
-</root>
+ <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
+ <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
+ </data>
+</root>
\ 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 cde15548..562095b9 100644
--- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx
@@ -385,4 +385,7 @@
<data name="MsgNeedUrl" xml:space="preserve">
<value>请填写地址(Url)</value>
</data>
-</root>
+ <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
+ <value>是否追加规则?选择是则追加,选择否则替换</value>
+ </data>
+</root>
\ No newline at end of file