From 22fdc823f2da24e8436c3fd4470ce3bc8b48d382 Mon Sep 17 00:00:00 2001 From: Soul Dark <1012179378@qq.com> Date: Wed, 15 Aug 2018 20:15:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DConfigForm=E4=B8=8D?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BB=A3=E7=A0=81=E3=80=82=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=88=86=E9=9A=94=E7=AC=A6=E6=94=AF=E6=8C=81=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shadowsocks-csharp/Model/Server.cs | 2 +- shadowsocks-csharp/View/ConfigForm.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks-csharp/Model/Server.cs b/shadowsocks-csharp/Model/Server.cs index b5f8eba7..4e6a66cf 100755 --- a/shadowsocks-csharp/Model/Server.cs +++ b/shadowsocks-csharp/Model/Server.cs @@ -113,7 +113,7 @@ namespace Shadowsocks.Model public static List GetServers(string ssURL) { - var serverUrls = ssURL.Split('\r', '\n'); + var serverUrls = ssURL.Split('\r', '\n', ' '); List servers = new List(); foreach (string serverUrl in serverUrls) diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs index ac582814..ca82aad6 100755 --- a/shadowsocks-csharp/View/ConfigForm.cs +++ b/shadowsocks-csharp/View/ConfigForm.cs @@ -228,7 +228,7 @@ namespace Shadowsocks.View ServersListBox.SelectedIndex = _lastSelectedIndex; return; } - if (_lastSelectedIndex >= 0) + if (_lastSelectedIndex >= 0 && _lastSelectedIndex < _modifiedConfiguration.configs.Count) { ServersListBox.Items[_lastSelectedIndex] = _modifiedConfiguration.configs[_lastSelectedIndex].FriendlyName(); } From b73dbd6be20b91bd339bf905450bed533451f062 Mon Sep 17 00:00:00 2001 From: Soul Dark <1012179378@qq.com> Date: Thu, 16 Aug 2018 13:38:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=EF=BC=88=E7=94=A8=E8=AF=8D=E4=B8=80=E8=87=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shadowsocks-csharp/Data/zh_CN.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shadowsocks-csharp/Data/zh_CN.txt b/shadowsocks-csharp/Data/zh_CN.txt index a7f8f3ab..df47fb2d 100644 --- a/shadowsocks-csharp/Data/zh_CN.txt +++ b/shadowsocks-csharp/Data/zh_CN.txt @@ -107,8 +107,8 @@ Switch share over LAN=切换局域网共享 Show Logs=显示日志 Switch to prev server=切换上个服务器 Switch to next server=切换下个服务器 -Reg All=注册全部热键 -Reg Hotkeys At Startup=启动时注册热键 +Reg All=注册全部快捷键 +Reg Hotkeys At Startup=启动时注册快捷键 # Messages @@ -145,6 +145,6 @@ Unsupported operating system, use Windows Vista at least.=不支持的操作系 Unsupported .NET Framework, please update to 4.6.2 or later.=当前 .NET Framework 版本过低，请升级至4.6.2或更新版本。 Proxy request failed=代理请求失败 Proxy handshake failed=代理握手失败 -Register hotkey failed=注册热键失败 -Cannot parse hotkey: {0}=解析热键失败: {0} +Register hotkey failed=注册快捷键失败 +Cannot parse hotkey: {0}=解析快捷键失败: {0} Timeout is invalid, it should not exceed {0}=超时无效，不应超过 {0}