diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs index d296856d..ec357a87 100644 --- a/v2rayN/v2rayN/Forms/MainForm.cs +++ b/v2rayN/v2rayN/Forms/MainForm.cs @@ -652,9 +652,9 @@ namespace v2rayN.Forms GetLvSelectedIndex(); StringBuilder sb = new StringBuilder(); - for (int k = 0; k < lvSelecteds.Count; k++) + foreach (int v in lvSelecteds) { - string url = ConfigHandler.GetVmessQRCode(config, lvSelecteds[k]); + string url = ConfigHandler.GetVmessQRCode(config, v); if (Utils.IsNullOrEmpty(url)) { continue; @@ -674,9 +674,9 @@ namespace v2rayN.Forms GetLvSelectedIndex(); StringBuilder sb = new StringBuilder(); - for (int k = 0; k < lvSelecteds.Count; k++) + foreach (int v in lvSelecteds) { - string url = ConfigHandler.GetVmessQRCode(config, lvSelecteds[k]); + string url = ConfigHandler.GetVmessQRCode(config, v); if (Utils.IsNullOrEmpty(url)) { continue; diff --git a/v2rayN/v2rayN/Forms/MainForm.resx b/v2rayN/v2rayN/Forms/MainForm.resx index 1e8db31c..18ad432d 100644 --- a/v2rayN/v2rayN/Forms/MainForm.resx +++ b/v2rayN/v2rayN/Forms/MainForm.resx @@ -171,19 +171,19 @@ 447, 22 - Remove selected server (multiple choice) (Delete) + Remove selected servers (Delete) 447, 22 - Remove duplicate server + Remove duplicate servers 447, 22 - Copy selected server + Clone selected server 447, 22 @@ -231,25 +231,25 @@ 447, 22 - Test server ping (multiple choice) (Ctrl+P) + Test servers ping (Ctrl+P) 447, 22 - Test server tcping (multiple choice) (Ctrl+O) + Test servers with tcping (Ctrl+O) 447, 22 - Test server real ping (multiple choice) (Ctrl+R) + Test servers real delay (Ctrl+R) 447, 22 - Test server speed (multiple choice) (Ctrl+T) + Test servers download speed (Ctrl+T) 444, 6 @@ -270,13 +270,13 @@ 447, 22 - Batch export share URL to clipboard (multiple choice) (Ctrl+C) + Export share URLs to clipboard (Ctrl+C) 447, 22 - Batch export subscription content to clipboard (multiple choice) + Export subscription (base64) share to clipboard Magenta diff --git a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx index b8f6cebb..3ff52395 100644 --- a/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx @@ -173,7 +173,7 @@ 278, 22 - 复制所选服务器 + 克隆所选服务器 278, 22 diff --git a/v2rayN/v2rayN/Forms/SubSettingForm.cs b/v2rayN/v2rayN/Forms/SubSettingForm.cs index 14b5fbf6..25ac20e6 100644 --- a/v2rayN/v2rayN/Forms/SubSettingForm.cs +++ b/v2rayN/v2rayN/Forms/SubSettingForm.cs @@ -47,9 +47,8 @@ namespace v2rayN.Forms } } - for (int k = 0; k < config.subItem.Count; k++) + foreach (var item in config.subItem) { - var item = config.subItem[k]; SubSettingControl control = new SubSettingControl(); control.OnButtonClicked += Control_OnButtonClicked; control.subItem = item; diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index b8fd7971..28adbaa1 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -247,7 +247,7 @@ namespace v2rayN.Handler } /// - /// 复制服务器 + /// 克隆服务器 /// /// /// diff --git a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs index 367b198b..dad221e8 100644 --- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs +++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs @@ -72,9 +72,8 @@ namespace v2rayN.Handler { try { - for (int k = 0; k < _selecteds.Count; k++) + foreach (int index in _selecteds) { - int index = _selecteds[k]; if (_config.vmess[index].configType == (int)EConfigType.Custom) { continue; @@ -141,9 +140,8 @@ namespace v2rayN.Handler Thread.Sleep(5000); var httpPort = _config.GetLocalPort("speedtest"); - for (int k = 0; k < _selecteds.Count; k++) + foreach (int index in _selecteds) { - int index = _selecteds[k]; if (_config.vmess[index].configType == (int)EConfigType.Custom) { continue; diff --git a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs index 8c3a81f3..ec3ecbc0 100644 --- a/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/V2rayConfigHandler.cs @@ -237,9 +237,9 @@ namespace v2rayN.Handler rulesIP.outboundTag = tag; rulesIP.ip = new List(); - for (int k = 0; k < userRule.Count; k++) + foreach (string u in userRule) { - string url = userRule[k].TrimEx(); + string url = u.TrimEx(); if (Utils.IsNullOrEmpty(url)) { continue; @@ -1424,9 +1424,8 @@ namespace v2rayN.Handler var httpPort = configCopy.GetLocalPort("speedtest"); - for (int k = 0; k < selecteds.Count; k++) + foreach (int index in selecteds) { - int index = selecteds[k]; if (configCopy.vmess[index].configType == (int)EConfigType.Custom) { continue;