add two context menu

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -62,8 +62,9 @@
       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.menuGithubUpload = new System.Windows.Forms.ToolStripMenuItem();
       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();
@@ -125,6 +126,7 @@
       this.tsbPromotion = new System.Windows.Forms.ToolStripButton();
       this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
       this.tsbClose = new System.Windows.Forms.ToolStripButton();
+      this.menuGithubFetch = new System.Windows.Forms.ToolStripMenuItem();
       ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
       this.scMain.Panel1.SuspendLayout();
       this.scMain.Panel2.SuspendLayout();
@@ -145,19 +147,17 @@
       // 
       // scMain.Panel1
       // 
-            resources.ApplyResources(this.scMain.Panel1, "scMain.Panel1");
       this.scMain.Panel1.Controls.Add(this.lvServers);
       // 
       // scMain.Panel2
       // 
-            resources.ApplyResources(this.scMain.Panel2, "scMain.Panel2");
       this.scMain.Panel2.Controls.Add(this.qrCodeControl);
       this.scMain.TabStop = false;
       // 
       // lvServers
       // 
-            resources.ApplyResources(this.lvServers, "lvServers");
       this.lvServers.ContextMenuStrip = this.cmsLv;
+      resources.ApplyResources(this.lvServers, "lvServers");
       this.lvServers.FullRowSelect = true;
       this.lvServers.GridLines = true;
       this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -176,7 +176,6 @@
       // 
       // cmsLv
       // 
-            resources.ApplyResources(this.cmsLv, "cmsLv");
       this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
       this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuAddVmessServer,
@@ -207,202 +206,209 @@
             this.menuExport2ClientConfig,
             this.menuExport2ServerConfig,
             this.menuExport2ShareUrl,
-            this.menuExport2SubContent});
+            this.menuExport2SubContent,
+            this.menuGithubUpload,
+            this.menuGithubFetch});
       this.cmsLv.Name = "cmsLv";
-            this.cmsLv.OwnerItem = this.tsbServer;
+      resources.ApplyResources(this.cmsLv, "cmsLv");
       // 
       // menuAddVmessServer
       // 
-            resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
       this.menuAddVmessServer.Name = "menuAddVmessServer";
+      resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
       this.menuAddVmessServer.Click += new System.EventHandler(this.menuAddVmessServer_Click);
       // 
       // menuAddVlessServer
       // 
-            resources.ApplyResources(this.menuAddVlessServer, "menuAddVlessServer");
       this.menuAddVlessServer.Name = "menuAddVlessServer";
+      resources.ApplyResources(this.menuAddVlessServer, "menuAddVlessServer");
       this.menuAddVlessServer.Click += new System.EventHandler(this.menuAddVlessServer_Click);
       // 
       // menuAddShadowsocksServer
       // 
-            resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
       this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
+      resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
       this.menuAddShadowsocksServer.Click += new System.EventHandler(this.menuAddShadowsocksServer_Click);
       // 
       // menuAddSocksServer
       // 
-            resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
       this.menuAddSocksServer.Name = "menuAddSocksServer";
+      resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
       this.menuAddSocksServer.Click += new System.EventHandler(this.menuAddSocksServer_Click);
       // 
       // menuAddCustomServer
       // 
-            resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
       this.menuAddCustomServer.Name = "menuAddCustomServer";
+      resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
       this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click);
       // 
       // menuAddServers
       // 
-            resources.ApplyResources(this.menuAddServers, "menuAddServers");
       this.menuAddServers.Name = "menuAddServers";
+      resources.ApplyResources(this.menuAddServers, "menuAddServers");
       this.menuAddServers.Click += new System.EventHandler(this.menuAddServers_Click);
       // 
       // menuScanScreen
       // 
-            resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
       this.menuScanScreen.Name = "menuScanScreen";
+      resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
       this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click);
       // 
       // toolStripSeparator1
       // 
-            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
       this.toolStripSeparator1.Name = "toolStripSeparator1";
+      resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
       // 
       // menuRemoveServer
       // 
-            resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
       this.menuRemoveServer.Name = "menuRemoveServer";
+      resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
       this.menuRemoveServer.Click += new System.EventHandler(this.menuRemoveServer_Click);
       // 
       // menuRemoveDuplicateServer
       // 
-            resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer");
       this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
+      resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer");
       this.menuRemoveDuplicateServer.Click += new System.EventHandler(this.menuRemoveDuplicateServer_Click);
       // 
       // menuCopyServer
       // 
-            resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
       this.menuCopyServer.Name = "menuCopyServer";
+      resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
       this.menuCopyServer.Click += new System.EventHandler(this.menuCopyServer_Click);
       // 
       // menuSetDefaultServer
       // 
-            resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
       this.menuSetDefaultServer.Name = "menuSetDefaultServer";
+      resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
       this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
       // 
       // toolStripSeparator3
       // 
-            resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
       this.toolStripSeparator3.Name = "toolStripSeparator3";
+      resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
       // 
       // menuMoveTop
       // 
-            resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
       this.menuMoveTop.Name = "menuMoveTop";
+      resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
       this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
       // 
       // menuMoveUp
       // 
-            resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
       this.menuMoveUp.Name = "menuMoveUp";
+      resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
       this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
       // 
       // menuMoveDown
       // 
-            resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
       this.menuMoveDown.Name = "menuMoveDown";
+      resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
       this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
       // 
       // menuMoveBottom
       // 
-            resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
       this.menuMoveBottom.Name = "menuMoveBottom";
+      resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
       this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
       // 
       // menuSelectAll
       // 
-            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
       this.menuSelectAll.Name = "menuSelectAll";
+      resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
       this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
       // 
       // toolStripSeparator9
       // 
-            resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
       this.toolStripSeparator9.Name = "toolStripSeparator9";
+      resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
       // 
       // menuPingServer
       // 
-            resources.ApplyResources(this.menuPingServer, "menuPingServer");
       this.menuPingServer.Name = "menuPingServer";
+      resources.ApplyResources(this.menuPingServer, "menuPingServer");
       this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
       // 
       // menuTcpingServer
       // 
-            resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
       this.menuTcpingServer.Name = "menuTcpingServer";
+      resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
       this.menuTcpingServer.Click += new System.EventHandler(this.menuTcpingServer_Click);
       // 
       // menuRealPingServer
       // 
-            resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
       this.menuRealPingServer.Name = "menuRealPingServer";
+      resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
       this.menuRealPingServer.Click += new System.EventHandler(this.menuRealPingServer_Click);
       // 
       // menuSpeedServer
       // 
-            resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
       this.menuSpeedServer.Name = "menuSpeedServer";
+      resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
       this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click);
       // 
       // tsbTestMe
       // 
-            resources.ApplyResources(this.tsbTestMe, "tsbTestMe");
       this.tsbTestMe.Name = "tsbTestMe";
+      resources.ApplyResources(this.tsbTestMe, "tsbTestMe");
       this.tsbTestMe.Click += new System.EventHandler(this.tsbTestMe_Click);
       // 
       // toolStripSeparator6
       // 
-            resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
       this.toolStripSeparator6.Name = "toolStripSeparator6";
+      resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
       // 
       // menuExport2ClientConfig
       // 
-            resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
       this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
+      resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
       this.menuExport2ClientConfig.Click += new System.EventHandler(this.menuExport2ClientConfig_Click);
       // 
       // menuExport2ServerConfig
       // 
-            resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
       this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
+      resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
       this.menuExport2ServerConfig.Click += new System.EventHandler(this.menuExport2ServerConfig_Click);
       // 
       // menuExport2ShareUrl
       // 
-            resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
       this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
+      resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
       this.menuExport2ShareUrl.Click += new System.EventHandler(this.menuExport2ShareUrl_Click);
       // 
       // menuExport2SubContent
       // 
-            resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
       this.menuExport2SubContent.Name = "menuExport2SubContent";
+      resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
       this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
       // 
-            // tsbServer
+      // menuGithubUpload
       // 
-            resources.ApplyResources(this.tsbServer, "tsbServer");
+      this.menuGithubUpload.Name = "menuGithubUpload";
-            this.tsbServer.DropDown = this.cmsLv;
+      resources.ApplyResources(this.menuGithubUpload, "menuGithubUpload");
-            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
-            this.tsbServer.Name = "tsbServer";
       // 
       // qrCodeControl
       // 
       resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
       this.qrCodeControl.Name = "qrCodeControl";
       // 
+      // tsbServer
+      // 
+      this.tsbServer.DropDown = this.cmsLv;
+      this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
+      resources.ApplyResources(this.tsbServer, "tsbServer");
+      this.tsbServer.Name = "tsbServer";
+      // 
       // notifyMain
       // 
-            resources.ApplyResources(this.notifyMain, "notifyMain");
       this.notifyMain.ContextMenuStrip = this.cmsMain;
+      resources.ApplyResources(this.notifyMain, "notifyMain");
       this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick);
       // 
       // cmsMain
       // 
-            resources.ApplyResources(this.cmsMain, "cmsMain");
       this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
+      resources.ApplyResources(this.cmsMain, "cmsMain");
       this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuSysAgentMode,
             this.menuServers,
@@ -419,7 +425,6 @@
       // 
       // menuSysAgentMode
       // 
-            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
       this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuNotEnabledHttp,
             this.menuGlobal,
@@ -429,87 +434,88 @@
             this.menuKeepNothing,
             this.menuKeepPACNothing});
       this.menuSysAgentMode.Name = "menuSysAgentMode";
+      resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
       // 
       // menuNotEnabledHttp
       // 
-            resources.ApplyResources(this.menuNotEnabledHttp, "menuNotEnabledHttp");
       this.menuNotEnabledHttp.Name = "menuNotEnabledHttp";
+      resources.ApplyResources(this.menuNotEnabledHttp, "menuNotEnabledHttp");
       this.menuNotEnabledHttp.Click += new System.EventHandler(this.menuNotEnabledHttp_Click);
       // 
       // menuGlobal
       // 
-            resources.ApplyResources(this.menuGlobal, "menuGlobal");
       this.menuGlobal.Name = "menuGlobal";
+      resources.ApplyResources(this.menuGlobal, "menuGlobal");
       this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click);
       // 
       // menuGlobalPAC
       // 
-            resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
       this.menuGlobalPAC.Name = "menuGlobalPAC";
+      resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
       this.menuGlobalPAC.Click += new System.EventHandler(this.menuGlobalPAC_Click);
       // 
       // menuKeep
       // 
-            resources.ApplyResources(this.menuKeep, "menuKeep");
       this.menuKeep.Name = "menuKeep";
+      resources.ApplyResources(this.menuKeep, "menuKeep");
       this.menuKeep.Click += new System.EventHandler(this.menuKeep_Click);
       // 
       // menuKeepPAC
       // 
-            resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
       this.menuKeepPAC.Name = "menuKeepPAC";
+      resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
       this.menuKeepPAC.Click += new System.EventHandler(this.menuKeepPAC_Click);
       // 
       // menuKeepNothing
       // 
-            resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
       this.menuKeepNothing.Name = "menuKeepNothing";
+      resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
       this.menuKeepNothing.Click += new System.EventHandler(this.menuKeepNothing_Click);
       // 
       // menuKeepPACNothing
       // 
-            resources.ApplyResources(this.menuKeepPACNothing, "menuKeepPACNothing");
       this.menuKeepPACNothing.Name = "menuKeepPACNothing";
+      resources.ApplyResources(this.menuKeepPACNothing, "menuKeepPACNothing");
       this.menuKeepPACNothing.Click += new System.EventHandler(this.menuKeepPACNothing_Click);
       // 
       // menuServers
       // 
-            resources.ApplyResources(this.menuServers, "menuServers");
       this.menuServers.Name = "menuServers";
+      resources.ApplyResources(this.menuServers, "menuServers");
       // 
       // menuAddServers2
       // 
-            resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
       this.menuAddServers2.Name = "menuAddServers2";
+      resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
       this.menuAddServers2.Click += new System.EventHandler(this.menuAddServers_Click);
       // 
       // menuScanScreen2
       // 
-            resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
       this.menuScanScreen2.Name = "menuScanScreen2";
+      resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
       this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click);
       // 
       // menuCopyPACUrl
       // 
-            resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
       this.menuCopyPACUrl.Name = "menuCopyPACUrl";
+      resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
       this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click);
       // 
       // menuUpdateSubscriptions
       // 
-            resources.ApplyResources(this.menuUpdateSubscriptions, "menuUpdateSubscriptions");
       this.menuUpdateSubscriptions.Name = "menuUpdateSubscriptions";
+      resources.ApplyResources(this.menuUpdateSubscriptions, "menuUpdateSubscriptions");
       this.menuUpdateSubscriptions.Click += new System.EventHandler(this.menuUpdateSubscriptions_Click);
       // 
       // toolStripSeparator2
       // 
-            resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
       this.toolStripSeparator2.Name = "toolStripSeparator2";
+      resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
       // 
       // menuExit
       // 
-            resources.ApplyResources(this.menuExit, "menuExit");
       this.menuExit.Name = "menuExit";
+      resources.ApplyResources(this.menuExit, "menuExit");
       this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
       // 
       // bgwScan
@@ -520,31 +526,30 @@
       // 
       // groupBox1
       // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
       this.groupBox1.Controls.Add(this.scMain);
+      resources.ApplyResources(this.groupBox1, "groupBox1");
       this.groupBox1.Name = "groupBox1";
       this.groupBox1.TabStop = false;
       // 
       // groupBox2
       // 
-            resources.ApplyResources(this.groupBox2, "groupBox2");
       this.groupBox2.Controls.Add(this.txtMsgBox);
       this.groupBox2.Controls.Add(this.ssMain);
+      resources.ApplyResources(this.groupBox2, "groupBox2");
       this.groupBox2.Name = "groupBox2";
       this.groupBox2.TabStop = false;
       // 
       // txtMsgBox
       // 
-            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
       this.txtMsgBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(49)))), ((int)(((byte)(52)))));
       this.txtMsgBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+      resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
       this.txtMsgBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(226)))), ((int)(((byte)(228)))));
       this.txtMsgBox.Name = "txtMsgBox";
       this.txtMsgBox.ReadOnly = true;
       // 
       // ssMain
       // 
-            resources.ApplyResources(this.ssMain, "ssMain");
       this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolSslSocksPortLab,
             this.toolSslSocksPort,
@@ -557,6 +562,7 @@
             this.toolSslBlank3,
             this.toolSslServerSpeed,
             this.toolSslBlank4});
+      resources.ApplyResources(this.ssMain, "ssMain");
       this.ssMain.Name = "ssMain";
       this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
       // 
@@ -567,8 +573,8 @@
       // 
       // toolSslSocksPort
       // 
-            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
       this.toolSslSocksPort.Name = "toolSslSocksPort";
+      resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
       // 
       // toolSslBlank1
       // 
@@ -583,8 +589,8 @@
       // 
       // toolSslHttpPort
       // 
-            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
       this.toolSslHttpPort.Name = "toolSslHttpPort";
+      resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
       // 
       // toolSslBlank2
       // 
@@ -599,8 +605,8 @@
       // 
       // toolSslPacPort
       // 
-            resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
       this.toolSslPacPort.Name = "toolSslPacPort";
+      resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
       // 
       // toolSslBlank3
       // 
@@ -616,8 +622,8 @@
       // 
       // toolSslBlank4
       // 
-            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
       this.toolSslBlank4.Name = "toolSslBlank4";
+      resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
       // 
       // panel1
       // 
@@ -626,7 +632,6 @@
       // 
       // tsMain
       // 
-            resources.ApplyResources(this.tsMain, "tsMain");
       this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32);
       this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbServer,
@@ -644,60 +649,61 @@
             this.tsbPromotion,
             this.toolStripSeparator11,
             this.tsbClose});
+      resources.ApplyResources(this.tsMain, "tsMain");
       this.tsMain.Name = "tsMain";
       this.tsMain.TabStop = true;
       // 
       // toolStripSeparator4
       // 
-            resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
       this.toolStripSeparator4.Name = "toolStripSeparator4";
+      resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
       // 
       // tsbSub
       // 
-            resources.ApplyResources(this.tsbSub, "tsbSub");
       this.tsbSub.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbSubSetting,
             this.tsbSubUpdate});
       this.tsbSub.Image = global::v2rayN.Properties.Resources.sub;
+      resources.ApplyResources(this.tsbSub, "tsbSub");
       this.tsbSub.Name = "tsbSub";
       // 
       // tsbSubSetting
       // 
-            resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
       this.tsbSubSetting.Name = "tsbSubSetting";
+      resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
       this.tsbSubSetting.Click += new System.EventHandler(this.tsbSubSetting_Click);
       // 
       // tsbSubUpdate
       // 
-            resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
       this.tsbSubUpdate.Name = "tsbSubUpdate";
+      resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
       this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click);
       // 
       // tsbQRCodeSwitch
       // 
-            resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
       this.tsbQRCodeSwitch.CheckOnClick = true;
       this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black;
       this.tsbQRCodeSwitch.Image = global::v2rayN.Properties.Resources.share;
+      resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
       this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch";
       this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged);
       // 
       // toolStripSeparator8
       // 
-            resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
       this.toolStripSeparator8.Name = "toolStripSeparator8";
+      resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
       // 
       // tsbOptionSetting
       // 
-            resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
       this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
+      resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
       this.tsbOptionSetting.Name = "tsbOptionSetting";
       this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
       // 
       // toolStripSeparator5
       // 
-            resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
       this.toolStripSeparator5.Name = "toolStripSeparator5";
+      resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
       // 
       // tsbReload
       // 
@@ -707,12 +713,11 @@
       // 
       // toolStripSeparator7
       // 
-            resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
       this.toolStripSeparator7.Name = "toolStripSeparator7";
+      resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
       // 
       // tsbCheckUpdate
       // 
-            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
       this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbCheckUpdateN,
             this.tsbCheckUpdateCore,
@@ -720,45 +725,45 @@
             this.toolStripSeparator13,
             this.tsbCheckClearPACList});
       this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
+      resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
       this.tsbCheckUpdate.Name = "tsbCheckUpdate";
       // 
       // tsbCheckUpdateN
       // 
-            resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
       this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
+      resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
       this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click);
       // 
       // tsbCheckUpdateCore
       // 
-            resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
       this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
+      resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
       this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click);
       // 
       // tsbCheckUpdatePACList
       // 
-            resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
       this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
+      resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
       this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click);
       // 
       // toolStripSeparator13
       // 
-            resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
       this.toolStripSeparator13.Name = "toolStripSeparator13";
+      resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
       // 
       // tsbCheckClearPACList
       // 
-            resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
       this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
+      resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
       this.tsbCheckClearPACList.Click += new System.EventHandler(this.tsbCheckClearPACList_Click);
       // 
       // toolStripSeparator10
       // 
-            resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
       this.toolStripSeparator10.Name = "toolStripSeparator10";
+      resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
       // 
       // tsbHelp
       // 
-            resources.ApplyResources(this.tsbHelp, "tsbHelp");
       this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbAbout,
             this.tsbV2rayWebsite,
@@ -766,49 +771,50 @@
             this.tsbLanguageDef,
             this.tsbLanguageZhHans});
       this.tsbHelp.Image = global::v2rayN.Properties.Resources.help;
+      resources.ApplyResources(this.tsbHelp, "tsbHelp");
       this.tsbHelp.Name = "tsbHelp";
       // 
       // tsbAbout
       // 
-            resources.ApplyResources(this.tsbAbout, "tsbAbout");
       this.tsbAbout.Name = "tsbAbout";
+      resources.ApplyResources(this.tsbAbout, "tsbAbout");
       this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click);
       // 
       // tsbV2rayWebsite
       // 
-            resources.ApplyResources(this.tsbV2rayWebsite, "tsbV2rayWebsite");
       this.tsbV2rayWebsite.Name = "tsbV2rayWebsite";
+      resources.ApplyResources(this.tsbV2rayWebsite, "tsbV2rayWebsite");
       this.tsbV2rayWebsite.Click += new System.EventHandler(this.tsbV2rayWebsite_Click);
       // 
       // toolStripSeparator12
       // 
-            resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
       this.toolStripSeparator12.Name = "toolStripSeparator12";
+      resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
       // 
       // tsbLanguageDef
       // 
-            resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
       this.tsbLanguageDef.Name = "tsbLanguageDef";
+      resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
       this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click);
       // 
       // tsbLanguageZhHans
       // 
-            resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
       this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
+      resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
       this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click);
       // 
       // tsbPromotion
       // 
-            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
       this.tsbPromotion.ForeColor = System.Drawing.Color.Black;
       this.tsbPromotion.Image = global::v2rayN.Properties.Resources.promotion;
+      resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
       this.tsbPromotion.Name = "tsbPromotion";
       this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click);
       // 
       // toolStripSeparator11
       // 
-            resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
       this.toolStripSeparator11.Name = "toolStripSeparator11";
+      resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
       // 
       // tsbClose
       // 
@@ -816,6 +822,11 @@
       this.tsbClose.Name = "tsbClose";
       this.tsbClose.Click += new System.EventHandler(this.tsbClose_Click);
       // 
+      // menuGithubFetch
+      // 
+      this.menuGithubFetch.Name = "menuGithubFetch";
+      resources.ApplyResources(this.menuGithubFetch, "menuGithubFetch");
+      // 
       // MainForm
       // 
       resources.ApplyResources(this, "$this");
@@ -947,6 +958,8 @@
         private System.Windows.Forms.ToolStripButton tsbReload;
         private System.Windows.Forms.ToolStripButton tsbQRCodeSwitch;
         private System.Windows.Forms.ToolStripMenuItem menuAddVlessServer;
+        private System.Windows.Forms.ToolStripMenuItem menuGithubUpload;
+    private System.Windows.Forms.ToolStripMenuItem menuGithubFetch;
   }
 }
 

v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx

@@ -437,13 +437,13 @@
   </data>
   <data name="tsbReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd
+        wwAADsMBx2+oZAAAATdJREFUWEftloENAiEMRW8ER3AEN9ANdARHcAPdwBF0A91AN9INtC+5JvUCJwWM
-        QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X
+        mvCTFw3QUiiU65qa/lUTYT6Ato9rJZyERwT6GFNdU+EihCYNwVhsqmgm3AR1fheOAitd9PCfNvp0HDbY
-        jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY
+        FolV2MmZZCzX9J0FG0TRTlwFdbahIVE7Qe1IR5bYVnXCyr2yO5F1MNUBec25YtjomcCXSxhr9DmrV2Gr
-        6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3
+        flyL4GSrYcm9tmnEZ7JsAC7DgWr5ydbXA8hOAcVjG8FTD6ocQgvXKrW8MqFWUfc1DAXgmRwVFaJQAHsh
-        NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY
+        VbYUU87diqWA934sl/TZ7wV2Lesx0gBwsO5/1Sl5PQhLQb+G+E+bfTm9KXsRAVgHrMK+jO9gbNEzzMSh
-        B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg==
+        6DlM9nANoa+kdCeLXLNLFtc9b2r6EXXdE4e4mdByNuG1AAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing">
@@ -505,9 +505,9 @@
   </data>
   <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/
+        wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
-        GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
+        8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="tsbClose.Size" type="System.Drawing.Size, System.Drawing">
@@ -516,4 +516,10 @@
   <data name="tsbClose.Text" xml:space="preserve">
     <value>  关闭窗口  </value>
   </data>
+  <data name="menuGithubFetch.Text" xml:space="preserve">
+    <value>从Github获取配置(自动去重)</value>
+  </data>
+  <data name="menuGithubUpload.Text" xml:space="preserve">
+    <value>上传到Github</value>
+  </data>
 </root>