diff --git a/v2rayN/v2rayN.sln b/v2rayN/v2rayN.sln
index 0b906d27..64cf71f4 100644
--- a/v2rayN/v2rayN.sln
+++ b/v2rayN/v2rayN.sln
@@ -35,6 +35,7 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
+ RESX_SortFileContentOnSave = True
SolutionGuid = {56B88873-C9CC-4069-A1E5-DABD6C6E865E}
EndGlobalSection
EndGlobal
diff --git a/v2rayN/v2rayN/Forms/AddServer2Form.resx b/v2rayN/v2rayN/Forms/AddServer2Form.resx
index b81e2a97..969bc410 100644
--- a/v2rayN/v2rayN/Forms/AddServer2Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer2Form.resx
@@ -117,95 +117,47 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Address
-
-
- Bottom
-
-
- True
-
-
- 12, 27
-
-
- Fill
-
-
- True
-
-
- 313, 21
-
6, 12
-
+
+ 611, 271
+
+
True
-
- Alias (remarks)
-
-
- 127, 23
-
-
- 6
-
-
- 7
-
-
- 113, 12
-
-
- Server
-
-
- 23
-
-
- 0
-
-
- 611, 60
-
Edit custom configuration server
-
- 432, 104
-
-
- 611, 10
-
-
- * Fill in manually
-
-
- 11
-
-
- 10
+
+ 396, 17
75, 23
+
+ 4
+
+
+ &Cancel
+
303, 17
-
- 0, 211
-
75, 23
-
- Top
+
+ 5
+
+
+ &OK
+
+
+ Fill
0, 10
@@ -213,52 +165,100 @@
611, 201
-
- 4
-
3
-
- 127, 62
+
+ Server
True
-
- 83, 12
-
-
- &Cancel
-
12, 62
-
- &OK
+
+ 83, 12
+
+
+ 0
+
+
+ Address
+
+
+ True
446, 26
-
- 0, 0
-
-
- 83, 12
+
+ 113, 12
22
-
- 5
+
+ * Fill in manually
-
- 611, 271
-
-
- 396, 17
-
-
+
True
+
+ 12, 27
+
+
+ 83, 12
+
+
+ 10
+
+
+ Alias (remarks)
+
+
+ Top
+
+
+ 0, 0
+
+
+ 611, 10
+
+
+ 6
+
+
+ Bottom
+
+
+ 0, 211
+
+
+ 611, 60
+
+
+ 7
+
+
+ 127, 62
+
+
+ True
+
+
+ 432, 104
+
+
+ 23
+
+
+ 127, 23
+
+
+ 313, 21
+
+
+ 11
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServer2Form.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServer2Form.zh-Hans.resx
index a01d4dfa..482593c4 100644
--- a/v2rayN/v2rayN/Forms/AddServer2Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer2Form.zh-Hans.resx
@@ -117,25 +117,25 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 编辑自定义配置服务器
+
取消(&C)
+
+ 确定(&O)
+
+
+ 服务器
+
+
+ 地址(address)
+
*手填,方便识别管理
别名(remarks)
-
- 地址(address)
-
-
- 服务器
-
-
- 确定(&O)
-
-
- 编辑自定义配置服务器
-
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.resx b/v2rayN/v2rayN/Forms/AddServer3Form.resx
index 97cfaa2b..7aa4052a 100644
--- a/v2rayN/v2rayN/Forms/AddServer3Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.resx
@@ -118,33 +118,43 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ 6, 12
+
+
+ 547, 291
+
+
+ True
+
+
+ Edit or add a [Shadowsocks] server
+
396, 17
75, 23
-
4
&Cancel
-
- True
+
+ 303, 17
-
- 337, 158
+
+ 75, 23
-
- 113, 12
+
+ 5
-
- 22
-
-
- * Fill in manually
+
+ &OK
aes-256-cfb
@@ -179,104 +189,20 @@
6
-
- 127, 154
+
+ Fill
-
- 194, 21
+
+ 0, 35
-
- 11
+
+ 547, 196
-
- True
-
-
- 12, 158
-
-
- 95, 12
-
-
- 10
-
-
- Alias (remarks)
-
-
- True
-
-
- 12, 124
-
-
- 65, 12
-
-
- 8
-
-
- Encryption
-
-
- 127, 85
-
-
- *
-
-
- 278, 21
-
-
- 5
-
-
- True
-
-
- 12, 89
-
-
- 53, 12
-
-
- 4
-
-
- Password
-
-
- 127, 56
-
-
- 194, 21
-
-
+
3
-
- True
-
-
- 12, 60
-
-
- 71, 12
-
-
- 2
-
-
- Server port
-
-
- 127, 27
-
-
- 359, 21
-
-
- 1
+
+ Server
True
@@ -293,45 +219,104 @@
Server address
-
-
- Fill
+
+ True
-
- 0, 35
+
+ 337, 158
-
- 547, 196
+
+ 113, 12
-
- 3
+
+ 22
-
- Server
+
+ * Fill in manually
-
- 303, 17
+
+ True
-
- 75, 23
+
+ 12, 60
-
- 5
+
+ 71, 12
-
- &OK
+
+ 2
-
- Bottom
+
+ Server port
-
- 0, 231
+
+ True
-
- 547, 60
+
+ 12, 89
-
- 7
+
+ 53, 12
+
+
+ 4
+
+
+ Password
+
+
+ True
+
+
+ 12, 124
+
+
+ 65, 12
+
+
+ 8
+
+
+ Encryption
+
+
+ True
+
+
+ 12, 158
+
+
+ 95, 12
+
+
+ 10
+
+
+ Alias (remarks)
+
+
+ 162, 21
+
+
+ Import configuration file
+
+
+ 235, 22
+
+
+ Import URL from clipboard
+
+
+ 0, 0
+
+
+ 547, 25
+
+
+ 8
+
+
+ 17, 17
Top
@@ -345,40 +330,55 @@
6
-
- 17, 17
+
+ Bottom
-
- 235, 22
+
+ 0, 231
-
- Import URL from clipboard
+
+ 547, 60
-
- 162, 21
+
+ 7
-
- Import configuration file
+
+ 127, 27
-
- 0, 0
+
+ 359, 21
-
- 547, 25
+
+ 1
-
- 8
+
+ 127, 85
-
- True
+
+ *
-
- 6, 12
+
+ 278, 21
-
- 547, 291
+
+ 5
-
- Edit or add a [Shadowsocks] server
+
+ 127, 56
+
+
+ 194, 21
+
+
+ 3
+
+
+ 127, 154
+
+
+ 194, 21
+
+
+ 11
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
index 2a5968ca..9cb34d6a 100644
--- a/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx
@@ -117,32 +117,38 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 编辑或添加[Shadowsocks]服务器
+
取消(&C)
-
- *手填,方便识别管理
-
-
- 别名(remarks)
-
-
- 加密方式
-
-
- 密码
-
-
- 服务器端口
-
-
- 服务器地址
+
+ 确定(&O)
服务器
-
- 确定(&O)
+
+ 服务器地址
+
+
+ *手填,方便识别管理
+
+
+ 服务器端口
+
+
+ 密码
+
+
+ 加密方式
+
+
+ 别名(remarks)
+
+
+ 导入配置文件
从剪贴板导入URL
@@ -150,10 +156,4 @@
扫描屏幕上的二维码
-
- 导入配置文件
-
-
- 编辑或添加[Shadowsocks]服务器
-
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServer4Form.resx b/v2rayN/v2rayN/Forms/AddServer4Form.resx
index 7eeb8a94..8c8e6b8e 100644
--- a/v2rayN/v2rayN/Forms/AddServer4Form.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.resx
@@ -118,58 +118,103 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ 6, 12
+
+
+ 547, 291
+
+
+ True
+
+
+ Edit or add a [Socks] server
+
396, 17
75, 23
-
4
&Cancel
-
- 127, 84
+
+ 303, 17
-
- 278, 21
+
+ 75, 23
-
- 26
+
+ 5
-
+
+ &OK
+
+
+ Fill
+
+
+ 0, 35
+
+
+ 547, 196
+
+
+ 3
+
+
+ Server
+
+
True
-
-
- NoControl
+
+ 12, 31
-
- 12, 88
-
-
+
89, 12
-
- 25
+
+ 0
-
- User(Optional)
+
+ Server address
-
- 127, 117
+
+ True
-
- *
+
+ 337, 158
-
- 278, 21
+
+ 113, 12
-
- 24
+
+ 22
+
+
+ * Fill in manually
+
+
+ True
+
+
+ 12, 60
+
+
+ 71, 12
+
+
+ 2
+
+
+ Server port
True
@@ -189,29 +234,23 @@
Password(Optional)
-
+
True
-
- 337, 158
+
+ NoControl
-
- 113, 12
+
+ 12, 88
-
- 22
+
+ 89, 12
-
- * Fill in manually
+
+ 25
-
- 127, 154
-
-
- 194, 21
-
-
- 11
+
+ User(Optional)
True
@@ -228,92 +267,29 @@
Alias (remarks)
-
- 127, 56
+
+ 162, 21
-
- 194, 21
+
+ Import configuration file
-
- 3
+
+ 235, 22
-
- True
+
+ Import URL from clipboard
-
- 12, 60
+
+ 0, 0
-
- 71, 12
+
+ 547, 25
-
- 2
+
+ 8
-
- Server port
-
-
- 127, 27
-
-
- 359, 21
-
-
- 1
-
-
- True
-
-
- 12, 31
-
-
- 89, 12
-
-
- 0
-
-
- Server address
-
-
- Fill
-
-
- 0, 35
-
-
- 547, 196
-
-
- 3
-
-
- Server
-
-
- 303, 17
-
-
- 75, 23
-
-
- 5
-
-
- &OK
-
-
- Bottom
-
-
- 0, 231
-
-
- 547, 60
-
-
- 7
+
+ 17, 17
Top
@@ -327,40 +303,64 @@
6
-
- 17, 17
+
+ Bottom
-
- 235, 22
+
+ 0, 231
-
- Import URL from clipboard
+
+ 547, 60
-
- 162, 21
+
+ 7
-
- Import configuration file
+
+ 127, 27
-
- 0, 0
+
+ 359, 21
-
- 547, 25
+
+ 1
-
- 8
+
+ 127, 117
-
- True
+
+ *
-
- 6, 12
+
+ 278, 21
-
- 547, 291
+
+ 24
-
- Edit or add a [Socks] server
+
+ 127, 56
+
+
+ 194, 21
+
+
+ 3
+
+
+ 127, 154
+
+
+ 194, 21
+
+
+ 11
+
+
+ 127, 84
+
+
+ 278, 21
+
+
+ 26
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
index 6a3cc081..71dbe272 100644
--- a/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx
@@ -117,27 +117,33 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 编辑或添加[Socks]服务器
+
取消(&C)
+
+ 确定(&O)
+
服务器
-
-
- 127, 85
+
+ 65, 12
-
- 12, 89
+
+ 服务器地址
-
- 77, 12
+
+ *手填,方便识别管理
-
- 用户名(可选)
+
+ 65, 12
-
- 127, 115
+
+ 服务器端口
12, 119
@@ -148,8 +154,14 @@
密码(可选)
-
- *手填,方便识别管理
+
+ 12, 89
+
+
+ 77, 12
+
+
+ 用户名(可选)
83, 12
@@ -157,21 +169,6 @@
别名(remarks)
-
- 65, 12
-
-
- 服务器端口
-
-
- 65, 12
-
-
- 服务器地址
-
-
- 确定(&O)
-
92, 21
@@ -184,7 +181,10 @@
从剪贴板导入URL
-
- 编辑或添加[Socks]服务器
+
+ 127, 115
+
+
+ 127, 85
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.resx b/v2rayN/v2rayN/Forms/AddServerForm.resx
index 7067ebf3..a303fd74 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
@@ -118,13 +118,26 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ 6, 12
+
+
+ 729, 569
+
+
+ True
+
+
+ Edit or add a [VMess] server
+
396, 17
75, 23
-
4
@@ -143,87 +156,17 @@
&Generate
-
- True
+
+ 303, 17
-
- 285, 203
+
+ 75, 23
-
- 113, 12
+
+ 5
-
- 22
-
-
- * Fill in manually
-
-
- True
-
-
-
- NoControl
-
-
- 526, 165
-
-
- 65, 12
-
-
- 35
-
-
- 3)QUIC key
-
-
- True
-
-
- NoControl
-
-
- 470, 99
-
-
- 89, 12
-
-
- 34
-
-
- 4)QUIC securty
-
-
- True
-
-
- 205, 11
-
-
- 113, 12
-
-
- 32
-
-
- Default value true
-
-
- True
-
-
- 12, 11
-
-
- 83, 12
-
-
- 31
-
-
- allowInsecure
+
+ &OK
@@ -243,204 +186,6 @@
30
-
- 284, 189
-
-
- 338, 35
-
-
- 33
-
-
- True
-
-
- 469, 83
-
-
- 203, 12
-
-
- 29
-
-
- 3)h2 host Separated by commas (,)
-
-
- 124, 125
-
-
- True
-
-
- 396, 54
-
-
- 28
-
-
- True
-
-
- 9, 125
-
-
- 29, 12
-
-
- 27
-
-
- Path
-
-
- True
-
-
- 526, 147
-
-
- 59, 12
-
-
- 26
-
-
- 2)h2 path
-
-
- True
-
-
- 469, 68
-
-
- 59, 12
-
-
- 25
-
-
- 2)ws host
-
-
- True
-
-
- 526, 130
-
-
- 59, 12
-
-
- 24
-
-
- 1)ws path
-
-
- True
-
-
- 469, 53
-
-
- 215, 12
-
-
- 23
-
-
- 1)http host Separated by commas (,)
-
-
- True
-
-
- 9, 201
-
-
- 23, 12
-
-
- 22
-
-
- TLS
-
-
-
-
-
- tls
-
-
- 124, 197
-
-
- 143, 20
-
-
- 21
-
-
- True
-
-
- 282, 34
-
-
- 299, 12
-
-
- 20
-
-
- *tcp or kcp or QUIC camouflage type, default none
-
-
- 158, 58
-
-
- True
-
-
- 300, 53
-
-
- 16
-
-
- True
-
-
- 9, 34
-
-
- 95, 12
-
-
- 19
-
-
- Camouflage type
-
-
- True
-
-
- 9, 62
-
-
- 143, 12
-
-
- 17
-
-
- Camouflage domain(host)
-
none
@@ -471,51 +216,6 @@
18
-
- Bottom
-
-
- 3, 237
-
-
- 723, 234
-
-
- 21
-
-
- Keep the default value if it is not clear
-
-
- True
-
-
- 353, 175
-
-
- 113, 12
-
-
- 15
-
-
- *Default value tcp
-
-
- True
-
-
- 353, 147
-
-
- 119, 12
-
-
- 14
-
-
- *Recommended (auto)
-
tcp
@@ -540,21 +240,6 @@
12
-
- True
-
-
- 12, 175
-
-
- 167, 12
-
-
- 13
-
-
- Transport protocol(network)
-
aes-128-gcm
@@ -576,140 +261,20 @@
6
-
- 127, 199
+
+
-
- 143, 21
+
+ tls
-
- 11
+
+ 124, 197
-
- True
+
+ 143, 20
-
- 12, 203
-
-
- 95, 12
-
-
- 10
-
-
- Alias (remarks)
-
-
- True
-
-
- 12, 147
-
-
- 173, 12
-
-
- 8
-
-
- Encryption method (security)
-
-
- 127, 114
-
-
- 143, 21
-
-
- 7
-
-
- True
-
-
- 12, 118
-
-
- 47, 12
-
-
- 6
-
-
- AlterId
-
-
- 127, 85
-
-
- 278, 21
-
-
- 5
-
-
- True
-
-
- 12, 89
-
-
- 53, 12
-
-
- 4
-
-
- UUID(id)
-
-
- 127, 56
-
-
- 143, 21
-
-
- 3
-
-
- True
-
-
- 12, 60
-
-
- 29, 12
-
-
- 2
-
-
- Port
-
-
- 127, 27
-
-
- 359, 21
-
-
- 1
-
-
- True
-
-
- 12, 31
-
-
- 47, 12
-
-
- 0
-
-
- Address
+
+ 21
Fill
@@ -726,29 +291,422 @@
Server
-
- 303, 17
-
-
- 75, 23
-
-
- 5
-
-
- &OK
-
-
+
Bottom
-
- 0, 509
+
+ 3, 237
-
- 729, 60
+
+ 723, 234
-
- 7
+
+ 21
+
+
+ Keep the default value if it is not clear
+
+
+ True
+
+
+ 12, 31
+
+
+ 47, 12
+
+
+ 0
+
+
+ Address
+
+
+ True
+
+
+ 9, 62
+
+
+ 143, 12
+
+
+ 17
+
+
+ Camouflage domain(host)
+
+
+ True
+
+
+ 9, 34
+
+
+ 95, 12
+
+
+ 19
+
+
+ Camouflage type
+
+
+ True
+
+
+ 282, 34
+
+
+ 299, 12
+
+
+ 20
+
+
+ *tcp or kcp or QUIC camouflage type, default none
+
+
+ True
+
+
+ 285, 203
+
+
+ 113, 12
+
+
+ 22
+
+
+ * Fill in manually
+
+
+ True
+
+
+ 469, 53
+
+
+ 215, 12
+
+
+ 23
+
+
+ 1)http host Separated by commas (,)
+
+
+ True
+
+
+ 9, 201
+
+
+ 23, 12
+
+
+ 22
+
+
+ TLS
+
+
+ True
+
+
+ 526, 130
+
+
+ 59, 12
+
+
+ 24
+
+
+ 1)ws path
+
+
+ True
+
+
+ 469, 68
+
+
+ 59, 12
+
+
+ 25
+
+
+ 2)ws host
+
+
+ True
+
+
+ 526, 147
+
+
+ 59, 12
+
+
+ 26
+
+
+ 2)h2 path
+
+
+ True
+
+
+ 9, 125
+
+
+ 29, 12
+
+
+ 27
+
+
+ Path
+
+
+ True
+
+
+ 12, 60
+
+
+ 29, 12
+
+
+ 2
+
+
+ Port
+
+
+ True
+
+
+ 469, 83
+
+
+ 203, 12
+
+
+ 29
+
+
+ 3)h2 host Separated by commas (,)
+
+
+ True
+
+
+ 12, 11
+
+
+ 83, 12
+
+
+ 31
+
+
+ allowInsecure
+
+
+ True
+
+
+ 205, 11
+
+
+ 113, 12
+
+
+ 32
+
+
+ Default value true
+
+
+ True
+
+
+ NoControl
+
+
+ 470, 99
+
+
+ 89, 12
+
+
+ 34
+
+
+ 4)QUIC securty
+
+
+ True
+
+
+ NoControl
+
+
+ 526, 165
+
+
+ 65, 12
+
+
+ 35
+
+
+ 3)QUIC key
+
+
+ True
+
+
+ 12, 89
+
+
+ 53, 12
+
+
+ 4
+
+
+ UUID(id)
+
+
+ True
+
+
+ 12, 118
+
+
+ 47, 12
+
+
+ 6
+
+
+ AlterId
+
+
+ True
+
+
+ 12, 147
+
+
+ 173, 12
+
+
+ 8
+
+
+ Encryption method (security)
+
+
+ True
+
+
+ 12, 203
+
+
+ 95, 12
+
+
+ 10
+
+
+ Alias (remarks)
+
+
+ True
+
+
+ 12, 175
+
+
+ 167, 12
+
+
+ 13
+
+
+ Transport protocol(network)
+
+
+ True
+
+
+ 353, 147
+
+
+ 119, 12
+
+
+ 14
+
+
+ *Recommended (auto)
+
+
+ True
+
+
+ 353, 175
+
+
+ 113, 12
+
+
+ 15
+
+
+ *Default value tcp
+
+
+ 162, 21
+
+
+ Import configuration file
+
+
+ 237, 22
+
+
+ Import client configuration
+
+
+ 237, 22
+
+
+ Import URL from clipboard
+
+
+ 237, 22
+
+
+ Import server configuration
+
+
+ 0, 0
+
+
+ 729, 25
+
+
+ 8
+
+
+ 17, 17
Top
@@ -762,55 +720,97 @@
6
-
- 17, 17
+
+ Bottom
-
- 237, 22
+
+ 0, 509
-
- Import client configuration
+
+ 729, 60
-
- 237, 22
+
+ 7
-
- Import server configuration
+
+ 284, 189
+
+
+ 338, 35
+
+
+ 33
234, 6
-
- 237, 22
+
+ 127, 27
-
- Import URL from clipboard
+
+ 359, 21
-
- 162, 21
+
+ 1
-
- Import configuration file
+
+ 127, 114
-
- 0, 0
+
+ 143, 21
-
- 729, 25
+
+ 7
-
- 8
+
+ 127, 85
-
+
+ 278, 21
+
+
+ 5
+
+
+ 124, 125
+
+
True
-
- 6, 12
+
+ 396, 54
-
- 729, 569
+
+ 28
-
- Edit or add a [VMess] server
+
+ 127, 56
+
+
+ 143, 21
+
+
+ 3
+
+
+ 127, 199
+
+
+ 143, 21
+
+
+ 11
+
+
+ 158, 58
+
+
+ True
+
+
+ 300, 53
+
+
+ 16
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
index 7c5b3623..7b21f2b3 100644
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -117,51 +117,63 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 编辑或添加[VMess]服务器
+
取消(&C)
-
- 服务器
-
生成(&G)
-
- *手填,方便识别管理
+
+ 确定(&O)
+
+
+ 127, 171
+
+
+ 211, 20
+
+
+ 127, 143
+
+
+ 211, 20
+
+
+ 服务器
不清楚则保持默认值
-
-
- 95, 12
+
+ 83, 12
-
- 3)QUIC 加密密钥
+
+ 地址(address)
-
- 95, 12
+
+ 89, 12
-
- 4)QUIC 加密方式
+
+ 伪装域名(host)
-
- 53, 12
+
+ 89, 12
-
- 默认true
+
+ 伪装类型(type)
-
- 149, 12
+
+ 197, 12
-
- 3)h2 host中间逗号(,)隔开
+
+ *tcp或kcp或QUIC伪装类型,默认none
-
- 65, 12
-
-
- 路径(path)
+
+ *手填,方便识别管理
161, 12
@@ -175,83 +187,11 @@
底层传输安全
-
- 197, 12
-
-
- *tcp或kcp或QUIC伪装类型,默认none
-
-
- 124, 58
-
-
- 334, 51
-
-
- 89, 12
-
-
- 伪装类型(type)
-
-
- 89, 12
-
-
- 伪装域名(host)
-
-
- 143, 12
-
-
- *默认tcp,选错会无法连接
-
-
- 113, 12
-
-
- *随便选,建议(auto)
-
-
- 127, 171
-
-
- 211, 20
-
-
- 107, 12
-
-
- 传输协议(network)
-
-
- 127, 143
-
-
- 211, 20
-
-
- 83, 12
-
-
- 别名(remarks)
-
-
- 113, 12
-
-
- 加密方式(security)
-
-
- 95, 12
-
-
- 额外ID(alterId)
-
-
+
65, 12
-
- 用户ID(id)
+
+ 路径(path)
65, 12
@@ -259,14 +199,71 @@
端口(port)
-
+
+ 149, 12
+
+
+ 3)h2 host中间逗号(,)隔开
+
+
+ 53, 12
+
+
+ 默认true
+
+
+ 95, 12
+
+
+ 4)QUIC 加密方式
+
+
+ 95, 12
+
+
+ 3)QUIC 加密密钥
+
+
+ 65, 12
+
+
+ 用户ID(id)
+
+
+ 95, 12
+
+
+ 额外ID(alterId)
+
+
+ 113, 12
+
+
+ 加密方式(security)
+
+
83, 12
-
- 地址(address)
+
+ 别名(remarks)
-
- 确定(&O)
+
+ 107, 12
+
+
+ 传输协议(network)
+
+
+ 113, 12
+
+
+ *随便选,建议(auto)
+
+
+ 143, 12
+
+
+ *默认tcp,选错会无法连接
92, 21
@@ -280,6 +277,12 @@
导入客户端配置
+
+ 171, 22
+
+
+ 从剪贴板导入URL
+
171, 22
@@ -289,13 +292,10 @@
168, 6
-
- 171, 22
+
+ 124, 58
-
- 从剪贴板导入URL
-
-
- 编辑或添加[VMess]服务器
+
+ 334, 51
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index 743ae63f..d221a5c6 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -118,180 +118,73 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Fill
-
-
- 3, 17
+
+
+ 6, 12
+
+
+ 952, 593
+
+
+ True
+
+
+ 4, 4, 4, 4
+
+
+ v2rayN
+
+
+ 65
+
+
+ 498, 17
+
+
+ 356, 534
327, 17
-
- 355, 22
+
+ NoControl
-
- Add [VMess] server
+
+ 265, 164
-
- 355, 22
+
+ 137, 17
-
- Add [Shadowsocks] server
+
+ Fill
-
- 355, 22
+
+ 0, 66
-
- Add [Socks] server
+
+ 952, 351
-
- 355, 22
+
+ 2
-
- Add a custom configuration server
+
+ Servers list
-
- 355, 22
+
+ Bottom
-
- Import bulk URL from clipboard (Ctrl+V)
+
+ 0, 417
-
- 355, 22
+
+ 952, 176
-
- Scan QR code on the screen (Ctrl+S)
+
+ 4
-
- 352, 6
-
-
- 355, 22
-
-
- Remove selected servers (Delete)
-
-
- 355, 22
-
-
- Remove duplicate servers
-
-
- 355, 22
-
-
- Clone selected server
-
-
- 355, 22
-
-
- Set as active server (Enter)
-
-
- 352, 6
-
-
- 355, 22
-
-
- Move to top (T)
-
-
- 355, 22
-
-
- Up (U)
-
-
- 355, 22
-
-
- Down (D)
-
-
- 355, 22
-
-
- Move to bottom (B)
-
-
- 355, 22
-
-
- Select All (Ctrl+A)
-
-
- 352, 6
-
-
- 355, 22
-
-
- Test servers ping (Ctrl+P)
-
-
- 355, 22
-
-
- Test servers with tcping (Ctrl+O)
-
-
- 355, 22
-
-
- Test servers real delay (Ctrl+R)
-
-
- 355, 22
-
-
- Test servers download speed (Ctrl+T)
-
-
- 352, 6
-
-
- 355, 22
-
-
- Export selected server for client configuration
-
-
- 355, 22
-
-
- Export selected server for server configuration
-
-
- 355, 22
-
-
- Export share URLs to clipboard (Ctrl+C)
-
-
- 355, 22
-
-
- Export subscription (base64) share to clipboard
-
-
- Magenta
-
-
- 64, 53
-
-
- Servers
-
-
- ImageAboveText
-
-
- 356, 534
+
+ Informations
Fill
@@ -319,48 +212,86 @@
686, 331
-
1
-
- Fill
+
+ 355, 22
-
- 0, 0
+
+ Add a custom configuration server
-
- 256, 331
+
+ 355, 22
-
- 0
+
+ Import bulk URL from clipboard (Ctrl+V)
-
- 100
+
+ 264, 22
-
- 946, 331
+
+ Import bulk URL from clipboard
-
- 686
+
+ 355, 22
-
- 2
+
+ Add [Shadowsocks] server
-
- 17, 17
+
+ 355, 22
-
- 137, 17
+
+ Add [Socks] server
-
- NoControl
+
+ 355, 22
-
- 411, 22
+
+ Add [VMess] server
-
- Not Enabled Http Proxy
+
+ 264, 22
+
+
+ Copy local PAC URL
+
+
+ 355, 22
+
+
+ Clone selected server
+
+
+ 264, 22
+
+
+ Exit
+
+
+ 355, 22
+
+
+ Export selected server for client configuration
+
+
+ 355, 22
+
+
+ Export selected server for server configuration
+
+
+ 355, 22
+
+
+ Export share URLs to clipboard (Ctrl+C)
+
+
+ 355, 22
+
+
+ Export subscription (base64) share to clipboard
411, 22
@@ -380,41 +311,83 @@
Only open Http proxy and clear the proxy settings
-
- 411, 22
-
-
- Only open PAC and clear the proxy settings
-
411, 22
Only open Http proxy and do nothing
+
+ 411, 22
+
+
+ Only open PAC and clear the proxy settings
+
411, 22
Only open PAC and do nothing
-
- 264, 22
+
+ 355, 22
-
- Http proxy
+
+ Move to bottom (B)
-
- 264, 22
+
+ 355, 22
-
- Server
+
+ Down (D)
-
- 264, 22
+
+ 355, 22
-
- Import bulk URL from clipboard
+
+ Move to top (T)
+
+
+ 355, 22
+
+
+ Up (U)
+
+
+ 411, 22
+
+
+ Not Enabled Http Proxy
+
+
+ 355, 22
+
+
+ Test servers ping (Ctrl+P)
+
+
+ 355, 22
+
+
+ Test servers real delay (Ctrl+R)
+
+
+ 355, 22
+
+
+ Remove duplicate servers
+
+
+ 355, 22
+
+
+ Remove selected servers (Delete)
+
+
+ 355, 22
+
+
+ Scan QR code on the screen (Ctrl+S)
264, 22
@@ -422,90 +395,132 @@
Scan QR code on the screen
-
+
+ 355, 22
+
+
+ Select All (Ctrl+A)
+
+
264, 22
-
- Copy local PAC URL
+
+ Server
-
- 261, 6
+
+ 355, 22
-
+
+ Set as active server (Enter)
+
+
+ 355, 22
+
+
+ Test servers download speed (Ctrl+T)
+
+
264, 22
-
- Exit
+
+ Http proxy
-
- 265, 164
+
+ 355, 22
+
+
+ Test servers with tcping (Ctrl+O)
v2rayN
+
+ 17, 17
+
True
-
- 498, 17
+
+ Top
-
+
+ 0, 56
+
+
+ 952, 10
+
+
+ 5
+
+
Fill
-
- 0, 66
+
+ 0, 0
-
- 952, 351
+
+ 256, 331
-
- 2
-
-
- Servers list
-
-
- Fill
-
-
- 3, 17
-
-
+
0
-
- True
+
+ Fill
-
- Vertical
+
+ 3, 17
-
- 946, 134
+
+ 100
-
+
+ 946, 331
+
+
+ 686
+
+
2
+
+ 3, 151
+
+
+ 946, 22
+
+
+ 7
+
+
+ statusStrip1
+
228, 18
-
- 微软雅黑, 8pt
-
-
- 52, 17
-
-
- SOCKS5:
-
-
- 0, 17
-
微软雅黑, 8pt
195, 17
+
+ 微软雅黑, 8pt
+
+
+ 195, 17
+
+
+ 微软雅黑, 8pt
+
+
+ 195, 17
+
+
+ 0, 17
+
+
+ 0, 17
+
微软雅黑, 8pt
@@ -515,15 +530,9 @@
HTTP:
-
+
0, 17
-
- 微软雅黑, 8pt
-
-
- 195, 17
-
微软雅黑, 8pt
@@ -533,15 +542,6 @@
PAC:
-
- 0, 17
-
-
- 微软雅黑, 8pt
-
-
- 195, 17
-
False
@@ -560,81 +560,142 @@
MiddleRight
-
+
0, 17
-
- 3, 151
+
+ 微软雅黑, 8pt
-
- 946, 22
+
+ 52, 17
-
- 7
+
+ SOCKS5:
-
- statusStrip1
+
+ 352, 6
-
- Bottom
+
+ 6, 56
-
- 0, 417
+
+ 6, 56
-
- 952, 176
+
+ 184, 6
-
- 4
+
+ 390, 6
-
- Informations
+
+ 261, 6
-
- Top
-
-
- 0, 56
-
-
- 952, 10
-
-
- 5
-
-
- 409, 17
+
+ 352, 6
6, 56
-
- 125, 22
+
+ 6, 56
-
- Settings
+
+ 352, 6
-
- 125, 22
-
-
- Updates
-
-
- Magenta
-
-
- 99, 53
-
-
- Subscriptions
-
-
- ImageAboveText
+
+ 6, 56
6, 56
+
+ 352, 6
+
+
+ 187, 22
+
+
+ v2rayN Project
+
+
+ 393, 22
+
+
+ Simplify PAC (need to set Core route)
+
+
+ Magenta
+
+
+ 128, 53
+
+
+ Check for updates
+
+
+ ImageAboveText
+
+
+ 393, 22
+
+
+ Update v2rayCore
+
+
+ 393, 22
+
+
+ v2rayN (this software)
+
+
+ 393, 22
+
+
+ Check for updated PAC (need the HTTP proxy are ON)
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
+ 8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
+
+
+
+ Magenta
+
+
+ 52, 53
+
+
+ Close
+
+
+ ImageAboveText
+
+
+ Magenta
+
+
+ 48, 53
+
+
+ Help
+
+
+ ImageAboveText
+
+
+ 187, 22
+
+
+ Language-[English]
+
+
+ 187, 22
+
+
+ 语言-[中文简体]
+
Magenta
@@ -647,8 +708,17 @@
ImageAboveText
-
- 6, 56
+
+ Magenta
+
+
+ 89, 53
+
+
+ Promotion
+
+
+ ImageAboveText
@@ -676,56 +746,41 @@
ImageAboveText
-
- 6, 56
-
-
- 393, 22
-
-
- v2rayN (this software)
-
-
- 393, 22
-
-
- Update v2rayCore
-
-
- 393, 22
-
-
- Check for updated PAC (need the HTTP proxy are ON)
-
-
- 390, 6
-
-
- 393, 22
-
-
- Simplify PAC (need to set Core route)
-
-
+
Magenta
-
- 128, 53
+
+ 64, 53
-
- Check for updates
+
+ Servers
-
+
ImageAboveText
-
- 6, 56
+
+ Magenta
-
- 187, 22
+
+ 99, 53
-
- v2rayN Project
+
+ Subscriptions
+
+
+ ImageAboveText
+
+
+ 125, 22
+
+
+ Settings
+
+
+ 125, 22
+
+
+ Updates
187, 22
@@ -733,67 +788,6 @@
V2Ray Website
-
- 184, 6
-
-
- 187, 22
-
-
- Language-[English]
-
-
- 187, 22
-
-
- 语言-[中文简体]
-
-
- Magenta
-
-
- 48, 53
-
-
- Help
-
-
- ImageAboveText
-
-
- Magenta
-
-
- 89, 53
-
-
- Promotion
-
-
- ImageAboveText
-
-
- 6, 56
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
- 8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
-
-
-
- Magenta
-
-
- 52, 53
-
-
- Close
-
-
- ImageAboveText
-
0, 0
@@ -803,22 +797,28 @@
6
-
+
+ 409, 17
+
+
+ Fill
+
+
+ 3, 17
+
+
+ 0
+
+
True
-
- 65
+
+ Vertical
-
- 6, 12
+
+ 946, 134
-
- 952, 593
-
-
- 4, 4, 4, 4
-
-
- v2rayN
+
+ 2
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
index 1fdca7f8..3b7d84b5 100644
--- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx
@@ -118,23 +118,34 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 300, 22
+
+ 301, 534
-
- 添加[VMess]服务器
+
+ 196, 142
-
- 300, 22
+
+ 服务器列表
-
- 添加[Shadowsocks]服务器
+
+ 信息
-
- 300, 22
-
-
- 添加[Socks]服务器
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0
+ ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
+ PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA
+ BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5
+ bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp
+ bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz
+ dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA
+ CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp
+ bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5
+ bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3
+ ////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0
+ ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
+
300, 22
@@ -148,26 +159,35 @@
从剪贴板导入批量URL (Ctrl+V)
-
+
+ 195, 22
+
+
+ 从剪贴板导入批量URL
+
+
300, 22
-
- 扫描屏幕上的二维码 (Ctrl+S)
+
+ 添加[Shadowsocks]服务器
-
- 297, 6
-
-
+
300, 22
-
- 移除所选服务器(多选) (Delete)
+
+ 添加[Socks]服务器
-
+
300, 22
-
- 移除重复的服务器
+
+ 添加[VMess]服务器
+
+
+ 195, 22
+
+
+ 复制本地PAC网址
300, 22
@@ -175,74 +195,11 @@
克隆所选服务器
-
- 300, 22
+
+ 195, 22
-
- 设为活动服务器 (Enter)
-
-
- 297, 6
-
-
- 300, 22
-
-
- 上移至顶 (T)
-
-
- 300, 22
-
-
- 上移 (U)
-
-
- 300, 22
-
-
- 下移 (D)
-
-
- 300, 22
-
-
- 下移至底 (B)
-
-
- 300, 22
-
-
- 全选 (Ctrl+A)
-
-
- 297, 6
-
-
- 300, 22
-
-
- 测试服务器延迟Ping(多选) (Ctrl+P)
-
-
- 300, 22
-
-
- 测试服务器延迟Tcping(多选) (Ctrl+O)
-
-
- 300, 22
-
-
- 测试服务器真连接延迟(多选) (Ctrl+R)
-
-
- 300, 22
-
-
- 测试服务器速度(多选) (Ctrl+T)
-
-
- 297, 6
+
+ 退出
300, 22
@@ -268,38 +225,6 @@
批量导出订阅内容至剪贴板(多选)
-
- 73, 53
-
-
- 服务器
-
-
- 301, 534
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
- LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0
- ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
- PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA
- BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5
- bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp
- bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz
- dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA
- CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp
- bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5
- bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3
- ////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0
- ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
-
-
-
- 316, 22
-
-
- 关闭Http代理
-
316, 22
@@ -318,41 +243,83 @@
仅开启Http代理,并清除系统代理
-
- 316, 22
-
-
- 仅开启PAC,并清除系统代理
-
316, 22
仅开启Http代理,不改变系统代理
+
+ 316, 22
+
+
+ 仅开启PAC,并清除系统代理
+
316, 22
仅开启PAC,不改变系统代理
-
- 195, 22
+
+ 300, 22
-
- Http代理
+
+ 下移至底 (B)
-
- 195, 22
+
+ 300, 22
-
- 服务器
+
+ 下移 (D)
-
- 195, 22
+
+