mirror of https://github.com/2dust/v2rayN
				
				
				
			Upgrade .net framework version from 4.6 to 4.8
							parent
							
								
									565a7b1680
								
							
						
					
					
						commit
						d613fe79af
					
				| 
						 | 
				
			
			@ -83,7 +83,6 @@
 | 
			
		|||
            this.toolSslHttpPortLab = new System.Windows.Forms.ToolStripStatusLabel();
 | 
			
		||||
            this.toolSslHttpPort = new System.Windows.Forms.ToolStripStatusLabel();
 | 
			
		||||
            this.toolSslBlank2 = new System.Windows.Forms.ToolStripStatusLabel();
 | 
			
		||||
            this.toolSslBlank3 = new System.Windows.Forms.ToolStripStatusLabel();
 | 
			
		||||
            this.toolSslServerSpeed = new System.Windows.Forms.ToolStripStatusLabel();
 | 
			
		||||
            this.toolSslBlank4 = new System.Windows.Forms.ToolStripStatusLabel();
 | 
			
		||||
            this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
 | 
			
		||||
| 
						 | 
				
			
			@ -159,19 +158,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;
 | 
			
		||||
| 
						 | 
				
			
			@ -190,7 +187,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,
 | 
			
		||||
| 
						 | 
				
			
			@ -225,195 +221,195 @@
 | 
			
		|||
            this.menuExport2ShareUrl,
 | 
			
		||||
            this.menuExport2SubContent});
 | 
			
		||||
            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);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuAddTrojanServer
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuAddTrojanServer, "menuAddTrojanServer");
 | 
			
		||||
            this.menuAddTrojanServer.Name = "menuAddTrojanServer";
 | 
			
		||||
            resources.ApplyResources(this.menuAddTrojanServer, "menuAddTrojanServer");
 | 
			
		||||
            this.menuAddTrojanServer.Click += new System.EventHandler(this.menuAddTrojanServer_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);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuClearServerStatistics
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuClearServerStatistics, "menuClearServerStatistics");
 | 
			
		||||
            this.menuClearServerStatistics.Name = "menuClearServerStatistics";
 | 
			
		||||
            resources.ApplyResources(this.menuClearServerStatistics, "menuClearServerStatistics");
 | 
			
		||||
            this.menuClearServerStatistics.Click += new System.EventHandler(this.menuClearStatistic_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
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbServer, "tsbServer");
 | 
			
		||||
            this.tsbServer.DropDown = this.cmsLv;
 | 
			
		||||
            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
 | 
			
		||||
            resources.ApplyResources(this.tsbServer, "tsbServer");
 | 
			
		||||
            this.tsbServer.Name = "tsbServer";
 | 
			
		||||
            // 
 | 
			
		||||
            // qrCodeControl
 | 
			
		||||
| 
						 | 
				
			
			@ -428,35 +424,33 @@
 | 
			
		|||
            // 
 | 
			
		||||
            // splitContainer1.Panel1
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1");
 | 
			
		||||
            this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
 | 
			
		||||
            // 
 | 
			
		||||
            // splitContainer1.Panel2
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
 | 
			
		||||
            this.splitContainer1.Panel2.Controls.Add(this.gbMsgTitle);
 | 
			
		||||
            // 
 | 
			
		||||
            // 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;
 | 
			
		||||
            // 
 | 
			
		||||
            // gbMsgTitle
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.gbMsgTitle, "gbMsgTitle");
 | 
			
		||||
            this.gbMsgTitle.Controls.Add(this.txtMsgBox);
 | 
			
		||||
            this.gbMsgTitle.Controls.Add(this.ssMain);
 | 
			
		||||
            resources.ApplyResources(this.gbMsgTitle, "gbMsgTitle");
 | 
			
		||||
            this.gbMsgTitle.Name = "gbMsgTitle";
 | 
			
		||||
            this.gbMsgTitle.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;
 | 
			
		||||
            this.txtMsgBox.ContextMenuStrip = this.cmsMsgBox;
 | 
			
		||||
            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;
 | 
			
		||||
| 
						 | 
				
			
			@ -464,7 +458,6 @@
 | 
			
		|||
            // 
 | 
			
		||||
            // cmsMsgBox
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.cmsMsgBox, "cmsMsgBox");
 | 
			
		||||
            this.cmsMsgBox.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
 | 
			
		||||
            this.menuMsgBoxSelectAll,
 | 
			
		||||
            this.menuMsgBoxCopy,
 | 
			
		||||
| 
						 | 
				
			
			@ -472,40 +465,40 @@
 | 
			
		|||
            this.menuMsgBoxAddRoutingRule,
 | 
			
		||||
            this.menuMsgBoxFilter});
 | 
			
		||||
            this.cmsMsgBox.Name = "cmsMsgBox";
 | 
			
		||||
            resources.ApplyResources(this.cmsMsgBox, "cmsMsgBox");
 | 
			
		||||
            // 
 | 
			
		||||
            // menuMsgBoxSelectAll
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxSelectAll, "menuMsgBoxSelectAll");
 | 
			
		||||
            this.menuMsgBoxSelectAll.Name = "menuMsgBoxSelectAll";
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxSelectAll, "menuMsgBoxSelectAll");
 | 
			
		||||
            this.menuMsgBoxSelectAll.Click += new System.EventHandler(this.menuMsgBoxSelectAll_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuMsgBoxCopy
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxCopy, "menuMsgBoxCopy");
 | 
			
		||||
            this.menuMsgBoxCopy.Name = "menuMsgBoxCopy";
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxCopy, "menuMsgBoxCopy");
 | 
			
		||||
            this.menuMsgBoxCopy.Click += new System.EventHandler(this.menuMsgBoxCopy_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuMsgBoxCopyAll
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxCopyAll, "menuMsgBoxCopyAll");
 | 
			
		||||
            this.menuMsgBoxCopyAll.Name = "menuMsgBoxCopyAll";
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxCopyAll, "menuMsgBoxCopyAll");
 | 
			
		||||
            this.menuMsgBoxCopyAll.Click += new System.EventHandler(this.menuMsgBoxCopyAll_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuMsgBoxAddRoutingRule
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxAddRoutingRule, "menuMsgBoxAddRoutingRule");
 | 
			
		||||
            this.menuMsgBoxAddRoutingRule.Name = "menuMsgBoxAddRoutingRule";
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxAddRoutingRule, "menuMsgBoxAddRoutingRule");
 | 
			
		||||
            this.menuMsgBoxAddRoutingRule.Click += new System.EventHandler(this.menuMsgBoxAddRoutingRule_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuMsgBoxFilter
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxFilter, "menuMsgBoxFilter");
 | 
			
		||||
            this.menuMsgBoxFilter.Name = "menuMsgBoxFilter";
 | 
			
		||||
            resources.ApplyResources(this.menuMsgBoxFilter, "menuMsgBoxFilter");
 | 
			
		||||
            this.menuMsgBoxFilter.Click += new System.EventHandler(this.menuMsgBoxFilter_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // ssMain
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.ssMain, "ssMain");
 | 
			
		||||
            this.ssMain.ImageScalingSize = new System.Drawing.Size(20, 20);
 | 
			
		||||
            this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
 | 
			
		||||
            this.toolSslSocksPortLab,
 | 
			
		||||
| 
						 | 
				
			
			@ -514,9 +507,9 @@
 | 
			
		|||
            this.toolSslHttpPortLab,
 | 
			
		||||
            this.toolSslHttpPort,
 | 
			
		||||
            this.toolSslBlank2,
 | 
			
		||||
            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);
 | 
			
		||||
            // 
 | 
			
		||||
| 
						 | 
				
			
			@ -527,8 +520,8 @@
 | 
			
		|||
            // 
 | 
			
		||||
            // toolSslSocksPort
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
 | 
			
		||||
            this.toolSslSocksPort.Name = "toolSslSocksPort";
 | 
			
		||||
            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
 | 
			
		||||
            // 
 | 
			
		||||
            // toolSslBlank1
 | 
			
		||||
            // 
 | 
			
		||||
| 
						 | 
				
			
			@ -543,8 +536,8 @@
 | 
			
		|||
            // 
 | 
			
		||||
            // toolSslHttpPort
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
 | 
			
		||||
            this.toolSslHttpPort.Name = "toolSslHttpPort";
 | 
			
		||||
            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
 | 
			
		||||
            // 
 | 
			
		||||
            // toolSslBlank2
 | 
			
		||||
            // 
 | 
			
		||||
| 
						 | 
				
			
			@ -552,12 +545,6 @@
 | 
			
		|||
            this.toolSslBlank2.Name = "toolSslBlank2";
 | 
			
		||||
            this.toolSslBlank2.Spring = true;
 | 
			
		||||
            // 
 | 
			
		||||
            // toolSslBlank3
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3");
 | 
			
		||||
            this.toolSslBlank3.Name = "toolSslBlank3";
 | 
			
		||||
            this.toolSslBlank3.Spring = true;
 | 
			
		||||
            // 
 | 
			
		||||
            // toolSslServerSpeed
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
 | 
			
		||||
| 
						 | 
				
			
			@ -566,19 +553,19 @@
 | 
			
		|||
            // 
 | 
			
		||||
            // toolSslBlank4
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
 | 
			
		||||
            this.toolSslBlank4.Name = "toolSslBlank4";
 | 
			
		||||
            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
 | 
			
		||||
            // 
 | 
			
		||||
            // 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.menuRoutings,
 | 
			
		||||
| 
						 | 
				
			
			@ -596,73 +583,73 @@
 | 
			
		|||
            // 
 | 
			
		||||
            // menuSysAgentMode
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
 | 
			
		||||
            this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
 | 
			
		||||
            this.menuKeepClear,
 | 
			
		||||
            this.menuGlobal,
 | 
			
		||||
            this.menuKeepNothing});
 | 
			
		||||
            this.menuSysAgentMode.Name = "menuSysAgentMode";
 | 
			
		||||
            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
 | 
			
		||||
            // 
 | 
			
		||||
            // menuKeepClear
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuKeepClear, "menuKeepClear");
 | 
			
		||||
            this.menuKeepClear.Name = "menuKeepClear";
 | 
			
		||||
            resources.ApplyResources(this.menuKeepClear, "menuKeepClear");
 | 
			
		||||
            this.menuKeepClear.Click += new System.EventHandler(this.menuKeepClear_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);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuKeepNothing
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
 | 
			
		||||
            this.menuKeepNothing.Name = "menuKeepNothing";
 | 
			
		||||
            resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
 | 
			
		||||
            this.menuKeepNothing.Click += new System.EventHandler(this.menuKeepNothing_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // menuRoutings
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuRoutings, "menuRoutings");
 | 
			
		||||
            this.menuRoutings.Name = "menuRoutings";
 | 
			
		||||
            resources.ApplyResources(this.menuRoutings, "menuRoutings");
 | 
			
		||||
            // 
 | 
			
		||||
            // menuServers
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.menuServers, "menuServers");
 | 
			
		||||
            this.menuServers.Name = "menuServers";
 | 
			
		||||
            resources.ApplyResources(this.menuServers, "menuServers");
 | 
			
		||||
            // 
 | 
			
		||||
            // toolStripSeparator13
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
 | 
			
		||||
            this.toolStripSeparator13.Name = "toolStripSeparator13";
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
 | 
			
		||||
            // 
 | 
			
		||||
            // 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);
 | 
			
		||||
            // 
 | 
			
		||||
            // 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
 | 
			
		||||
| 
						 | 
				
			
			@ -678,7 +665,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,
 | 
			
		||||
| 
						 | 
				
			
			@ -696,87 +682,88 @@
 | 
			
		|||
            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");
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbSetting
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbSetting, "tsbSetting");
 | 
			
		||||
            this.tsbSetting.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
 | 
			
		||||
            this.tsbOptionSetting,
 | 
			
		||||
            this.tsbRoutingSetting,
 | 
			
		||||
            this.toolStripSeparator14,
 | 
			
		||||
            this.tsbBackupGuiNConfig});
 | 
			
		||||
            this.tsbSetting.Image = global::v2rayN.Properties.Resources.option;
 | 
			
		||||
            resources.ApplyResources(this.tsbSetting, "tsbSetting");
 | 
			
		||||
            this.tsbSetting.Name = "tsbSetting";
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbOptionSetting
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
 | 
			
		||||
            this.tsbOptionSetting.Name = "tsbOptionSetting";
 | 
			
		||||
            resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
 | 
			
		||||
            this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbRoutingSetting
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbRoutingSetting, "tsbRoutingSetting");
 | 
			
		||||
            this.tsbRoutingSetting.Name = "tsbRoutingSetting";
 | 
			
		||||
            resources.ApplyResources(this.tsbRoutingSetting, "tsbRoutingSetting");
 | 
			
		||||
            this.tsbRoutingSetting.Click += new System.EventHandler(this.tsbRoutingSetting_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // toolStripSeparator14
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14");
 | 
			
		||||
            this.toolStripSeparator14.Name = "toolStripSeparator14";
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14");
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbBackupGuiNConfig
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbBackupGuiNConfig, "tsbBackupGuiNConfig");
 | 
			
		||||
            this.tsbBackupGuiNConfig.Name = "tsbBackupGuiNConfig";
 | 
			
		||||
            resources.ApplyResources(this.tsbBackupGuiNConfig, "tsbBackupGuiNConfig");
 | 
			
		||||
            this.tsbBackupGuiNConfig.Click += new System.EventHandler(this.tsbBackupGuiNConfig_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // toolStripSeparator5
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
 | 
			
		||||
            this.toolStripSeparator5.Name = "toolStripSeparator5";
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbReload
 | 
			
		||||
            // 
 | 
			
		||||
| 
						 | 
				
			
			@ -786,12 +773,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,
 | 
			
		||||
| 
						 | 
				
			
			@ -800,51 +786,51 @@
 | 
			
		|||
            this.tsbCheckUpdateGeoSite,
 | 
			
		||||
            this.tsbCheckUpdateGeoIP});
 | 
			
		||||
            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);
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbCheckUpdateXrayCore
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbCheckUpdateXrayCore, "tsbCheckUpdateXrayCore");
 | 
			
		||||
            this.tsbCheckUpdateXrayCore.Name = "tsbCheckUpdateXrayCore";
 | 
			
		||||
            resources.ApplyResources(this.tsbCheckUpdateXrayCore, "tsbCheckUpdateXrayCore");
 | 
			
		||||
            this.tsbCheckUpdateXrayCore.Click += new System.EventHandler(this.tsbCheckUpdateXrayCore_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // toolStripSeparator15
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator15, "toolStripSeparator15");
 | 
			
		||||
            this.toolStripSeparator15.Name = "toolStripSeparator15";
 | 
			
		||||
            resources.ApplyResources(this.toolStripSeparator15, "toolStripSeparator15");
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbCheckUpdateGeoSite
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbCheckUpdateGeoSite, "tsbCheckUpdateGeoSite");
 | 
			
		||||
            this.tsbCheckUpdateGeoSite.Name = "tsbCheckUpdateGeoSite";
 | 
			
		||||
            resources.ApplyResources(this.tsbCheckUpdateGeoSite, "tsbCheckUpdateGeoSite");
 | 
			
		||||
            this.tsbCheckUpdateGeoSite.Click += new System.EventHandler(this.tsbCheckUpdateGeoSite_Click);
 | 
			
		||||
            // 
 | 
			
		||||
            // tsbCheckUpdateGeoIP
 | 
			
		||||
            // 
 | 
			
		||||
            resources.ApplyResources(this.tsbCheckUpdateGeoIP, "tsbCheckUpdateGeoIP");
 | 
			
		||||
            this.tsbCheckUpdateGeoIP.Name = "tsbCheckUpdateGeoIP";
 | 
			
		||||
            resources.ApplyResources(this.tsbCheckUpdateGeoIP, "tsbCheckUpdateGeoIP");
 | 
			
		||||
            this.tsbCheckUpdateGeoIP.Click += new System.EventHandler(this.tsbCheckUpdateGeoIP_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,
 | 
			
		||||
| 
						 | 
				
			
			@ -852,49 +838,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
 | 
			
		||||
            // 
 | 
			
		||||
| 
						 | 
				
			
			@ -1011,7 +998,6 @@
 | 
			
		|||
        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPort;
 | 
			
		||||
        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
 | 
			
		||||
        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank1;
 | 
			
		||||
        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank3;
 | 
			
		||||
        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPortLab;
 | 
			
		||||
        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPortLab;
 | 
			
		||||
        private System.Windows.Forms.ToolStripStatusLabel toolSslServerSpeed;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
				
			
			@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 | 
			
		|||
// 方法是按如下所示使用“*”:
 | 
			
		||||
//[assembly: AssemblyVersion("1.0.*")]
 | 
			
		||||
//[assembly: AssemblyVersion("1.0.0")]
 | 
			
		||||
[assembly: AssemblyFileVersion("4.20")]
 | 
			
		||||
[assembly: AssemblyFileVersion("4.21")]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ namespace v2rayN.Properties {
 | 
			
		|||
    
 | 
			
		||||
    
 | 
			
		||||
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
 | 
			
		||||
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
 | 
			
		||||
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
 | 
			
		||||
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
 | 
			
		||||
        
 | 
			
		||||
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -536,7 +536,7 @@ namespace v2rayN
 | 
			
		|||
            try
 | 
			
		||||
            {
 | 
			
		||||
                string exePath = GetExePath();
 | 
			
		||||
                RegWriteValue(autoRunRegPath, autoRunName, run ? ("\"" + exePath + "\"") : "");
 | 
			
		||||
                RegWriteValue(autoRunRegPath, autoRunName, run ? $"\"{exePath}\"" : "");
 | 
			
		||||
            }
 | 
			
		||||
            catch
 | 
			
		||||
            {
 | 
			
		||||
| 
						 | 
				
			
			@ -553,7 +553,7 @@ namespace v2rayN
 | 
			
		|||
            {
 | 
			
		||||
                string value = RegReadValue(autoRunRegPath, autoRunName, "");
 | 
			
		||||
                string exePath = GetExePath();
 | 
			
		||||
                if (value?.Equals(exePath) == true || value?.Equals("\"" + exePath + "\"") == true)
 | 
			
		||||
                if (value?.Equals(exePath) == true || value?.Equals($"\"{exePath}\"") == true)
 | 
			
		||||
                {
 | 
			
		||||
                    return true;
 | 
			
		||||
                }
 | 
			
		||||
| 
						 | 
				
			
			@ -708,7 +708,8 @@ namespace v2rayN
 | 
			
		|||
            ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3
 | 
			
		||||
                                       | SecurityProtocolType.Tls
 | 
			
		||||
                                       | SecurityProtocolType.Tls11
 | 
			
		||||
                                       | SecurityProtocolType.Tls12;
 | 
			
		||||
                                       | SecurityProtocolType.Tls12
 | 
			
		||||
                                       | SecurityProtocolType.Tls13;
 | 
			
		||||
            ServicePointManager.DefaultConnectionLimit = 256;
 | 
			
		||||
        }
 | 
			
		||||
        #endregion
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
<?xml version="1.0"?>
 | 
			
		||||
<configuration>
 | 
			
		||||
  <startup>
 | 
			
		||||
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
 | 
			
		||||
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
 | 
			
		||||
  </startup>
 | 
			
		||||
  
 | 
			
		||||
</configuration>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
    <AppDesignerFolder>Properties</AppDesignerFolder>
 | 
			
		||||
    <RootNamespace>v2rayN</RootNamespace>
 | 
			
		||||
    <AssemblyName>v2rayN</AssemblyName>
 | 
			
		||||
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
 | 
			
		||||
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
 | 
			
		||||
    <FileAlignment>512</FileAlignment>
 | 
			
		||||
    <TargetFrameworkProfile />
 | 
			
		||||
    <IsWebBootstrapper>false</IsWebBootstrapper>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue