diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt index 38e72d4a..51ac217d 100644 --- a/shadowsocks-csharp/Data/cn.txt +++ b/shadowsocks-csharp/Data/cn.txt @@ -38,11 +38,13 @@ Shadowsocks {0} Update Found=Shadowsocks {0} 更新 Click here to download=点击这里下载 Shadowsocks is here=Shadowsocks 在这里 You can turn on/off Shadowsocks in the context menu=可以在右键菜单中开关 Shadowsocks -System Proxy Enabled=已启用系统代理 -System Proxy Disabled=已禁用系统代理 +System Proxy Enabled=系统代理已启用 +System Proxy Disabled=系统代理未启用 Update PAC from GFWList=从 GFWList 更新 PAC Failed to update PAC file =更新 PAC 文件失败 PAC updated=更新 PAC 成功 No QRCode found. Try to zoom in or move it to the center of the screen.=找不到二维码,尝试把它放大或者移动到靠近屏幕中间的位置 Failed to decode QRCode=无法解析二维码 Failed to update registry=无法修改注册表 +System Proxy On: =系统代理已启用: +Running: Port {0}=正在运行:端口 {0} \ No newline at end of file diff --git a/shadowsocks-csharp/View/MenuViewController.cs b/shadowsocks-csharp/View/MenuViewController.cs index 816db24e..6b897603 100755 --- a/shadowsocks-csharp/View/MenuViewController.cs +++ b/shadowsocks-csharp/View/MenuViewController.cs @@ -110,17 +110,19 @@ namespace Shadowsocks.View for (int y = 0; y < iconCopy.Height; y++) { Color color = icon.GetPixel(x, y); - iconCopy.SetPixel(x, y , Color.FromArgb((byte)(color.A / 1.25), color.R, color.G, color.B)); + iconCopy.SetPixel(x, y, Color.FromArgb((byte)(color.A / 1.25), color.R, color.G, color.B)); } } icon = iconCopy; } _notifyIcon.Icon = Icon.FromHandle(icon.GetHicon()); - string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + - (enabled ? I18N.GetString("System Proxy Enabled") : I18N.GetString("System Proxy Disabled")) + - (enabled ? "(" + (global ? I18N.GetString("Global") : I18N.GetString("PAC")) + ")" : "") + "\n" + - config.GetCurrentServer().FriendlyName(); + // we want to show more details but notify icon title is limited to 63 characters + string text = I18N.GetString("Shadowsocks") + " " + UpdateChecker.Version + "\n" + + (enabled ? + I18N.GetString("System Proxy On: ") + (global ? I18N.GetString("Global") : I18N.GetString("PAC")) : + String.Format(I18N.GetString("Running: Port {0}"), config.localPort)) // this feedback is very important because they need to know Shadowsocks is running + + "\n" + config.GetCurrentServer().FriendlyName(); _notifyIcon.Text = text.Substring(0, Math.Min(63, text.Length)); }