diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index 05971a6e..5a3fcb8a 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -62,6 +62,7 @@ this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem(); this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem(); this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); this.menuGithubUpload = new System.Windows.Forms.ToolStripMenuItem(); this.menuGithubFetch = new System.Windows.Forms.ToolStripMenuItem(); this.menuGithubSettings = new System.Windows.Forms.ToolStripMenuItem(); @@ -128,7 +129,6 @@ this.tsbPromotion = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.tsbClose = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -214,6 +214,7 @@ this.menuGithubFetch, this.menuGithubSettings}); this.cmsLv.Name = "cmsLv"; + this.cmsLv.OwnerItem = this.tsbServer; resources.ApplyResources(this.cmsLv, "cmsLv"); // // menuAddVmessServer @@ -386,6 +387,11 @@ resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent"); this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click); // + // toolStripSeparator14 + // + this.toolStripSeparator14.Name = "toolStripSeparator14"; + resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14"); + // // menuGithubUpload // this.menuGithubUpload.Name = "menuGithubUpload"; @@ -839,11 +845,6 @@ this.tsbClose.Name = "tsbClose"; this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click); // - // toolStripSeparator14 - // - this.toolStripSeparator14.Name = "toolStripSeparator14"; - resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14"); - // // MainForm // resources.ApplyResources(this, "$this"); diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 4fb8a8c9..1e09bedf 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -297,22 +297,34 @@ 355, 22 - Upload VMess to Github + Upload vmesses to github 355, 22 - Fetch vmesses from github. + Fetch vmesses from github 355, 22 - Github Remote Settings + Github remote storage settings + + + Magenta + + + 64, 53 + + + Servers + + + ImageAboveText - 356, 650 + 356, 672 cmsLv @@ -434,18 +446,6 @@ 0 - - Magenta - - - 64, 53 - - - Servers - - - ImageAboveText - 17, 17 @@ -1193,6 +1193,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator14 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + menuGithubUpload @@ -1541,12 +1547,6 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator14 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm