diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
index 0e3b713d..d0888af2 100644
--- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs
@@ -60,8 +60,8 @@
this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
- this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
+ this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
this.menuSysAgentMode = new System.Windows.Forms.ToolStripMenuItem();
@@ -111,6 +111,7 @@
this.tsbCheckClearPACList = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.tsbHelp = new System.Windows.Forms.ToolStripDropDownButton();
+ this.tsbV2rayWebsite = new System.Windows.Forms.ToolStripMenuItem();
this.tsbAbout = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.tsbLanguageDef = new System.Windows.Forms.ToolStripMenuItem();
@@ -118,7 +119,6 @@
this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.tsbClose = new System.Windows.Forms.ToolStripButton();
- this.tsbV2rayWebsite = new System.Windows.Forms.ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -197,6 +197,7 @@
this.menuExport2ShareUrl,
this.menuExport2SubContent});
this.cmsLv.Name = "cmsLv";
+ this.cmsLv.OwnerItem = this.tsbServer;
resources.ApplyResources(this.cmsLv, "cmsLv");
//
// menuAddVmessServer
@@ -357,6 +358,11 @@
resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
//
+ // qrCodeControl
+ //
+ resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
+ this.qrCodeControl.Name = "qrCodeControl";
+ //
// tsbServer
//
this.tsbServer.DropDown = this.cmsLv;
@@ -364,11 +370,6 @@
resources.ApplyResources(this.tsbServer, "tsbServer");
this.tsbServer.Name = "tsbServer";
//
- // qrCodeControl
- //
- resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
- this.qrCodeControl.Name = "qrCodeControl";
- //
// notifyMain
//
this.notifyMain.ContextMenuStrip = this.cmsMain;
@@ -703,8 +704,8 @@
// tsbHelp
//
this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.tsbV2rayWebsite,
this.tsbAbout,
+ this.tsbV2rayWebsite,
this.toolStripSeparator12,
this.tsbLanguageDef,
this.tsbLanguageZhHans});
@@ -712,6 +713,12 @@
resources.ApplyResources(this.tsbHelp, "tsbHelp");
this.tsbHelp.Name = "tsbHelp";
//
+ // tsbV2rayWebsite
+ //
+ this.tsbV2rayWebsite.Name = "tsbV2rayWebsite";
+ resources.ApplyResources(this.tsbV2rayWebsite, "tsbV2rayWebsite");
+ this.tsbV2rayWebsite.Click += new System.EventHandler(this.tsbV2rayWebsite_Click);
+ //
// tsbAbout
//
this.tsbAbout.Name = "tsbAbout";
@@ -754,12 +761,6 @@
this.tsbClose.Name = "tsbClose";
this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
//
- // tsbV2rayWebsite
- //
- this.tsbV2rayWebsite.Name = "tsbV2rayWebsite";
- resources.ApplyResources(this.tsbV2rayWebsite, "tsbV2rayWebsite");
- this.tsbV2rayWebsite.Click += new System.EventHandler(this.tsbV2rayWebsite_Click);
- //
// MainForm
//
resources.ApplyResources(this, "$this");
diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx
index 18ad432d..706b0042 100644
--- a/v2rayN/v2rayN/Forms/MainForm.resx
+++ b/v2rayN/v2rayN/Forms/MainForm.resx
@@ -129,151 +129,151 @@
327, 17
- 447, 22
+ 355, 22
Add [VMess] server
- 447, 22
+ 355, 22
Add [Shadowsocks] server
- 447, 22
+ 355, 22
Add [Socks] server
- 447, 22
+ 355, 22
Add a custom configuration server
- 447, 22
+ 355, 22
Import bulk URL from clipboard (Ctrl+V)
- 447, 22
+ 355, 22
Scan QR code on the screen
- 444, 6
+ 352, 6
- 447, 22
+ 355, 22
Remove selected servers (Delete)
- 447, 22
+ 355, 22
Remove duplicate servers
- 447, 22
+ 355, 22
Clone selected server
- 447, 22
+ 355, 22
Set as active server (Enter)
- 444, 6
+ 352, 6
- 447, 22
+ 355, 22
Move to top (Ctrl+U)
- 447, 22
+ 355, 22
Upward (U)
- 447, 22
+ 355, 22
Down (D)
- 447, 22
+ 355, 22
Move to bottom (Ctrl+D)
- 447, 22
+ 355, 22
Select All (Ctrl+A)
- 444, 6
+ 352, 6
- 447, 22
+ 355, 22
Test servers ping (Ctrl+P)
- 447, 22
+ 355, 22
Test servers with tcping (Ctrl+O)
- 447, 22
+ 355, 22
Test servers real delay (Ctrl+R)
- 447, 22
+ 355, 22
Test servers download speed (Ctrl+T)
- 444, 6
+ 352, 6
- 447, 22
+ 355, 22
Export selected server for client configuration
- 447, 22
+ 355, 22
Export selected server for server configuration
- 447, 22
+ 355, 22
Export share URLs to clipboard (Ctrl+C)
- 447, 22
+ 355, 22
Export subscription (base64) share to clipboard
@@ -291,7 +291,7 @@
ImageAboveText
- 448, 556
+ 356, 534
cmsLv
@@ -841,18 +841,18 @@
6, 56
-
- 187, 22
-
-
- V2Ray Website
-
187, 22
v2rayN Project
+
+ 187, 22
+
+
+ V2Ray Website
+
184, 6
@@ -1373,6 +1373,12 @@
System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ tsbV2rayWebsite
+
+
+ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
tsbAbout
@@ -1415,12 +1421,6 @@
System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- tsbV2rayWebsite
-
-
- System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
MainForm