From 02a3b259638825c82edbaa4c1b8d3d5aab57df74 Mon Sep 17 00:00:00 2001 From: 2dust Date: Tue, 24 Sep 2019 08:10:27 +0800 Subject: [PATCH] up --- v2rayN/v2rayN/Forms/MainForm.Designer.cs | 146 +- v2rayN/v2rayN/Forms/MainForm.cs | 39 +- v2rayN/v2rayN/Forms/MainForm.resx | 1702 ++++++++--------- v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx | 83 +- v2rayN/v2rayN/Handler/StatisticsHandler.cs | 3 +- .../HttpProxyHandler/PACServerHandle.cs | 5 +- v2rayN/v2rayN/Properties/AssemblyInfo.cs | 2 +- v2rayN/v2rayN/Resx/ResUI.Designer.cs | 196 +- v2rayN/v2rayN/Resx/ResUI.resx | 4 +- v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx | 4 +- 10 files changed, 1093 insertions(+), 1091 deletions(-) diff --git a/v2rayN/v2rayN/Forms/MainForm.Designer.cs b/v2rayN/v2rayN/Forms/MainForm.Designer.cs index aa408cbb2fe..fe260cebb89 100644 --- a/v2rayN/v2rayN/Forms/MainForm.Designer.cs +++ b/v2rayN/v2rayN/Forms/MainForm.Designer.cs @@ -136,17 +136,19 @@ private void InitializeComponent() // // splitContainer1.Panel1 // + resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1"); this.splitContainer1.Panel1.Controls.Add(this.lvServers); // // splitContainer1.Panel2 // + resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2"); this.splitContainer1.Panel2.Controls.Add(this.qrCodeControl); this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved); // // lvServers // - this.lvServers.ContextMenuStrip = this.cmsLv; resources.ApplyResources(this.lvServers, "lvServers"); + this.lvServers.ContextMenuStrip = this.cmsLv; this.lvServers.FullRowSelect = true; this.lvServers.GridLines = true; this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; @@ -163,6 +165,7 @@ private void InitializeComponent() // // 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, @@ -192,159 +195,158 @@ private void InitializeComponent() this.menuExport2SubContent}); this.cmsLv.Name = "cmsLv"; this.cmsLv.OwnerItem = this.tsbServer; - resources.ApplyResources(this.cmsLv, "cmsLv"); // // menuAddVmessServer // - this.menuAddVmessServer.Name = "menuAddVmessServer"; resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer"); + this.menuAddVmessServer.Name = "menuAddVmessServer"; this.menuAddVmessServer.Click += new System.EventHandler(this.menuAddVmessServer_Click); // // menuAddShadowsocksServer // - this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer"; resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer"); + this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer"; this.menuAddShadowsocksServer.Click += new System.EventHandler(this.menuAddShadowsocksServer_Click); // // menuAddSocksServer // - this.menuAddSocksServer.Name = "menuAddSocksServer"; resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer"); + this.menuAddSocksServer.Name = "menuAddSocksServer"; this.menuAddSocksServer.Click += new System.EventHandler(this.menuAddSocksServer_Click); // // menuAddCustomServer // - this.menuAddCustomServer.Name = "menuAddCustomServer"; resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer"); + this.menuAddCustomServer.Name = "menuAddCustomServer"; this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click); // // menuAddServers // - this.menuAddServers.Name = "menuAddServers"; resources.ApplyResources(this.menuAddServers, "menuAddServers"); + this.menuAddServers.Name = "menuAddServers"; this.menuAddServers.Click += new System.EventHandler(this.menuAddServers_Click); // // menuScanScreen // - this.menuScanScreen.Name = "menuScanScreen"; resources.ApplyResources(this.menuScanScreen, "menuScanScreen"); + this.menuScanScreen.Name = "menuScanScreen"; this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click); // // toolStripSeparator1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1"); + this.toolStripSeparator1.Name = "toolStripSeparator1"; // // menuRemoveServer // - this.menuRemoveServer.Name = "menuRemoveServer"; resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer"); + this.menuRemoveServer.Name = "menuRemoveServer"; this.menuRemoveServer.Click += new System.EventHandler(this.menuRemoveServer_Click); // // menuRemoveDuplicateServer // - this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer"; resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer"); + this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer"; this.menuRemoveDuplicateServer.Click += new System.EventHandler(this.menuRemoveDuplicateServer_Click); // // menuCopyServer // - this.menuCopyServer.Name = "menuCopyServer"; resources.ApplyResources(this.menuCopyServer, "menuCopyServer"); + this.menuCopyServer.Name = "menuCopyServer"; this.menuCopyServer.Click += new System.EventHandler(this.menuCopyServer_Click); // // menuSetDefaultServer // - this.menuSetDefaultServer.Name = "menuSetDefaultServer"; resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer"); + this.menuSetDefaultServer.Name = "menuSetDefaultServer"; this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click); // // toolStripSeparator3 // - this.toolStripSeparator3.Name = "toolStripSeparator3"; resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3"); + this.toolStripSeparator3.Name = "toolStripSeparator3"; // // menuMoveTop // - this.menuMoveTop.Name = "menuMoveTop"; resources.ApplyResources(this.menuMoveTop, "menuMoveTop"); + this.menuMoveTop.Name = "menuMoveTop"; this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click); // // menuMoveUp // - this.menuMoveUp.Name = "menuMoveUp"; resources.ApplyResources(this.menuMoveUp, "menuMoveUp"); + this.menuMoveUp.Name = "menuMoveUp"; this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click); // // menuMoveDown // - this.menuMoveDown.Name = "menuMoveDown"; resources.ApplyResources(this.menuMoveDown, "menuMoveDown"); + this.menuMoveDown.Name = "menuMoveDown"; this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click); // // menuMoveBottom // - this.menuMoveBottom.Name = "menuMoveBottom"; resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom"); + this.menuMoveBottom.Name = "menuMoveBottom"; this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click); // // menuSelectAll // - this.menuSelectAll.Name = "menuSelectAll"; resources.ApplyResources(this.menuSelectAll, "menuSelectAll"); + this.menuSelectAll.Name = "menuSelectAll"; this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click); // // toolStripSeparator9 // - this.toolStripSeparator9.Name = "toolStripSeparator9"; resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9"); + this.toolStripSeparator9.Name = "toolStripSeparator9"; // // menuPingServer // - this.menuPingServer.Name = "menuPingServer"; resources.ApplyResources(this.menuPingServer, "menuPingServer"); + this.menuPingServer.Name = "menuPingServer"; this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click); // // menuSpeedServer // - this.menuSpeedServer.Name = "menuSpeedServer"; resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer"); + this.menuSpeedServer.Name = "menuSpeedServer"; this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click); // // toolStripSeparator6 // - this.toolStripSeparator6.Name = "toolStripSeparator6"; resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6"); + this.toolStripSeparator6.Name = "toolStripSeparator6"; // // menuExport2ClientConfig // - this.menuExport2ClientConfig.Name = "menuExport2ClientConfig"; resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig"); + this.menuExport2ClientConfig.Name = "menuExport2ClientConfig"; this.menuExport2ClientConfig.Click += new System.EventHandler(this.menuExport2ClientConfig_Click); // // menuExport2ServerConfig // - this.menuExport2ServerConfig.Name = "menuExport2ServerConfig"; resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig"); + this.menuExport2ServerConfig.Name = "menuExport2ServerConfig"; this.menuExport2ServerConfig.Click += new System.EventHandler(this.menuExport2ServerConfig_Click); // // menuExport2ShareUrl // - this.menuExport2ShareUrl.Name = "menuExport2ShareUrl"; resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl"); + this.menuExport2ShareUrl.Name = "menuExport2ShareUrl"; this.menuExport2ShareUrl.Click += new System.EventHandler(this.menuExport2ShareUrl_Click); // // menuExport2SubContent // - this.menuExport2SubContent.Name = "menuExport2SubContent"; resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent"); + this.menuExport2SubContent.Name = "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 @@ -354,14 +356,14 @@ private void InitializeComponent() // // notifyMain // - this.notifyMain.ContextMenuStrip = this.cmsMain; resources.ApplyResources(this.notifyMain, "notifyMain"); + this.notifyMain.ContextMenuStrip = this.cmsMain; this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick); // // cmsMain // - this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20); resources.ApplyResources(this.cmsMain, "cmsMain"); + this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20); this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuSysAgentEnabled, this.menuSysAgentMode, @@ -378,76 +380,76 @@ private void InitializeComponent() // // menuSysAgentEnabled // - this.menuSysAgentEnabled.Name = "menuSysAgentEnabled"; resources.ApplyResources(this.menuSysAgentEnabled, "menuSysAgentEnabled"); + this.menuSysAgentEnabled.Name = "menuSysAgentEnabled"; this.menuSysAgentEnabled.Click += new System.EventHandler(this.menuSysAgentEnabled_Click); // // menuSysAgentMode // + resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode"); this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuGlobal, this.menuGlobalPAC, this.menuKeep, this.menuKeepPAC}); this.menuSysAgentMode.Name = "menuSysAgentMode"; - resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode"); // // menuGlobal // - this.menuGlobal.Name = "menuGlobal"; resources.ApplyResources(this.menuGlobal, "menuGlobal"); + this.menuGlobal.Name = "menuGlobal"; this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click); // // menuGlobalPAC // - this.menuGlobalPAC.Name = "menuGlobalPAC"; resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC"); + this.menuGlobalPAC.Name = "menuGlobalPAC"; this.menuGlobalPAC.Click += new System.EventHandler(this.menuGlobalPAC_Click); // // menuKeep // - this.menuKeep.Name = "menuKeep"; resources.ApplyResources(this.menuKeep, "menuKeep"); + this.menuKeep.Name = "menuKeep"; this.menuKeep.Click += new System.EventHandler(this.menuKeep_Click); // // menuKeepPAC // - this.menuKeepPAC.Name = "menuKeepPAC"; resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC"); + this.menuKeepPAC.Name = "menuKeepPAC"; this.menuKeepPAC.Click += new System.EventHandler(this.menuKeepPAC_Click); // // menuServers // - this.menuServers.Name = "menuServers"; resources.ApplyResources(this.menuServers, "menuServers"); + this.menuServers.Name = "menuServers"; // // menuAddServers2 // - this.menuAddServers2.Name = "menuAddServers2"; resources.ApplyResources(this.menuAddServers2, "menuAddServers2"); + this.menuAddServers2.Name = "menuAddServers2"; this.menuAddServers2.Click += new System.EventHandler(this.menuAddServers_Click); // // menuScanScreen2 // - this.menuScanScreen2.Name = "menuScanScreen2"; resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2"); + this.menuScanScreen2.Name = "menuScanScreen2"; this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click); // // menuCopyPACUrl // - this.menuCopyPACUrl.Name = "menuCopyPACUrl"; resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl"); + this.menuCopyPACUrl.Name = "menuCopyPACUrl"; this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click); // // toolStripSeparator2 // - this.toolStripSeparator2.Name = "toolStripSeparator2"; resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2"); + this.toolStripSeparator2.Name = "toolStripSeparator2"; // // menuExit // - this.menuExit.Name = "menuExit"; resources.ApplyResources(this.menuExit, "menuExit"); + this.menuExit.Name = "menuExit"; this.menuExit.Click += new System.EventHandler(this.menuExit_Click); // // bgwPing @@ -464,30 +466,31 @@ private void InitializeComponent() // // groupBox1 // - this.groupBox1.Controls.Add(this.splitContainer1); resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.splitContainer1); 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, @@ -500,7 +503,6 @@ private void InitializeComponent() 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); // @@ -511,8 +513,8 @@ private void InitializeComponent() // // toolSslSocksPort // - this.toolSslSocksPort.Name = "toolSslSocksPort"; resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort"); + this.toolSslSocksPort.Name = "toolSslSocksPort"; // // toolSslBlank1 // @@ -527,8 +529,8 @@ private void InitializeComponent() // // toolSslHttpPort // - this.toolSslHttpPort.Name = "toolSslHttpPort"; resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort"); + this.toolSslHttpPort.Name = "toolSslHttpPort"; // // toolSslBlank2 // @@ -543,8 +545,8 @@ private void InitializeComponent() // // toolSslPacPort // - this.toolSslPacPort.Name = "toolSslPacPort"; resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort"); + this.toolSslPacPort.Name = "toolSslPacPort"; // // toolSslBlank3 // @@ -560,8 +562,8 @@ private void InitializeComponent() // // toolSslBlank4 // - this.toolSslBlank4.Name = "toolSslBlank4"; resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4"); + this.toolSslBlank4.Name = "toolSslBlank4"; // // panel1 // @@ -570,6 +572,7 @@ private void InitializeComponent() // // 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, @@ -586,51 +589,50 @@ private void InitializeComponent() this.tsbPromotion, this.toolStripSeparator11, this.tsbClose}); - resources.ApplyResources(this.tsMain, "tsMain"); this.tsMain.Name = "tsMain"; // // toolStripSeparator4 // - this.toolStripSeparator4.Name = "toolStripSeparator4"; resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4"); + this.toolStripSeparator4.Name = "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 // - this.tsbSubSetting.Name = "tsbSubSetting"; resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting"); + this.tsbSubSetting.Name = "tsbSubSetting"; this.tsbSubSetting.Click += new System.EventHandler(this.tsbSubSetting_Click); // // tsbSubUpdate // - this.tsbSubUpdate.Name = "tsbSubUpdate"; resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate"); + this.tsbSubUpdate.Name = "tsbSubUpdate"; this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click); // // toolStripSeparator8 // - this.toolStripSeparator8.Name = "toolStripSeparator8"; resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8"); + this.toolStripSeparator8.Name = "toolStripSeparator8"; // // tsbOptionSetting // - this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option; resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting"); + this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option; this.tsbOptionSetting.Name = "tsbOptionSetting"; this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click); // // toolStripSeparator5 // - this.toolStripSeparator5.Name = "toolStripSeparator5"; resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5"); + this.toolStripSeparator5.Name = "toolStripSeparator5"; // // tsbReload // @@ -640,95 +642,95 @@ private void InitializeComponent() // // toolStripSeparator7 // - this.toolStripSeparator7.Name = "toolStripSeparator7"; resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7"); + this.toolStripSeparator7.Name = "toolStripSeparator7"; // // tsbCheckUpdate // + resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate"); this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbCheckUpdateN, this.tsbCheckUpdateCore, this.tsbCheckUpdatePACList, this.tsbCheckClearPACList}); this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate; - resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate"); this.tsbCheckUpdate.Name = "tsbCheckUpdate"; // // tsbCheckUpdateN // - this.tsbCheckUpdateN.Name = "tsbCheckUpdateN"; resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN"); + this.tsbCheckUpdateN.Name = "tsbCheckUpdateN"; this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click); // // tsbCheckUpdateCore // - this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore"; resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore"); + this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore"; this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click); // // tsbCheckUpdatePACList // - this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList"; resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList"); + this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList"; this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click); // // tsbCheckClearPACList // - this.tsbCheckClearPACList.Name = "tsbCheckClearPACList"; resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList"); + this.tsbCheckClearPACList.Name = "tsbCheckClearPACList"; this.tsbCheckClearPACList.Click += new System.EventHandler(this.tsbCheckClearPACList_Click); // // toolStripSeparator10 // - this.toolStripSeparator10.Name = "toolStripSeparator10"; resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10"); + this.toolStripSeparator10.Name = "toolStripSeparator10"; // // tsbHelp // + resources.ApplyResources(this.tsbHelp, "tsbHelp"); this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbAbout, this.toolStripSeparator12, this.tsbLanguageDef, this.tsbLanguageZhHans}); this.tsbHelp.Image = global::v2rayN.Properties.Resources.help; - resources.ApplyResources(this.tsbHelp, "tsbHelp"); this.tsbHelp.Name = "tsbHelp"; // // tsbAbout // - this.tsbAbout.Name = "tsbAbout"; resources.ApplyResources(this.tsbAbout, "tsbAbout"); + this.tsbAbout.Name = "tsbAbout"; this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click); // // toolStripSeparator12 // - this.toolStripSeparator12.Name = "toolStripSeparator12"; resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12"); + this.toolStripSeparator12.Name = "toolStripSeparator12"; // // tsbLanguageDef // - this.tsbLanguageDef.Name = "tsbLanguageDef"; resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef"); + this.tsbLanguageDef.Name = "tsbLanguageDef"; this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click); // // tsbLanguageZhHans // - this.tsbLanguageZhHans.Name = "tsbLanguageZhHans"; resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans"); + this.tsbLanguageZhHans.Name = "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 // - this.toolStripSeparator11.Name = "toolStripSeparator11"; resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11"); + this.toolStripSeparator11.Name = "toolStripSeparator11"; // // tsbClose // diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index 6cd61fe0b78..f36c2fc7e2f 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -59,25 +59,25 @@ private void UpdateStatisticsHandler(ulong totalUp, ulong totalDown, ulong up, u Utils.HumanFy(down) ); - List datas = new List(); - for (int i = 0; i < config.vmess.Count; i++) - { - string totalUp_ = string.Empty, - totalDown_ = string.Empty, - todayUp_ = string.Empty, - todayDown_ = string.Empty; - var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0))); - if (index != -1) - { - totalUp_ = Utils.HumanFy(statistics[index].totalUp); - totalDown_ = Utils.HumanFy(statistics[index].totalDown); - todayUp_ = Utils.HumanFy(statistics[index].todayUp); - todayDown_ = Utils.HumanFy(statistics[index].todayDown); + List datas = new List(); + for (int i = 0; i < config.vmess.Count; i++) + { + string totalUp_ = string.Empty, + totalDown_ = string.Empty, + todayUp_ = string.Empty, + todayDown_ = string.Empty; + var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0))); + if (index != -1) + { + totalUp_ = Utils.HumanFy(statistics[index].totalUp); + totalDown_ = Utils.HumanFy(statistics[index].totalDown); + todayUp_ = Utils.HumanFy(statistics[index].todayUp); + todayDown_ = Utils.HumanFy(statistics[index].todayDown); } datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ }); } - + lvServers.Invoke((MethodInvoker)delegate { lvServers.SuspendLayout(); @@ -382,7 +382,14 @@ private void DisplayToolStatus() toolSslHttpPort.Text = $"{localIP}:{Global.sysAgentPort}"; if (config.listenerType == 2 || config.listenerType == 4) { - toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}"; + if (PACServerHandle.IsRunning) + { + toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}"; + } + else + { + toolSslPacPort.Text = UIRes.I18N("StartPacFailed"); + } } } } diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 3bcec746adc..0bd7e753947 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -117,1278 +117,1278 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Fill + + Remove duplicate server - - 3, 17 - - - 327, 17 - - + 447, 22 - - Add [VMess] server + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + Magenta + + 447, 22 - - Add [Shadowsocks] server + + 97, 53 - + 447, 22 - - Add [Socks] server + + 2 - - 447, 22 + + Restart service - - Add a custom configuration server + + tsbSubSetting - - 447, 22 + + groupBox2 - - Import bulk URL from clipboard + + menuMoveUp - - 447, 22 + + Add [Socks] server - - Scan QR code on the screen + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 444, 6 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 447, 22 + + 0, 17 - - Remove selected server (multiple choice) (Delete) + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 447, 22 + + 语言-[中文简体] - - Remove duplicate server + + + NoControl - - 447, 22 + + Top - - Copy selected server + + tsbHelp - - 447, 22 + + + 2 - - Set as active server (Enter) + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 444, 6 + + toolStripSeparator6 - - 447, 22 + + 93, 53 - - Up to top + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 447, 22 + + 187, 22 - - Upward (U) + + toolSslBlank2 - + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 22 - - Down (D) + + tsbCheckUpdateN - - 447, 22 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Moves down to the bottom + + menuExport2SubContent - - 447, 22 + + toolStripSeparator7 - - Select All (Ctrl+A) + + Check for updates to v2rayCore - - 444, 6 + + Magenta - + 447, 22 - - Test server delay (multiple choice)(Ctrl+P) + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 447, 22 + + Fill - - Test server speed (multiple choice)(Ctrl+T) + + 49, 17 - - 444, 6 + + Subscription - + + 952, 351 + + 447, 22 Export selected server for client configuration - - 447, 22 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + About + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Export selected server for server configuration - - 447, 22 - - - Batch export share URL to clipboard (multiple choice) + + splitContainer1 - - 447, 22 + + 0, 17 - - Batch export subscription content to clipboard (multiple choice) + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Magenta + + 952, 56 - - 64, 53 + + Bottom - - Servers + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ImageAboveText + + 100 + 448, 490 - - cmsLv + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + v2rayN - - Fill + + 447, 22 - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0 - ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu - PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA - BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5 - bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp - bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz - dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA - CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp - bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5 - bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3 - ////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0 - ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw== - + + toolStripSeparator1 - - 0, 0 + + 4 - - 686, 331 + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 + + 338, 22 - - lvServers + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - v2rayN.Forms.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + 447, 22 - - splitContainer1.Panel1 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1.Panel1 + + 187, 22 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1 + + menuPingServer - - 0 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Fill + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd + QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X + jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY + 6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3 + NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY + B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg== + - - 256, 331 + + Servers - - 0 + + 3 - - qrCodeControl + + 3, 17 - - v2rayN.Forms.QRCodeControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1.Panel2 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + Fill - - splitContainer1.Panel2 + + 6, 56 - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1 + + 220, 17 - - 1 + + menuAddCustomServer - - 100 + + menuMoveDown - - 946, 331 + + Import bulk URL from clipboard - - 686 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 2 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - splitContainer1 + + Moves down to the bottom - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox1 + + 6, 12 - - 0 + + 48, 53 - - 17, 17 - - - 137, 17 - - - NoControl + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 264, 22 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Enable Http proxy + + System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 547, 22 + + panel1 - - Open Http proxy and automatically configure proxy server (global mode) + + 198, 17 - - 547, 22 + + Fill - - Open PAC and automatically configure PAC (PAC mode) + + 686, 331 - - 547, 22 + + toolStripSeparator4 - - Only open Http proxy, do not automatically configure proxy server (direct mode) + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 547, 22 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Only open PAC, do not automatically configure PAC + + Batch export share URL to clipboard (multiple choice) - - 264, 22 + + Update subscription - - Http proxy mode + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 264, 22 + + 36, 17 - - Server + + menuAddServers2 - - 264, 22 + + Fill - - Import bulk URL from clipboard + + Add [VMess] server - - 264, 22 + + groupBox1 - - Scan QR code on the screen + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 264, 22 + + v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Copy local PAC URL + + tsbAbout - - 261, 6 + + 198, 17 - - 264, 22 + + 0 - - Exit + + toolStripSeparator5 - - 265, 164 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - cmsMain + + True - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 444, 6 - - v2rayN + + tsbPromotion - - True + + 256, 331 - - 232, 17 - - - 498, 17 - - - Fill + + 4, 4, 4, 4 - - 0, 66 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 952, 351 - - - 2 - - - Server list + + 444, 6 groupBox1 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - Fill - - - 3, 17 + + 198, 17 - + 0 - - True + + 197, 22 - - Vertical + + splitContainer1.Panel2 - - 946, 134 + + 52, 53 - - 2 + + 447, 22 - - txtMsgBox + + 6, 56 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Test server speed (multiple choice)(Ctrl+T) - - groupBox2 + + ssMain - - 0 + + ImageAboveText - - 603, 17 - - - 微软雅黑, 8pt + + splitContainer1 - - 49, 17 + + 265, 164 - - SOCKS5 + + 547, 22 - - 0, 17 + + $this - - 微软雅黑, 8pt + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 188, 17 + + 338, 22 - - 微软雅黑, 8pt + + Check for updates - - 36, 17 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - HTTP + + tsbLanguageDef 0, 17 - - 微软雅黑, 8pt - - - 188, 17 - - - 微软雅黑, 8pt - - - 30, 17 - - - PAC - - - 0, 17 - - - 微软雅黑, 8pt - - - 188, 17 + + toolSslServerSpeed - - False + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 微软雅黑, 8pt + + 4 - - No + + 197, 22 - - 220, 17 + + Only open Http proxy, do not automatically configure proxy server (direct mode) - - SPEED Disabled + + 547, 22 - - MiddleRight + + Magenta - - 0, 17 + + Remove selected server (multiple choice) (Delete) - - 3, 151 + + menuKeepPAC - - 946, 22 + + 0 - - 7 + + Help - - statusStrip1 + + menuSelectAll - - ssMain + + Up to top - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - groupBox2 + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 + + 30, 17 - - Bottom + + Scan QR code on the screen - - 0, 417 + + ImageAboveText - - 952, 176 + + tsbCheckUpdate - - 4 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Information + + menuSetDefaultServer - - groupBox2 + + Promotion - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuAddServers - - $this + + 447, 22 - - 3 + + menuAddVmessServer - - Top + + tsbLanguageZhHans - - 0, 56 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 952, 10 + + toolStripSeparator9 - - 5 + + BottomCenter - - panel1 + + menuExport2ShareUrl - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this + + SOCKS5 - - 4 + + Check for updates to v2rayN - - 409, 17 - - - 6, 56 + + Magenta - - 197, 22 + + splitContainer1.Panel1 - - Subscription settings + + 0, 66 - - 197, 22 + + 5 - - Update subscription + + Server - - Magenta + + v2rayN.Forms.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 93, 53 + + menuAddShadowsocksServer - - Subscription + + txtMsgBox - - ImageAboveText + + toolSslBlank4 - - 6, 56 + + 261, 6 - - Magenta + + System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 52, 53 + + v2rayN - - Setting + + Language-[English] - - ImageAboveText + + 264, 22 - - 6, 56 + + menuScanScreen2 - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd - QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X - jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY - 6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3 - NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY - B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg== - + + 0 - - BottomCenter + + toolSslBlank3 - - Magenta + + 128, 53 - - 97, 53 + + tsbReload - - Restart service + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + ImageAboveText - - 6, 56 - - - 338, 22 - - - Check for updates to v2rayN - - - 338, 22 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Check for updates to v2rayCore + + 0, 417 - - 338, 22 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Check for updated PAC (requires Http proxy) + + 444, 6 - - 338, 22 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Simplify PAC (please set Core route) + + 264, 22 - - Magenta + + No - - 128, 53 + + toolSslPacPort - - Check for updates + + Setting - - ImageAboveText + + menuMoveTop - - 6, 56 + + menuKeep - - 187, 22 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0 + ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu + PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA + BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5 + bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp + bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz + dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA + CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp + bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5 + bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3 + ////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0 + ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw== + - - About + + menuScanScreen - - 184, 6 + + cmsLv - - 187, 22 + + toolStripSeparator12 - - Language-[English] + + 6, 56 - - 187, 22 + + toolSslBlank1 - - 语言-[中文简体] + + splitContainer1.Panel1 - - Magenta + + tsbSubUpdate - - 48, 53 + + tsMain - - Help + + 2 - - ImageAboveText + + SPEED Disabled - - Magenta + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 89, 53 + + menuSysAgentMode - - Promotion + + 946, 331 - + ImageAboveText - - 6, 56 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/ - GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg== - + + 447, 22 - - Magenta + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 52, 53 + + 1 - - Close + + cmsMain - - ImageAboveText + + 264, 22 - - 0, 0 + + menuServers - - 952, 56 + + $this - - 6 + + 0 - - tsMain + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsbClose - - $this + + 1 - - 5 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 3, 151 + + True - - - 65 - - - 6, 12 - - 952, 593 + + 6, 56 - - 4, 4, 4, 4 + + 952, 10 - - v2rayN + + 264, 22 - - menuAddVmessServer + + 0 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator8 - - menuAddShadowsocksServer + + 89, 53 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuAddSocksServer - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Test server delay (multiple choice)(Ctrl+P) - - menuAddCustomServer + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + HTTP - - menuAddServers + + 447, 22 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 264, 22 - - menuScanScreen + + menuSysAgentEnabled - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator1 + + tsbOptionSetting - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Enable Http proxy - - menuRemoveServer + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuRemoveDuplicateServer + + Subscription settings - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 menuCopyServer - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuSetDefaultServer + + Http proxy mode - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 547, 22 - - toolStripSeparator3 + + Only open PAC, do not automatically configure PAC - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 22 - - menuMoveTop + + MainForm - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 微软雅黑, 8pt - - menuMoveUp + + menuExit - + + False + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuMoveDown + + Server list - + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + lvServers + + + Magenta + + + toolSslPacPortLab + + + menuGlobal + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuMoveBottom + + 5 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Check for updated PAC (requires Http proxy) - - menuSelectAll + + toolStripSeparator11 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 22 - - toolStripSeparator9 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuPingServer + + Select All (Ctrl+A) - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Information - - menuSpeedServer + + 2 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripSeparator6 + + tsbCheckUpdateCore - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuSpeedServer - - menuExport2ClientConfig + + PAC - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 22 - - menuExport2ServerConfig + + menuRemoveServer - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuExport2ShareUrl + + 946, 134 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuExport2SubContent + + System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbServer + + Down (D) - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuCopyPACUrl - - notifyMain + + 444, 6 - - System.Windows.Forms.NotifyIcon, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 22 - - menuSysAgentEnabled + + tsbSub - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Magenta - - menuSysAgentMode + + ImageAboveText - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Copy selected server - - menuGlobal + + 0, 0 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 447, 22 - - menuGlobalPAC + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox2 - - menuKeep + + Simplify PAC (please set Core route) - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuKeepPAC + + 微软雅黑, 8pt - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Vertical - - menuServers + + 447, 22 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + v2rayN.Forms.QRCodeControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - menuAddServers2 + + 微软雅黑, 8pt - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuScanScreen2 + + $this - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - menuCopyPACUrl + + qrCodeControl - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 264, 22 - - toolStripSeparator2 + + tsbServer - + + 1 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - menuExit + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 微软雅黑, 8pt - - bgwPing + + groupBox2 - - System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ImageAboveText - - bgwScan + + splitContainer1.Panel2 - - System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 338, 22 - - toolSslSocksPortLab + + 184, 6 - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 0 - - toolSslSocksPort + + Upward (U) - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolSslBlank1 + + notifyMain - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Open Http proxy and automatically configure proxy server (global mode) - - toolSslHttpPortLab + + MiddleRight - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 17 - - toolSslHttpPort + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuAddSocksServer - - toolSslBlank2 + + 微软雅黑, 8pt - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 64, 53 - - toolSslPacPortLab + + Magenta - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 946, 22 + + + Open PAC and automatically configure PAC (PAC mode) - - toolSslPacPort + + 447, 22 - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Set as active server (Enter) - - toolSslBlank3 + + bgwPing - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 686 - - toolSslServerSpeed + + 6, 56 - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Add [Shadowsocks] server - - toolSslBlank4 + + 微软雅黑, 8pt - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + splitContainer1 - - toolStripSeparator4 + + 952, 593 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 547, 22 - - tsbSub + + tsbCheckClearPACList - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Scan QR code on the screen - - tsbSubSetting + + toolSslSocksPort - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator10 - - tsbSubUpdate + + toolSslHttpPortLab - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuMoveBottom - - toolStripSeparator8 + + 338, 22 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6 - - tsbOptionSetting + + Magenta - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuExport2ClientConfig - - toolStripSeparator5 + + 187, 22 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + menuExport2ServerConfig - - tsbReload + + 0 - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ImageAboveText - - toolStripSeparator7 + + 6, 56 - + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbCheckUpdate + + Batch export subscription content to clipboard (multiple choice) - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 52, 53 - - tsbCheckUpdateN + + menuRemoveDuplicateServer - + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbCheckUpdateCore + + Exit - + + bgwScan + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbCheckUpdatePACList + + 0, 56 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Close - - tsbCheckClearPACList + + 264, 22 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0, 17 - - toolStripSeparator10 + + 7 - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Import bulk URL from clipboard - - tsbHelp + + $this - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator2 - - tsbAbout + + toolSslSocksPortLab - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Add a custom configuration server - - toolStripSeparator12 + + toolSslHttpPort - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbLanguageDef + + 952, 176 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + statusStrip1 - - tsbLanguageZhHans + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Fill - - tsbPromotion + + Copy local PAC URL - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator3 - - toolStripSeparator11 + + menuGlobalPAC - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/ + GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg== + - - tsbClose + + 447, 22 - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 微软雅黑, 8pt - - MainForm + + 447, 22 - - v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsbCheckUpdatePACList + + 232, 17 + + + True + + + 603, 17 + + + 65 + + + 137, 17 + + + 498, 17 + + + 17, 17 + + + 409, 17 + + + 327, 17 + \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx index a7cd7b2e9cc..279bbd77a3e 100644 --- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx @@ -282,21 +282,12 @@ ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw== - - 196, 164 - 195, 22 启用Http代理 - - 195, 22 - - - Http代理模式 - 340, 22 @@ -321,6 +312,12 @@ 仅开启PAC,不自动配置PAC + + 195, 22 + + + Http代理模式 + 195, 22 @@ -354,27 +351,18 @@ 退出 + + 196, 164 + 服务器列表 + + 网速显示未启用 + 信息 - - 176, 17 - - - 176, 17 - - - 176, 17 - - - 61, 53 - - - 订阅 - 124, 22 @@ -387,6 +375,12 @@ 更新订阅 + + 61, 53 + + + 订阅 + 76, 53 @@ -395,13 +389,13 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAATdJREFUWEftloENAiEMRW8ER3AEN9ANdARHcAPdwBF0A91AN9INtC+5JvUCJwWM - mvCTFw3QUiiU65qa/lUTYT6Ato9rJZyERwT6GFNdU+EihCYNwVhsqmgm3AR1fheOAitd9PCfNvp0HDbY - FolV2MmZZCzX9J0FG0TRTlwFdbahIVE7Qe1IR5bYVnXCyr2yO5F1MNUBec25YtjomcCXSxhr9DmrV2Gr - flyL4GSrYcm9tmnEZ7JsAC7DgWr5ydbXA8hOAcVjG8FTD6ocQgvXKrW8MqFWUfc1DAXgmRwVFaJQAHsh - VbYUU87diqWA934sl/TZ7wV2Lesx0gBwsO5/1Sl5PQhLQb+G+E+bfTm9KXsRAVgHrMK+jO9gbNEzzMSh - 6DlM9nANoa+kdCeLXLNLFtc9b2r6EXXdE4e4mdByNuG1AAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd + QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X + jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY + 6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3 + NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY + B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg== @@ -410,12 +404,6 @@ 重启服务 - - 85, 53 - - - 检查更新 - 232, 22 @@ -440,15 +428,21 @@ 简化PAC (请设置Core路由) + + 85, 53 + + + 检查更新 + + + 关于 + 69, 53 帮助 - - 关于 - 68, 53 @@ -457,15 +451,12 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA - 8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/ + GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg== 关闭 - - 网速显示未启用 - \ No newline at end of file diff --git a/v2rayN/v2rayN/Handler/StatisticsHandler.cs b/v2rayN/v2rayN/Handler/StatisticsHandler.cs index 455447b1379..766d4021ca8 100644 --- a/v2rayN/v2rayN/Handler/StatisticsHandler.cs +++ b/v2rayN/v2rayN/Handler/StatisticsHandler.cs @@ -285,6 +285,7 @@ public void LoadFromFile() try { + Utils.SaveLog(logPath_ + Global.StatisticLogOverall); var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall); if (File.Exists(overallPath)) { @@ -346,7 +347,7 @@ public void LoadFromFile() try { - // 当天流量记录文件 + Utils.SaveLog(logPath_ + $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt"); var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt"); if (File.Exists(dailyPath)) { diff --git a/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs b/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs index cfc3a54920c..29af2ed23a9 100644 --- a/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs +++ b/v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs @@ -17,7 +17,8 @@ class PACServerHandle { private static int pacPort = 0; private static HttpWebServer server; - public bool IsRunning + + public static bool IsRunning { get { @@ -42,7 +43,7 @@ public static void Init(Config config) } } - public static bool InitServer(string address) + private static bool InitServer(string address) { try { diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs index 4036b2e9339..3dcfbd4c2fb 100644 --- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs +++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs @@ -33,4 +33,4 @@ // 方法是按如下所示使用“*”: //[assembly: AssemblyVersion("1.0.*")] //[assembly: AssemblyVersion("1.0.0")] -[assembly: AssemblyFileVersion("2.40")] +[assembly: AssemblyFileVersion("2.41")] diff --git a/v2rayN/v2rayN/Resx/ResUI.Designer.cs b/v2rayN/v2rayN/Resx/ResUI.Designer.cs index 66383ce917f..58b42c18257 100644 --- a/v2rayN/v2rayN/Resx/ResUI.Designer.cs +++ b/v2rayN/v2rayN/Resx/ResUI.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace v2rayN.Resx { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// 一个强类型的资源类，用于查找本地化的字符串等。 /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + // 此类是由 StronglyTypedResourceBuilder + // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 + // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen + // (以 /str 作为命令选项)，或重新生成 VS 项目。 + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class ResUI { @@ -33,7 +33,7 @@ internal ResUI() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// 返回此类使用的缓存的 ResourceManager 实例。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal ResUI() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// 重写当前线程的 CurrentUICulture 属性 + /// 重写当前线程的 CurrentUICulture 属性。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal ResUI() { } /// - /// Looks up a localized string similar to Batch export subscription to clipboard successfully. + /// 查找类似 Batch export subscription to clipboard successfully 的本地化字符串。 /// internal static string BatchExportSubscriptionSuccessfully { get { @@ -70,7 +70,7 @@ internal static string BatchExportSubscriptionSuccessfully { } /// - /// Looks up a localized string similar to Batch export share URL to clipboard successfully. + /// 查找类似 Batch export share URL to clipboard successfully 的本地化字符串。 /// internal static string BatchExportURLSuccessfully { get { @@ -79,7 +79,7 @@ internal static string BatchExportURLSuccessfully { } /// - /// Looks up a localized string similar to Please check the server settings first. + /// 查找类似 Please check the server settings first 的本地化字符串。 /// internal static string CheckServerSettings { get { @@ -88,7 +88,7 @@ internal static string CheckServerSettings { } /// - /// Looks up a localized string similar to configuration format is incorrect. + /// 查找类似 configuration format is incorrect 的本地化字符串。 /// internal static string ConfigurationFormatIncorrect { get { @@ -97,7 +97,7 @@ internal static string ConfigurationFormatIncorrect { } /// - /// Looks up a localized string similar to Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound.. + /// 查找类似 Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound. 的本地化字符串。 /// internal static string CustomServerTips { get { @@ -106,7 +106,7 @@ internal static string CustomServerTips { } /// - /// Looks up a localized string similar to DOWN. + /// 查找类似 DOWN 的本地化字符串。 /// internal static string downloadSpeed { get { @@ -115,7 +115,7 @@ internal static string downloadSpeed { } /// - /// Looks up a localized string similar to Whether to download? {0}. + /// 查找类似 Whether to download? {0} 的本地化字符串。 /// internal static string DownloadYesNo { get { @@ -124,7 +124,7 @@ internal static string DownloadYesNo { } /// - /// Looks up a localized string similar to Failed to convert configuration file. + /// 查找类似 Failed to convert configuration file 的本地化字符串。 /// internal static string FailedConversionConfiguration { get { @@ -133,7 +133,7 @@ internal static string FailedConversionConfiguration { } /// - /// Looks up a localized string similar to Failed to generate default configuration file. + /// 查找类似 Failed to generate default configuration file 的本地化字符串。 /// internal static string FailedGenDefaultConfiguration { get { @@ -142,7 +142,7 @@ internal static string FailedGenDefaultConfiguration { } /// - /// Looks up a localized string similar to Failed to get the default configuration. + /// 查找类似 Failed to get the default configuration 的本地化字符串。 /// internal static string FailedGetDefaultConfiguration { get { @@ -151,7 +151,7 @@ internal static string FailedGetDefaultConfiguration { } /// - /// Looks up a localized string similar to Failed to import custom configuration server. + /// 查找类似 Failed to import custom configuration server 的本地化字符串。 /// internal static string FailedImportedCustomServer { get { @@ -160,7 +160,7 @@ internal static string FailedImportedCustomServer { } /// - /// Looks up a localized string similar to Failed to read configuration file. + /// 查找类似 Failed to read configuration file 的本地化字符串。 /// internal static string FailedReadConfiguration { get { @@ -169,7 +169,7 @@ internal static string FailedReadConfiguration { } /// - /// Looks up a localized string similar to Please fill in the correct format extra ID. + /// 查找类似 Please fill in the correct format extra ID 的本地化字符串。 /// internal static string FillCorrectAlterId { get { @@ -178,7 +178,7 @@ internal static string FillCorrectAlterId { } /// - /// Looks up a localized string similar to Please fill in the correct format server port. + /// 查找类似 Please fill in the correct format server port 的本地化字符串。 /// internal static string FillCorrectServerPort { get { @@ -187,7 +187,7 @@ internal static string FillCorrectServerPort { } /// - /// Looks up a localized string similar to Please fill in the KCP parameters correctly. + /// 查找类似 Please fill in the KCP parameters correctly 的本地化字符串。 /// internal static string FillKcpParameters { get { @@ -196,7 +196,7 @@ internal static string FillKcpParameters { } /// - /// Looks up a localized string similar to Please fill in the local listening port. + /// 查找类似 Please fill in the local listening port 的本地化字符串。 /// internal static string FillLocalListeningPort { get { @@ -205,7 +205,7 @@ internal static string FillLocalListeningPort { } /// - /// Looks up a localized string similar to Please fill in the password. + /// 查找类似 Please fill in the password 的本地化字符串。 /// internal static string FillPassword { get { @@ -214,7 +214,7 @@ internal static string FillPassword { } /// - /// Looks up a localized string similar to Please fill in the server address. + /// 查找类似 Please fill in the server address 的本地化字符串。 /// internal static string FillServerAddress { get { @@ -223,7 +223,7 @@ internal static string FillServerAddress { } /// - /// Looks up a localized string similar to Please fill in the user ID. + /// 查找类似 Please fill in the user ID 的本地化字符串。 /// internal static string FillUUID { get { @@ -232,7 +232,7 @@ internal static string FillUUID { } /// - /// Looks up a localized string similar to is not the correct client configuration file, please check. + /// 查找类似 is not the correct client configuration file, please check 的本地化字符串。 /// internal static string IncorrectClientConfiguration { get { @@ -241,7 +241,7 @@ internal static string IncorrectClientConfiguration { } /// - /// Looks up a localized string similar to is not the correct configuration, please check. + /// 查找类似 is not the correct configuration, please check 的本地化字符串。 /// internal static string Incorrectconfiguration { get { @@ -250,7 +250,7 @@ internal static string Incorrectconfiguration { } /// - /// Looks up a localized string similar to is not the correct server configuration file, please check. + /// 查找类似 is not the correct server configuration file, please check 的本地化字符串。 /// internal static string IncorrectServerConfiguration { get { @@ -259,7 +259,7 @@ internal static string IncorrectServerConfiguration { } /// - /// Looks up a localized string similar to Initial Configuration. + /// 查找类似 Initial Configuration 的本地化字符串。 /// internal static string InitialConfiguration { get { @@ -268,7 +268,7 @@ internal static string InitialConfiguration { } /// - /// Looks up a localized string similar to Address. + /// 查找类似 Address 的本地化字符串。 /// internal static string LvAddress { get { @@ -277,7 +277,7 @@ internal static string LvAddress { } /// - /// Looks up a localized string similar to Alias. + /// 查找类似 Alias 的本地化字符串。 /// internal static string LvAlias { get { @@ -286,7 +286,7 @@ internal static string LvAlias { } /// - /// Looks up a localized string similar to Security. + /// 查找类似 Security 的本地化字符串。 /// internal static string LvEncryptionMethod { get { @@ -295,7 +295,7 @@ internal static string LvEncryptionMethod { } /// - /// Looks up a localized string similar to Port. + /// 查找类似 Port 的本地化字符串。 /// internal static string LvPort { get { @@ -304,7 +304,7 @@ internal static string LvPort { } /// - /// Looks up a localized string similar to Type. + /// 查找类似 Type 的本地化字符串。 /// internal static string LvServiceType { get { @@ -313,7 +313,7 @@ internal static string LvServiceType { } /// - /// Looks up a localized string similar to Subs. + /// 查找类似 Subs 的本地化字符串。 /// internal static string LvSubscription { get { @@ -322,7 +322,7 @@ internal static string LvSubscription { } /// - /// Looks up a localized string similar to Test Results. + /// 查找类似 Test Results 的本地化字符串。 /// internal static string LvTestResults { get { @@ -331,7 +331,7 @@ internal static string LvTestResults { } /// - /// Looks up a localized string similar to Today download traffic. + /// 查找类似 Today download traffic 的本地化字符串。 /// internal static string LvTodayDownloadDataAmount { get { @@ -340,7 +340,7 @@ internal static string LvTodayDownloadDataAmount { } /// - /// Looks up a localized string similar to Today upload traffic. + /// 查找类似 Today upload traffic 的本地化字符串。 /// internal static string LvTodayUploadDataAmount { get { @@ -349,7 +349,7 @@ internal static string LvTodayUploadDataAmount { } /// - /// Looks up a localized string similar to Total download traffic. + /// 查找类似 Total download traffic 的本地化字符串。 /// internal static string LvTotalDownloadDataAmount { get { @@ -358,7 +358,7 @@ internal static string LvTotalDownloadDataAmount { } /// - /// Looks up a localized string similar to Total upload traffic. + /// 查找类似 Total upload traffic 的本地化字符串。 /// internal static string LvTotalUploadDataAmount { get { @@ -367,7 +367,7 @@ internal static string LvTotalUploadDataAmount { } /// - /// Looks up a localized string similar to Transport. + /// 查找类似 Transport 的本地化字符串。 /// internal static string LvTransportProtocol { get { @@ -376,7 +376,7 @@ internal static string LvTransportProtocol { } /// - /// Looks up a localized string similar to MediumFresh. + /// 查找类似 MediumFresh 的本地化字符串。 /// internal static string MediumFresh { get { @@ -385,7 +385,7 @@ internal static string MediumFresh { } /// - /// Looks up a localized string similar to Clear original subscription content. + /// 查找类似 Clear original subscription content 的本地化字符串。 /// internal static string MsgClearSubscription { get { @@ -394,7 +394,7 @@ internal static string MsgClearSubscription { } /// - /// Looks up a localized string similar to Download V2rayCore successfully. + /// 查找类似 Download V2rayCore successfully 的本地化字符串。 /// internal static string MsgDownloadV2rayCoreSuccessfully { get { @@ -403,7 +403,7 @@ internal static string MsgDownloadV2rayCoreSuccessfully { } /// - /// Looks up a localized string similar to Failed to import subscription content. + /// 查找类似 Failed to import subscription content 的本地化字符串。 /// internal static string MsgFailedImportSubscription { get { @@ -412,7 +412,7 @@ internal static string MsgFailedImportSubscription { } /// - /// Looks up a localized string similar to Get the subscription content successfully. + /// 查找类似 Get the subscription content successfully 的本地化字符串。 /// internal static string MsgGetSubscriptionSuccessfully { get { @@ -421,7 +421,7 @@ internal static string MsgGetSubscriptionSuccessfully { } /// - /// Looks up a localized string similar to No valid subscriptions set. + /// 查找类似 No valid subscriptions set 的本地化字符串。 /// internal static string MsgNoValidSubscription { get { @@ -430,7 +430,7 @@ internal static string MsgNoValidSubscription { } /// - /// Looks up a localized string similar to PAC update failed. + /// 查找类似 PAC update failed 的本地化字符串。 /// internal static string MsgPACUpdateFailed { get { @@ -439,7 +439,7 @@ internal static string MsgPACUpdateFailed { } /// - /// Looks up a localized string similar to PAC update succeeded. + /// 查找类似 PAC update succeeded 的本地化字符串。 /// internal static string MsgPACUpdateSuccessfully { get { @@ -448,7 +448,7 @@ internal static string MsgPACUpdateSuccessfully { } /// - /// Looks up a localized string similar to Resolve V2rayCore successfully. + /// 查找类似 Resolve V2rayCore successfully 的本地化字符串。 /// internal static string MsgParsingV2rayCoreSuccessfully { get { @@ -457,7 +457,7 @@ internal static string MsgParsingV2rayCoreSuccessfully { } /// - /// Looks up a localized string similar to Simplify PAC Success. + /// 查找类似 Simplify PAC Success 的本地化字符串。 /// internal static string MsgSimplifyPAC { get { @@ -466,7 +466,7 @@ internal static string MsgSimplifyPAC { } /// - /// Looks up a localized string similar to Start getting subscriptions. + /// 查找类似 Start getting subscriptions 的本地化字符串。 /// internal static string MsgStartGettingSubscriptions { get { @@ -475,7 +475,7 @@ internal static string MsgStartGettingSubscriptions { } /// - /// Looks up a localized string similar to Start updating PAC.... + /// 查找类似 Start updating PAC... 的本地化字符串。 /// internal static string MsgStartUpdatingPAC { get { @@ -484,7 +484,7 @@ internal static string MsgStartUpdatingPAC { } /// - /// Looks up a localized string similar to Start updating V2rayCore.... + /// 查找类似 Start updating V2rayCore... 的本地化字符串。 /// internal static string MsgStartUpdatingV2rayCore { get { @@ -493,7 +493,7 @@ internal static string MsgStartUpdatingV2rayCore { } /// - /// Looks up a localized string similar to Subscription content decoding failed (non-BASE64 code). + /// 查找类似 Subscription content decoding failed (non-BASE64 code) 的本地化字符串。 /// internal static string MsgSubscriptionDecodingFailed { get { @@ -502,7 +502,7 @@ internal static string MsgSubscriptionDecodingFailed { } /// - /// Looks up a localized string similar to is unpacking.... + /// 查找类似 is unpacking... 的本地化字符串。 /// internal static string MsgUnpacking { get { @@ -511,7 +511,7 @@ internal static string MsgUnpacking { } /// - /// Looks up a localized string similar to Update subscription end. + /// 查找类似 Update subscription end 的本地化字符串。 /// internal static string MsgUpdateSubscriptionEnd { get { @@ -520,7 +520,7 @@ internal static string MsgUpdateSubscriptionEnd { } /// - /// Looks up a localized string similar to Update subscription starts. + /// 查找类似 Update subscription starts 的本地化字符串。 /// internal static string MsgUpdateSubscriptionStart { get { @@ -529,7 +529,7 @@ internal static string MsgUpdateSubscriptionStart { } /// - /// Looks up a localized string similar to Update V2rayCore successfully. + /// 查找类似 Update V2rayCore successfully 的本地化字符串。 /// internal static string MsgUpdateV2rayCoreSuccessfully { get { @@ -538,7 +538,7 @@ internal static string MsgUpdateV2rayCoreSuccessfully { } /// - /// Looks up a localized string similar to Update V2rayCore successfully! Restarting service.... + /// 查找类似 Update V2rayCore successfully! Restarting service... 的本地化字符串。 /// internal static string MsgUpdateV2rayCoreSuccessfullyMore { get { @@ -547,7 +547,7 @@ internal static string MsgUpdateV2rayCoreSuccessfullyMore { } /// - /// Looks up a localized string similar to This feature relies on the Http global proxy, please set it correctly first.. + /// 查找类似 This feature relies on the Http global proxy, please set it correctly first. 的本地化字符串。 /// internal static string NeedHttpGlobalProxy { get { @@ -556,7 +556,7 @@ internal static string NeedHttpGlobalProxy { } /// - /// Looks up a localized string similar to Non-vmess or ss protocol. + /// 查找类似 Non-vmess or ss protocol 的本地化字符串。 /// internal static string NonvmessOrssProtocol { get { @@ -565,7 +565,7 @@ internal static string NonvmessOrssProtocol { } /// - /// Looks up a localized string similar to non-Vmess service, this feature is invalid. + /// 查找类似 non-Vmess service, this feature is invalid 的本地化字符串。 /// internal static string NonVmessService { get { @@ -574,7 +574,7 @@ internal static string NonVmessService { } /// - /// Looks up a localized string similar to V2ray-core not found, download address: {0}. + /// 查找类似 V2ray-core not found, download address: {0} 的本地化字符串。 /// internal static string NotFoundCore { get { @@ -583,7 +583,7 @@ internal static string NotFoundCore { } /// - /// Looks up a localized string similar to Scan completed, no valid QR code found. + /// 查找类似 Scan completed, no valid QR code found 的本地化字符串。 /// internal static string NoValidQRcodeFound { get { @@ -592,7 +592,7 @@ internal static string NoValidQRcodeFound { } /// - /// Looks up a localized string similar to operation failed, please check retry. + /// 查找类似 operation failed, please check retry 的本地化字符串。 /// internal static string OperationFailed { get { @@ -601,7 +601,7 @@ internal static string OperationFailed { } /// - /// Looks up a localized string similar to Please Fill Remarks. + /// 查找类似 Please Fill Remarks 的本地化字符串。 /// internal static string PleaseFillRemarks { get { @@ -610,7 +610,7 @@ internal static string PleaseFillRemarks { } /// - /// Looks up a localized string similar to Please select the encryption method. + /// 查找类似 Please select the encryption method 的本地化字符串。 /// internal static string PleaseSelectEncryption { get { @@ -619,7 +619,7 @@ internal static string PleaseSelectEncryption { } /// - /// Looks up a localized string similar to Please select an agreement. + /// 查找类似 Please select an agreement 的本地化字符串。 /// internal static string PleaseSelectProtocol { get { @@ -628,7 +628,7 @@ internal static string PleaseSelectProtocol { } /// - /// Looks up a localized string similar to Please select the server first. + /// 查找类似 Please select the server first 的本地化字符串。 /// internal static string PleaseSelectServer { get { @@ -637,7 +637,7 @@ internal static string PleaseSelectServer { } /// - /// Looks up a localized string similar to QuickFresh. + /// 查找类似 QuickFresh 的本地化字符串。 /// internal static string QuickFresh { get { @@ -646,7 +646,7 @@ internal static string QuickFresh { } /// - /// Looks up a localized string similar to Are you sure to remove the server?. + /// 查找类似 Are you sure to remove the server? 的本地化字符串。 /// internal static string RemoveServer { get { @@ -655,7 +655,7 @@ internal static string RemoveServer { } /// - /// Looks up a localized string similar to The client configuration file is saved at: {0}. + /// 查找类似 The client configuration file is saved at: {0} 的本地化字符串。 /// internal static string SaveClientConfigurationIn { get { @@ -664,7 +664,7 @@ internal static string SaveClientConfigurationIn { } /// - /// Looks up a localized string similar to The server configuration file is saved at: {0}. + /// 查找类似 The server configuration file is saved at: {0} 的本地化字符串。 /// internal static string SaveServerConfigurationIn { get { @@ -673,7 +673,7 @@ internal static string SaveServerConfigurationIn { } /// - /// Looks up a localized string similar to SlowFresh. + /// 查找类似 SlowFresh 的本地化字符串。 /// internal static string SlowFresh { get { @@ -682,7 +682,7 @@ internal static string SlowFresh { } /// - /// Looks up a localized string similar to Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node!. + /// 查找类似 Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node! 的本地化字符串。 /// internal static string SpeedServerTips { get { @@ -691,7 +691,16 @@ internal static string SpeedServerTips { } /// - /// Looks up a localized string similar to Start service ({0})....... + /// 查找类似 PAC failed to start. Pls with an administrator. 的本地化字符串。 + /// + internal static string StartPacFailed { + get { + return ResourceManager.GetString("StartPacFailed", resourceCulture); + } + } + + /// + /// 查找类似 Start service ({0})...... 的本地化字符串。 /// internal static string StartService { get { @@ -700,8 +709,8 @@ internal static string StartService { } /// - /// Looks up a localized string similar to Successful configuration - ///{0}. + /// 查找类似 Successful configuration + ///{0} 的本地化字符串。 /// internal static string SuccessfulConfiguration { get { @@ -710,7 +719,7 @@ internal static string SuccessfulConfiguration { } /// - /// Looks up a localized string similar to Successfully imported custom configuration server. + /// 查找类似 Successfully imported custom configuration server 的本地化字符串。 /// internal static string SuccessfullyImportedCustomServer { get { @@ -719,7 +728,7 @@ internal static string SuccessfullyImportedCustomServer { } /// - /// Looks up a localized string similar to Imported bulk URL from clipboard successfully. + /// 查找类似 Imported bulk URL from clipboard successfully 的本地化字符串。 /// internal static string SuccessfullyImportedServerViaClipboard { get { @@ -728,21 +737,12 @@ internal static string SuccessfullyImportedServerViaClipboard { } /// - /// Looks up a localized string similar to Scan import URL successfully. + /// 查找类似 Scan import URL successfully 的本地化字符串。 /// internal static string SuccessfullyImportedServerViaScan { get { return ResourceManager.GetString("SuccessfullyImportedServerViaScan", resourceCulture); } } - - /// - /// Looks up a localized string similar to UP. - /// - internal static string uploadSpeed { - get { - return ResourceManager.GetString("uploadSpeed", resourceCulture); - } - } } } diff --git a/v2rayN/v2rayN/Resx/ResUI.resx b/v2rayN/v2rayN/Resx/ResUI.resx index 7f18977be74..9db82297aaa 100644 --- a/v2rayN/v2rayN/Resx/ResUI.resx +++ b/v2rayN/v2rayN/Resx/ResUI.resx @@ -343,7 +343,7 @@ Total upload traffic - - UP + + PAC failed to start. Pls with an administrator. \ No newline at end of file diff --git a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx index 9119c5d586b..b775c1526a4 100644 --- a/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx +++ b/v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx @@ -343,7 +343,7 @@ 总上传 - - 上传 + + PAC服务启动失败,请用管理员启动 \ No newline at end of file