diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt index 5d48ef7d..d471863a 100644 --- a/shadowsocks-csharp/Data/cn.txt +++ b/shadowsocks-csharp/Data/cn.txt @@ -113,4 +113,5 @@ Failed to update registry=无法修改注册表 System Proxy On: =系统代理已启用: Running: Port {0}=正在运行:端口 {0} Unexpected error, shadowsocks will exit. Please report to=非预期错误,Shadowsocks将退出。请提交此错误到 - \ No newline at end of file +Proxy request failed=代理请求失败 +Proxy handshake failed=代理握手失败 diff --git a/shadowsocks-csharp/Proxy/Socks5Proxy.cs b/shadowsocks-csharp/Proxy/Socks5Proxy.cs index cac20cfa..61a1707d 100644 --- a/shadowsocks-csharp/Proxy/Socks5Proxy.cs +++ b/shadowsocks-csharp/Proxy/Socks5Proxy.cs @@ -98,7 +98,7 @@ namespace Shadowsocks.Proxy atyp = 4; // IP V6 address break; default: - throw new Exception(I18N.GetString("Proxy request faild")); + throw new Exception(I18N.GetString("Proxy request failed")); } var addr = ep.Address.GetAddressBytes(); @@ -221,12 +221,12 @@ namespace Shadowsocks.Proxy { if (_receiveBuffer[0] != 5 || _receiveBuffer[1] != 0) { - ex = new Exception(I18N.GetString("Proxy handshake faild")); + ex = new Exception(I18N.GetString("Proxy handshake failed")); } } else { - ex = new Exception(I18N.GetString("Proxy handshake faild")); + ex = new Exception(I18N.GetString("Proxy handshake failed")); } } catch (Exception ex2) @@ -276,20 +276,20 @@ namespace Shadowsocks.Proxy _remote.BeginReceive(_receiveBuffer, 0, 16 + 2, 0, Socks5ReplyReceiveCallback2, state); break; default: - state.ex = new Exception(I18N.GetString("Proxy request faild")); + state.ex = new Exception(I18N.GetString("Proxy request failed")); state.Callback?.Invoke(new FakeAsyncResult(ar, state)); break; } } else { - state.ex = new Exception(I18N.GetString("Proxy request faild")); + state.ex = new Exception(I18N.GetString("Proxy request failed")); state.Callback?.Invoke(new FakeAsyncResult(ar, state)); } } else { - state.ex = new Exception(I18N.GetString("Proxy request faild")); + state.ex = new Exception(I18N.GetString("Proxy request failed")); state.Callback?.Invoke(new FakeAsyncResult(ar, state)); } } @@ -312,7 +312,7 @@ namespace Shadowsocks.Proxy if (bytesRead < bytesNeedSkip) { - ex = new Exception(I18N.GetString("Proxy request faild")); + ex = new Exception(I18N.GetString("Proxy request failed")); } } catch (Exception ex2)