Browse Source

Optimal description (#1924)

* Update LogForm.cs
* Update ja.txt
* Update zh_CN.txt
* Update zh_TW.txt
* Update the control name
tags/4.1.0
Chen Shaoju Allen Zhu 7 years ago
parent
commit
21ecdc6425
6 changed files with 31 additions and 31 deletions
  1. +1
    -1
      shadowsocks-csharp/Data/ja.txt
  2. +2
    -2
      shadowsocks-csharp/Data/zh_CN.txt
  3. +1
    -1
      shadowsocks-csharp/Data/zh_TW.txt
  4. +19
    -19
      shadowsocks-csharp/View/LogForm.Designer.cs
  5. +7
    -7
      shadowsocks-csharp/View/LogForm.cs
  6. +1
    -1
      shadowsocks-csharp/View/LogForm.resx

+ 1
- 1
shadowsocks-csharp/Data/ja.txt View File

@@ -80,7 +80,7 @@ If server has a plugin, proxy will not be used=サーバーにプラグインが
&Open Location=ファイルの場所を開く (&O) &Open Location=ファイルの場所を開く (&O)
E&xit=終了 (&X) E&xit=終了 (&X)
&View=表示 (&V) &View=表示 (&V)
&Clean Logs=ログの削除 (&C)
&Clear Logs=ログの削除 (&C)
Change &Font=フォント (&F) Change &Font=フォント (&F)
&Wrap Text=右端で折り返す (&W) &Wrap Text=右端で折り返す (&W)
&Top Most=常に最前面に表示 (&T) &Top Most=常に最前面に表示 (&T)


+ 2
- 2
shadowsocks-csharp/Data/zh_CN.txt View File

@@ -80,7 +80,7 @@ If server has a plugin, proxy will not be used=若服务器含有插件,代理
&Open Location=在资源管理器中打开(&O) &Open Location=在资源管理器中打开(&O)
E&xit=退出(&X) E&xit=退出(&X)
&View=视图(&V) &View=视图(&V)
&Clean Logs=清空日志(&C)
&Clear Logs=清空日志(&C)
Change &Font=设置字体(&F) Change &Font=设置字体(&F)
&Wrap Text=自动换行(&W) &Wrap Text=自动换行(&W)
&Top Most=置顶(&T) &Top Most=置顶(&T)
@@ -146,4 +146,4 @@ Proxy request failed=代理请求失败
Proxy handshake failed=代理握手失败 Proxy handshake failed=代理握手失败
Register hotkey failed=注册热键失败 Register hotkey failed=注册热键失败
Cannot parse hotkey: {0}=解析热键失败: {0} Cannot parse hotkey: {0}=解析热键失败: {0}
Timeout is invalid, it should not exceed {0}=超时无效,不应超过 {0}
Timeout is invalid, it should not exceed {0}=超时无效,不应超过 {0}

+ 1
- 1
shadowsocks-csharp/Data/zh_TW.txt View File

@@ -80,7 +80,7 @@ If server has a plugin, proxy will not be used=若伺服器含有外掛程式,
&Open Location=在檔案總管中開啟 (&O) &Open Location=在檔案總管中開啟 (&O)
E&xit=結束 (&X) E&xit=結束 (&X)
&View=檢視 (&V) &View=檢視 (&V)
&Clean Logs=清除記錄檔 (&C)
&Clear Logs=清除記錄檔 (&C)
Change &Font=變更字型 (&F) Change &Font=變更字型 (&F)
&Wrap Text=自動換行 (&W) &Wrap Text=自動換行 (&W)
&Top Most=置頂 (&T) &Top Most=置頂 (&T)


+ 19
- 19
shadowsocks-csharp/View/LogForm.Designer.cs View File

@@ -39,7 +39,7 @@
this.OpenLocationMenuItem = new System.Windows.Forms.MenuItem(); this.OpenLocationMenuItem = new System.Windows.Forms.MenuItem();
this.ExitMenuItem = new System.Windows.Forms.MenuItem(); this.ExitMenuItem = new System.Windows.Forms.MenuItem();
this.ViewMenuItem = new System.Windows.Forms.MenuItem(); this.ViewMenuItem = new System.Windows.Forms.MenuItem();
this.CleanLogsMenuItem = new System.Windows.Forms.MenuItem();
this.ClearLogsMenuItem = new System.Windows.Forms.MenuItem();
this.ChangeFontMenuItem = new System.Windows.Forms.MenuItem(); this.ChangeFontMenuItem = new System.Windows.Forms.MenuItem();
this.WrapTextMenuItem = new System.Windows.Forms.MenuItem(); this.WrapTextMenuItem = new System.Windows.Forms.MenuItem();
this.TopMostMenuItem = new System.Windows.Forms.MenuItem(); this.TopMostMenuItem = new System.Windows.Forms.MenuItem();
@@ -47,7 +47,7 @@
this.ShowToolbarMenuItem = new System.Windows.Forms.MenuItem(); this.ShowToolbarMenuItem = new System.Windows.Forms.MenuItem();
this.TopMostCheckBox = new System.Windows.Forms.CheckBox(); this.TopMostCheckBox = new System.Windows.Forms.CheckBox();
this.ChangeFontButton = new System.Windows.Forms.Button(); this.ChangeFontButton = new System.Windows.Forms.Button();
this.CleanLogsButton = new System.Windows.Forms.Button();
this.ClearLogsButton = new System.Windows.Forms.Button();
this.WrapTextCheckBox = new System.Windows.Forms.CheckBox(); this.WrapTextCheckBox = new System.Windows.Forms.CheckBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.ToolbarFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel(); this.ToolbarFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
@@ -107,7 +107,7 @@
// //
this.ViewMenuItem.Index = 1; this.ViewMenuItem.Index = 1;
this.ViewMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] { this.ViewMenuItem.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
this.CleanLogsMenuItem,
this.ClearLogsMenuItem,
this.ChangeFontMenuItem, this.ChangeFontMenuItem,
this.WrapTextMenuItem, this.WrapTextMenuItem,
this.TopMostMenuItem, this.TopMostMenuItem,
@@ -115,11 +115,11 @@
this.ShowToolbarMenuItem}); this.ShowToolbarMenuItem});
this.ViewMenuItem.Text = "&View"; this.ViewMenuItem.Text = "&View";
// //
// CleanLogsMenuItem
// ClearLogsMenuItem
// //
this.CleanLogsMenuItem.Index = 0;
this.CleanLogsMenuItem.Text = "&Clean Logs";
this.CleanLogsMenuItem.Click += new System.EventHandler(this.CleanLogsMenuItem_Click);
this.ClearLogsMenuItem.Index = 0;
this.ClearLogsMenuItem.Text = "&Clear Logs";
this.ClearLogsMenuItem.Click += new System.EventHandler(this.ClearLogsMenuItem_Click);
// //
// ChangeFontMenuItem // ChangeFontMenuItem
// //
@@ -174,16 +174,16 @@
this.ChangeFontButton.UseVisualStyleBackColor = true; this.ChangeFontButton.UseVisualStyleBackColor = true;
this.ChangeFontButton.Click += new System.EventHandler(this.ChangeFontButton_Click); this.ChangeFontButton.Click += new System.EventHandler(this.ChangeFontButton_Click);
// //
// CleanLogsButton
// ClearLogsButton
// //
this.CleanLogsButton.AutoSize = true;
this.CleanLogsButton.Location = new System.Drawing.Point(3, 3);
this.CleanLogsButton.Name = "CleanLogsButton";
this.CleanLogsButton.Size = new System.Drawing.Size(75, 23);
this.CleanLogsButton.TabIndex = 1;
this.CleanLogsButton.Text = "&Clean Logs";
this.CleanLogsButton.UseVisualStyleBackColor = true;
this.CleanLogsButton.Click += new System.EventHandler(this.CleanLogsButton_Click);
this.ClearLogsButton.AutoSize = true;
this.ClearLogsButton.Location = new System.Drawing.Point(3, 3);
this.ClearLogsButton.Name = "ClearLogsButton";
this.ClearLogsButton.Size = new System.Drawing.Size(75, 23);
this.ClearLogsButton.TabIndex = 1;
this.ClearLogsButton.Text = "&Clear Logs";
this.ClearLogsButton.UseVisualStyleBackColor = true;
this.ClearLogsButton.Click += new System.EventHandler(this.ClearLogsButton_Click);
// //
// WrapTextCheckBox // WrapTextCheckBox
// //
@@ -216,7 +216,7 @@
// ToolbarFlowLayoutPanel // ToolbarFlowLayoutPanel
// //
this.ToolbarFlowLayoutPanel.AutoSize = true; this.ToolbarFlowLayoutPanel.AutoSize = true;
this.ToolbarFlowLayoutPanel.Controls.Add(this.CleanLogsButton);
this.ToolbarFlowLayoutPanel.Controls.Add(this.ClearLogsButton);
this.ToolbarFlowLayoutPanel.Controls.Add(this.ChangeFontButton); this.ToolbarFlowLayoutPanel.Controls.Add(this.ChangeFontButton);
this.ToolbarFlowLayoutPanel.Controls.Add(this.WrapTextCheckBox); this.ToolbarFlowLayoutPanel.Controls.Add(this.WrapTextCheckBox);
this.ToolbarFlowLayoutPanel.Controls.Add(this.TopMostCheckBox); this.ToolbarFlowLayoutPanel.Controls.Add(this.TopMostCheckBox);
@@ -324,12 +324,12 @@
private System.Windows.Forms.MenuItem OpenLocationMenuItem; private System.Windows.Forms.MenuItem OpenLocationMenuItem;
private System.Windows.Forms.MenuItem ExitMenuItem; private System.Windows.Forms.MenuItem ExitMenuItem;
private System.Windows.Forms.CheckBox WrapTextCheckBox; private System.Windows.Forms.CheckBox WrapTextCheckBox;
private System.Windows.Forms.Button CleanLogsButton;
private System.Windows.Forms.Button ClearLogsButton;
private System.Windows.Forms.Button ChangeFontButton; private System.Windows.Forms.Button ChangeFontButton;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.CheckBox TopMostCheckBox; private System.Windows.Forms.CheckBox TopMostCheckBox;
private System.Windows.Forms.MenuItem ViewMenuItem; private System.Windows.Forms.MenuItem ViewMenuItem;
private System.Windows.Forms.MenuItem CleanLogsMenuItem;
private System.Windows.Forms.MenuItem ClearLogsMenuItem;
private System.Windows.Forms.MenuItem ChangeFontMenuItem; private System.Windows.Forms.MenuItem ChangeFontMenuItem;
private System.Windows.Forms.MenuItem WrapTextMenuItem; private System.Windows.Forms.MenuItem WrapTextMenuItem;
private System.Windows.Forms.MenuItem TopMostMenuItem; private System.Windows.Forms.MenuItem TopMostMenuItem;


+ 7
- 7
shadowsocks-csharp/View/LogForm.cs View File

@@ -148,12 +148,12 @@ namespace Shadowsocks.View
FileMenuItem.Text = I18N.GetString("&File"); FileMenuItem.Text = I18N.GetString("&File");
OpenLocationMenuItem.Text = I18N.GetString("&Open Location"); OpenLocationMenuItem.Text = I18N.GetString("&Open Location");
ExitMenuItem.Text = I18N.GetString("E&xit"); ExitMenuItem.Text = I18N.GetString("E&xit");
CleanLogsButton.Text = I18N.GetString("&Clean Logs");
ClearLogsButton.Text = I18N.GetString("&Clear Logs");
ChangeFontButton.Text = I18N.GetString("Change &Font"); ChangeFontButton.Text = I18N.GetString("Change &Font");
WrapTextCheckBox.Text = I18N.GetString("&Wrap Text"); WrapTextCheckBox.Text = I18N.GetString("&Wrap Text");
TopMostCheckBox.Text = I18N.GetString("&Top Most"); TopMostCheckBox.Text = I18N.GetString("&Top Most");
ViewMenuItem.Text = I18N.GetString("&View"); ViewMenuItem.Text = I18N.GetString("&View");
CleanLogsMenuItem.Text = I18N.GetString("&Clean Logs");
ClearLogsMenuItem.Text = I18N.GetString("&Clear Logs");
ChangeFontMenuItem.Text = I18N.GetString("Change &Font"); ChangeFontMenuItem.Text = I18N.GetString("Change &Font");
WrapTextMenuItem.Text = I18N.GetString("&Wrap Text"); WrapTextMenuItem.Text = I18N.GetString("&Wrap Text");
TopMostMenuItem.Text = I18N.GetString("&Top Most"); TopMostMenuItem.Text = I18N.GetString("&Top Most");
@@ -299,21 +299,21 @@ namespace Shadowsocks.View
} }
#region Clean up the content in LogMessageTextBox. #region Clean up the content in LogMessageTextBox.
private void DoCleanLogs()
private void DoClearLogs()
{ {
Logging.Clear(); Logging.Clear();
lastOffset = 0; lastOffset = 0;
LogMessageTextBox.Clear(); LogMessageTextBox.Clear();
} }
private void CleanLogsMenuItem_Click(object sender, EventArgs e)
private void ClearLogsMenuItem_Click(object sender, EventArgs e)
{ {
DoCleanLogs();
DoClearLogs();
} }
private void CleanLogsButton_Click(object sender, EventArgs e)
private void ClearLogsButton_Click(object sender, EventArgs e)
{ {
DoCleanLogs();
DoClearLogs();
} }
#endregion #endregion


+ 1
- 1
shadowsocks-csharp/View/LogForm.resx View File

@@ -129,7 +129,7 @@
<metadata name="ChangeFontButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="ChangeFontButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="CleanLogsButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="ClearLogsButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="WrapTextCheckBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="WrapTextCheckBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">


Loading…
Cancel
Save