Browse Source

Fix typo

Update translate

Signed-off-by: noisyfox <timemanager.rick@gmail.com>
tags/3.3
noisyfox 8 years ago
parent
commit
aef88543d2
2 changed files with 9 additions and 8 deletions
  1. +2
    -1
      shadowsocks-csharp/Data/cn.txt
  2. +7
    -7
      shadowsocks-csharp/Proxy/Socks5Proxy.cs

+ 2
- 1
shadowsocks-csharp/Data/cn.txt View File

@@ -113,4 +113,5 @@ Failed to update registry=无法修改注册表
System Proxy On: =系统代理已启用: System Proxy On: =系统代理已启用:
Running: Port {0}=正在运行:端口 {0} Running: Port {0}=正在运行:端口 {0}
Unexpected error, shadowsocks will exit. Please report to=非预期错误,Shadowsocks将退出。请提交此错误到 Unexpected error, shadowsocks will exit. Please report to=非预期错误,Shadowsocks将退出。请提交此错误到
Proxy request failed=代理请求失败
Proxy handshake failed=代理握手失败

+ 7
- 7
shadowsocks-csharp/Proxy/Socks5Proxy.cs View File

@@ -98,7 +98,7 @@ namespace Shadowsocks.Proxy
atyp = 4; // IP V6 address atyp = 4; // IP V6 address
break; break;
default: default:
throw new Exception(I18N.GetString("Proxy request faild"));
throw new Exception(I18N.GetString("Proxy request failed"));
} }


var addr = ep.Address.GetAddressBytes(); var addr = ep.Address.GetAddressBytes();
@@ -221,12 +221,12 @@ namespace Shadowsocks.Proxy
{ {
if (_receiveBuffer[0] != 5 || _receiveBuffer[1] != 0) if (_receiveBuffer[0] != 5 || _receiveBuffer[1] != 0)
{ {
ex = new Exception(I18N.GetString("Proxy handshake faild"));
ex = new Exception(I18N.GetString("Proxy handshake failed"));
} }
} }
else else
{ {
ex = new Exception(I18N.GetString("Proxy handshake faild"));
ex = new Exception(I18N.GetString("Proxy handshake failed"));
} }
} }
catch (Exception ex2) catch (Exception ex2)
@@ -276,20 +276,20 @@ namespace Shadowsocks.Proxy
_remote.BeginReceive(_receiveBuffer, 0, 16 + 2, 0, Socks5ReplyReceiveCallback2, state); _remote.BeginReceive(_receiveBuffer, 0, 16 + 2, 0, Socks5ReplyReceiveCallback2, state);
break; break;
default: 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)); state.Callback?.Invoke(new FakeAsyncResult(ar, state));
break; break;
} }
} }
else 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)); state.Callback?.Invoke(new FakeAsyncResult(ar, state));
} }
} }
else 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)); state.Callback?.Invoke(new FakeAsyncResult(ar, state));
} }
} }
@@ -312,7 +312,7 @@ namespace Shadowsocks.Proxy


if (bytesRead < bytesNeedSkip) if (bytesRead < bytesNeedSkip)
{ {
ex = new Exception(I18N.GetString("Proxy request faild"));
ex = new Exception(I18N.GetString("Proxy request failed"));
} }
} }
catch (Exception ex2) catch (Exception ex2)


Loading…
Cancel
Save