diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index df1bd0d6..63c24d03 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -133,8 +133,8 @@
97, 53
-
- 355, 22
+
+ groupBox2
Add [VLESS] server
@@ -148,8 +148,8 @@
Restart service
-
- menuCopyServer
+
+ tsbSubSetting
264, 22
@@ -163,8 +163,8 @@
Add [Socks] server
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -173,9 +173,6 @@
ImageAboveText
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
227, 22
@@ -201,12 +198,6 @@
toolStripSeparator6
-
- 355, 22
-
-
- menuMoveDown
-
99, 53
@@ -225,6 +216,9 @@
toolSslBlank2
+
+ menuAddVmessServer
+
355, 22
@@ -234,15 +228,15 @@
tsbCheckUpdateN
+
+ 45, 53
+
Do not change system proxy
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- menuExport2SubContent
-
toolStripSeparator7
@@ -252,8 +246,8 @@
Magenta
-
- menuKeepNothing
+
+ menuMsgBoxAddRoutingRule
355, 22
@@ -261,8 +255,8 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Fill
+
+ menuExport2SubContent
52, 21
@@ -273,11 +267,8 @@
227, 22
-
- 952, 327
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tsbQRCodeSwitch
Add Routing Rule (Ctrl+V)
@@ -294,9 +285,6 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
Copy All
@@ -309,11 +297,8 @@
Export selected server for server configuration
-
- 0, 21
-
-
- toolStripSeparator11
+
+ ImageAboveText
952, 56
@@ -324,18 +309,24 @@
0
+
+ menuRealPingServer
+
Test servers real delay (Ctrl+R)
menuTcpingServer
-
- ImageAboveText
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 356, 622
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -357,6 +348,9 @@
203, 22
+
+ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
menuMsgBoxCopy
@@ -366,14 +360,14 @@
tsbClose
-
- 125, 22
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 256, 307
+
+ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 187, 22
+
+ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -389,13 +383,13 @@
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd
- QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X
- jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY
- 6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3
- NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY
- B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAATdJREFUWEftloENAiEMRW8ER3AEN9ANdARHcAPdwBF0A91AN9INtC+5JvUCJwWM
+ mvCTFw3QUiiU65qa/lUTYT6Ato9rJZyERwT6GFNdU+EihCYNwVhsqmgm3AR1fheOAitd9PCfNvp0HDbY
+ FolV2MmZZCzX9J0FG0TRTlwFdbahIVE7Qe1IR5bYVnXCyr2yO5F1MNUBec25YtjomcCXSxhr9DmrV2Gr
+ flyL4GSrYcm9tmnEZ7JsAC7DgWr5ydbXA8hOAcVjG8FTD6ocQgvXKrW8MqFWUfc1DAXgmRwVFaJQAHsh
+ VbYUU87diqWA934sl/TZ7wV2Lesx0gBwsO5/1Sl5PQhLQb+G+E+bfTm9KXsRAVgHrMK+jO9gbNEzzMSh
+ 6DlM9nANoa+kdCeLXLNLFtc9b2r6EXXdE4e4mdByNuG1AAAAAElFTkSuQmCC
@@ -404,8 +398,8 @@
4
-
- 3, 17
+
+ Bottom
355, 22
@@ -431,17 +425,14 @@
menuAddCustomServer
-
- txtMsgBox
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ menuMoveDown
Import bulk URL from clipboard
-
- 184, 6
+
+ 243, 22
Move to bottom (B)
@@ -485,20 +476,20 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- menuKeepClear
+
+ 180, 22
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 3, 17
+
System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Bottom
-
-
- Export share URLs to clipboard (Ctrl+C)
+
+ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
scMain.Panel2
@@ -515,14 +506,14 @@
Fill
-
- 3
+
+ tsbServer
Add [VMess] server
-
- System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -554,8 +545,8 @@
tsbPromotion
-
- 128, 53
+
+ 256, 307
4, 4, 4, 4
@@ -566,8 +557,11 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 352, 6
+
+ 6, 56
+
+
+ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
groupBox1
@@ -591,7 +585,7 @@
menuRoutings
- 161, 22
+ 180, 22
355, 22
@@ -611,20 +605,17 @@
686
-
- tsbTestMe
-
265, 170
-
- 243, 22
+
+ 355, 22
$this
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ menuUpdateSubscriptions
scMain
@@ -635,9 +626,6 @@
tsbCheckUpdateXrayCore
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
0, 21
@@ -650,8 +638,8 @@
5
-
- System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 125, 22
scMain
@@ -662,8 +650,8 @@
HTTP:
-
- Remove selected servers (Delete)
+
+ tsbReload
0
@@ -683,6 +671,9 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Vertical
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -692,20 +683,20 @@
ImageAboveText
-
- 1
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
Promotion
-
- menuAddServers
+
+ System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
355, 22
-
- menuAddVmessServer
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tsbLanguageZhHans
@@ -722,12 +713,6 @@
menuExport2ShareUrl
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tsMain
-
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -749,8 +734,8 @@
0, 66
-
- 6
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -764,6 +749,9 @@
menuAddShadowsocksServer
+
+ txtMsgBox
+
toolSslBlank4
@@ -779,9 +767,6 @@
Language-[English]
-
- tsbSubSetting
-
264, 22
@@ -794,20 +779,20 @@
Routing
+
+ 128, 53
+
Add [Trojan] server
- 161, 22
-
-
- System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ 180, 22
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ImageAboveText
+
+ toolStripSeparator11
System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -827,15 +812,15 @@
V2Ray Website
+
+ menuKeepClear
+
No
1
-
- tsbV2rayWebsite
-
cmsMsgBox
@@ -868,8 +853,8 @@
ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
-
- menuMsgBoxAddRoutingRule
+
+ 952, 327
menuScanScreen
@@ -886,20 +871,17 @@
6, 56
+
+ Fill
+
toolSslBlank1
-
- scMain.Panel1
-
-
- tsbReload
-
tsbSubUpdate
-
- 微软雅黑, 8pt
+
+ tsMain
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -916,12 +898,18 @@
menuSysAgentMode
+
+ menuKeepNothing
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
ImageAboveText
+
+ 187, 22
+
Export subscription (base64) share to clipboard
@@ -940,9 +928,6 @@
menuServers
-
- menuUpdateSubscriptions
-
$this
@@ -958,11 +943,8 @@
System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Subscriptions
-
-
- tsbQRCodeSwitch
+
+ 0, 21
3, 171
@@ -973,18 +955,24 @@
355, 22
-
- 6, 56
+
+ Subscriptions
952, 10
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
Updates
264, 22
+
+ toolStripSeparator14
+
0
@@ -1018,12 +1006,6 @@
System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
Top
@@ -1036,11 +1018,8 @@
Settings
-
- 45, 53
-
-
- System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ menuCopyServer
Http proxy
@@ -1057,8 +1036,8 @@
MainForm
-
- toolStripSeparator9
+
+ 微软雅黑, 8pt
menuExit
@@ -1078,8 +1057,8 @@
lvServers
-
- menuRealPingServer
+
+ scMain.Panel1
Magenta
@@ -1090,8 +1069,8 @@
menuGlobal
-
- 100
+
+ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
2
@@ -1123,8 +1102,8 @@
Informations
-
- $this
+
+ 3
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1144,11 +1123,11 @@
menuRemoveServer
-
- tsbServer
+
+ tsbBackupGuiNConfig
-
- Test current service status
+
+ tsbTestMe
355, 22
@@ -1177,6 +1156,9 @@
243, 22
+
+ Remove selected servers (Delete)
+
355, 22
@@ -1201,6 +1183,12 @@
355, 22
+
+ 1
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1219,8 +1207,8 @@
微软雅黑, 8pt
-
- Vertical
+
+ Export share URLs to clipboard (Ctrl+C)
243, 22
@@ -1270,8 +1258,8 @@
微软雅黑, 8pt
-
- groupBox2
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
ImageAboveText
@@ -1282,11 +1270,11 @@
203, 22
-
- 356, 622
+
+ 184, 6
-
- 0, 0
+
+ 355, 22
Up (U)
@@ -1312,6 +1300,9 @@
tsbOptionSetting
+
+ 100
+
System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1333,6 +1324,9 @@
946, 26
+
+ 6
+
355, 22
@@ -1360,8 +1354,8 @@
952, 593
-
- Scan QR code on the screen
+
+ Test current service status
toolSslSocksPort
@@ -1393,18 +1387,18 @@
0
-
+
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ImageAboveText
-
264, 22
6, 56
+
+ toolStripSeparator9
+
System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1417,8 +1411,11 @@
52, 53
-
- System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ImageAboveText
+
+
+ menuAddServers
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1432,6 +1429,9 @@
System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ Scan QR code on the screen
+
0, 56
@@ -1450,6 +1450,9 @@
Import bulk URL from clipboard (Ctrl+V)
+
+ $this
+
Update XrayCore
@@ -1462,6 +1465,9 @@
Add a custom configuration server
+
+ 177, 6
+
toolSslHttpPort
@@ -1471,6 +1477,12 @@
System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 352, 6
+
+
+ 3, 17
+
952, 200
@@ -1480,20 +1492,26 @@
System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 0, 0
+
Fill
-
- 3, 17
+
+ tsbV2rayWebsite
toolStripSeparator3
+
+ BackupGuiConfig
+
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/
- GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+ wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
+ 8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
@@ -1505,9 +1523,15 @@
System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ImageAboveText
+
System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 228, 18
+
603, 17
@@ -1517,9 +1541,6 @@
True
-
- 228, 18
-
65