diff --git a/shadowsocks-csharp/Data/zh_CN.txt b/shadowsocks-csharp/Data/zh_CN.txt index d89385ea..96b814e4 100644 --- a/shadowsocks-csharp/Data/zh_CN.txt +++ b/shadowsocks-csharp/Data/zh_CN.txt @@ -67,6 +67,33 @@ New server=未配置的服务器 Move &Up=上移(&U) Move D&own=下移(&O) +#Statistics Config + +Enable Statistics=启用统计 +Ping Test=Ping测试 +package everytime=个包/次 +By hour of day=按照每天的小时数统计 +Collect data per=收集数据每 +Keep choice for=保持选择每 +minutes=分钟 +Final Score=总分 +AverageLatency=平均延迟 +MinLatency=最小延迟 +MaxLatency=最大延迟 +AverageInboundSpeed=平均入站速度 +MinInboundSpeed=最小入站速度 +MaxInboundSpeed=最大入站速度 +AverageOutboundSpeed=平均出站速度 +MinOutboundSpeed=最小出站速度 +MaxOutboundSpeed=最大出站速度 +AverageResponse=平均响应速度 +MinResponse=最小响应速度 +MaxResponse=最大响应速度 +PackageLoss=丢包率 +Speed=速度 +Package Loss=丢包率 +Ping=网络延迟 + # Proxy Form Edit Proxy=代理设置 @@ -165,4 +192,4 @@ Illegal timeout format, Cannot automatically save or discard changes=非法超 Error occured when process proxy setting, do you want reset current setting and retry?=处理代理设置时发生错误,是否重置当前代理设置并重试? Unrecoverable proxy setting error occured, see log for detail=发生不可恢复的代理设置错误,查看日志以取得详情 Auth user can not be blank=认证用户不能为空 -Auth pwd can not be blank=认证密码不能为空 \ No newline at end of file +Auth pwd can not be blank=认证密码不能为空 diff --git a/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs b/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs index 4ca099bf..c59a8ce0 100644 --- a/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs +++ b/shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs @@ -31,11 +31,31 @@ namespace Shadowsocks.View _pingSeries = StatisticsChart.Series["Ping"]; _controller = controller; _controller.ConfigChanged += (sender, args) => LoadConfiguration(); + UpdateTexts(); LoadConfiguration(); Load += (sender, args) => InitData(); - } + private void UpdateTexts() + { + Control[] controls = new Control[] + { + StatisticsEnabledCheckBox,PingCheckBox,label6, + byHourOfDayCheckBox,label9,label8,label2,label3, + label1,chartModeSelector,dayMode,allMode, + OKButton,CancelButton + }; + foreach (var item in controls) + { + item.Text = I18N.GetString(item.Text); + } + + foreach (var item in StatisticsChart.Series) + { + item.Name = I18N.GetString(item.Name); + } + + } private void LoadConfiguration() { var configs = _controller.GetCurrentConfiguration().configs; @@ -60,13 +80,13 @@ namespace Shadowsocks.View serverSelector.DataSource = _servers; _dataTable.Columns.Add("Timestamp", typeof(DateTime)); - _dataTable.Columns.Add("Speed", typeof (int)); + _dataTable.Columns.Add("Speed", typeof(int)); _speedSeries.XValueMember = "Timestamp"; _speedSeries.YValueMembers = "Speed"; // might be empty - _dataTable.Columns.Add("Package Loss", typeof (int)); - _dataTable.Columns.Add("Ping", typeof (int)); + _dataTable.Columns.Add("Package Loss", typeof(int)); + _dataTable.Columns.Add("Ping", typeof(int)); _packageLossSeries.XValueMember = "Timestamp"; _packageLossSeries.YValueMembers = "Package Loss"; _pingSeries.XValueMember = "Timestamp"; @@ -127,8 +147,8 @@ namespace Shadowsocks.View { dataGroup.First().Timestamp, Speed = dataGroup.Max(data => data.MaxInboundSpeed) ?? 0, - Ping = (int) (dataGroup.Average(data => data.AverageResponse) ?? 0), - PackageLossPercentage = (int) (dataGroup.Average(data => data.PackageLoss) ?? 0) * 100 + Ping = (int)(dataGroup.Average(data => data.AverageResponse) ?? 0), + PackageLossPercentage = (int)(dataGroup.Average(data => data.PackageLoss) ?? 0) * 100 }; foreach (var data in finalData.Where(data => data.Speed != 0 || data.PackageLossPercentage != 0 || data.Ping != 0)) {