diff --git a/shadowsocks-csharp/Data/ja.txt b/shadowsocks-csharp/Data/ja.txt index 702094bd..5e09609c 100644 --- a/shadowsocks-csharp/Data/ja.txt +++ b/shadowsocks-csharp/Data/ja.txt @@ -68,6 +68,7 @@ Use Proxy=プロキシを利用する Proxy Type=プロキシの種類 Proxy Addr=プロキシアドレス Proxy Port=プロキシポート +If server has a plugin, proxy will not be used=サーバーにプラグインがある場合、プロキシは利用されません # Log Form diff --git a/shadowsocks-csharp/Data/zh_CN.txt b/shadowsocks-csharp/Data/zh_CN.txt index 6b0ea8c9..10cba0e4 100644 --- a/shadowsocks-csharp/Data/zh_CN.txt +++ b/shadowsocks-csharp/Data/zh_CN.txt @@ -68,6 +68,7 @@ Use Proxy=使用代理 Proxy Type=代理类型 Proxy Addr=代理地址 Proxy Port=代理端口 +If server has a plugin, proxy will not be used=若服务器含有插件，代理将不被使用 # Log Form diff --git a/shadowsocks-csharp/Data/zh_TW.txt b/shadowsocks-csharp/Data/zh_TW.txt index 6368a1b6..aeac14f2 100644 --- a/shadowsocks-csharp/Data/zh_TW.txt +++ b/shadowsocks-csharp/Data/zh_TW.txt @@ -68,6 +68,7 @@ Use Proxy=使用 Proxy Proxy Type=Proxy 類型 Proxy Addr=Proxy 位址 Proxy Port=Proxy 連接埠 +If server has a plugin, proxy will not be used=若伺服器含有插件，Proxy 將不被使用 # Log Form diff --git a/shadowsocks-csharp/View/ProxyForm.Designer.cs b/shadowsocks-csharp/View/ProxyForm.Designer.cs index 74e780ef..c3138ff0 100644 --- a/shadowsocks-csharp/View/ProxyForm.Designer.cs +++ b/shadowsocks-csharp/View/ProxyForm.Designer.cs @@ -28,70 +28,27 @@ /// private void InitializeComponent() { - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.MyCancelButton = new System.Windows.Forms.Button(); this.OKButton = new System.Windows.Forms.Button(); this.UseProxyCheckBox = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.ProxyAddrLabel = new System.Windows.Forms.Label(); this.ProxyServerTextBox = new System.Windows.Forms.TextBox(); this.ProxyPortLabel = new System.Windows.Forms.Label(); this.ProxyPortTextBox = new System.Windows.Forms.TextBox(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.ProxyTypeLabel = new System.Windows.Forms.Label(); this.ProxyTypeComboBox = new System.Windows.Forms.ComboBox(); this.ProxyTimeoutTextBox = new System.Windows.Forms.TextBox(); this.ProxyTimeoutLabel = new System.Windows.Forms.Label(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.ProxyNotificationLabel = new System.Windows.Forms.Label(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.tableLayoutPanel1.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.AutoSize = true; - this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel3, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.UseProxyCheckBox, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel4, 0, 1); - this.tableLayoutPanel1.Location = new System.Drawing.Point(15, 15); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 4; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(395, 123); - this.tableLayoutPanel1.TabIndex = 0; - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.AutoSize = true; - this.tableLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel3.Controls.Add(this.MyCancelButton, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.OKButton, 0, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Right; - this.tableLayoutPanel3.Location = new System.Drawing.Point(236, 94); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.Size = new System.Drawing.Size(159, 26); - this.tableLayoutPanel3.TabIndex = 9; - // // MyCancelButton // this.MyCancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.MyCancelButton.Dock = System.Windows.Forms.DockStyle.Right; this.MyCancelButton.Location = new System.Drawing.Point(84, 3); this.MyCancelButton.Margin = new System.Windows.Forms.Padding(3, 3, 0, 0); this.MyCancelButton.Name = "MyCancelButton"; @@ -104,7 +61,6 @@ // OKButton // this.OKButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.OKButton.Dock = System.Windows.Forms.DockStyle.Right; this.OKButton.Location = new System.Drawing.Point(3, 3); this.OKButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0); this.OKButton.Name = "OKButton"; @@ -117,6 +73,7 @@ // UseProxyCheckBox // this.UseProxyCheckBox.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.UseProxyCheckBox, 2); this.UseProxyCheckBox.Location = new System.Drawing.Point(3, 3); this.UseProxyCheckBox.Name = "UseProxyCheckBox"; this.UseProxyCheckBox.Size = new System.Drawing.Size(78, 16); @@ -125,31 +82,11 @@ this.UseProxyCheckBox.UseVisualStyleBackColor = true; this.UseProxyCheckBox.CheckedChanged += new System.EventHandler(this.UseProxyCheckBox_CheckedChanged); // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.AutoSize = true; - this.tableLayoutPanel2.ColumnCount = 4; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel2.Controls.Add(this.ProxyAddrLabel, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.ProxyServerTextBox, 1, 0); - this.tableLayoutPanel2.Controls.Add(this.ProxyPortLabel, 2, 0); - this.tableLayoutPanel2.Controls.Add(this.ProxyPortTextBox, 3, 0); - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 61); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 1; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(389, 27); - this.tableLayoutPanel2.TabIndex = 1; - // // ProxyAddrLabel // this.ProxyAddrLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.ProxyAddrLabel.AutoSize = true; - this.ProxyAddrLabel.Location = new System.Drawing.Point(3, 7); + this.ProxyAddrLabel.Location = new System.Drawing.Point(3, 71); this.ProxyAddrLabel.Name = "ProxyAddrLabel"; this.ProxyAddrLabel.Size = new System.Drawing.Size(65, 12); this.ProxyAddrLabel.TabIndex = 0; @@ -158,10 +95,10 @@ // ProxyServerTextBox // this.ProxyServerTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.ProxyServerTextBox.Location = new System.Drawing.Point(74, 3); + this.ProxyServerTextBox.Location = new System.Drawing.Point(74, 67); this.ProxyServerTextBox.MaxLength = 512; this.ProxyServerTextBox.Name = "ProxyServerTextBox"; - this.ProxyServerTextBox.Size = new System.Drawing.Size(135, 21); + this.ProxyServerTextBox.Size = new System.Drawing.Size(142, 21); this.ProxyServerTextBox.TabIndex = 1; this.ProxyServerTextBox.WordWrap = false; // @@ -169,46 +106,27 @@ // this.ProxyPortLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.ProxyPortLabel.AutoSize = true; - this.ProxyPortLabel.Location = new System.Drawing.Point(215, 7); + this.ProxyPortLabel.Location = new System.Drawing.Point(222, 71); this.ProxyPortLabel.Name = "ProxyPortLabel"; - this.ProxyPortLabel.Size = new System.Drawing.Size(65, 12); + this.ProxyPortLabel.Size = new System.Drawing.Size(77, 12); this.ProxyPortLabel.TabIndex = 2; this.ProxyPortLabel.Text = "Proxy Port"; // // ProxyPortTextBox // this.ProxyPortTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.ProxyPortTextBox.Location = new System.Drawing.Point(286, 3); + this.ProxyPortTextBox.Location = new System.Drawing.Point(305, 67); this.ProxyPortTextBox.MaxLength = 10; this.ProxyPortTextBox.Name = "ProxyPortTextBox"; - this.ProxyPortTextBox.Size = new System.Drawing.Size(100, 21); + this.ProxyPortTextBox.Size = new System.Drawing.Size(58, 21); this.ProxyPortTextBox.TabIndex = 3; this.ProxyPortTextBox.WordWrap = false; // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.AutoSize = true; - this.tableLayoutPanel4.ColumnCount = 4; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel4.Controls.Add(this.ProxyTypeLabel, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.ProxyTypeComboBox, 1, 0); - this.tableLayoutPanel4.Controls.Add(this.ProxyTimeoutTextBox, 3, 0); - this.tableLayoutPanel4.Controls.Add(this.ProxyTimeoutLabel, 2, 0); - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 25); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 1; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.Size = new System.Drawing.Size(387, 30); - this.tableLayoutPanel4.TabIndex = 10; - // // ProxyTypeLabel // this.ProxyTypeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.ProxyTypeLabel.AutoSize = true; - this.ProxyTypeLabel.Location = new System.Drawing.Point(3, 9); + this.ProxyTypeLabel.Location = new System.Drawing.Point(3, 40); this.ProxyTypeLabel.Name = "ProxyTypeLabel"; this.ProxyTypeLabel.Size = new System.Drawing.Size(65, 12); this.ProxyTypeLabel.TabIndex = 1; @@ -222,30 +140,86 @@ this.ProxyTypeComboBox.Items.AddRange(new object[] { "SOCKS5", "HTTP"}); - this.ProxyTypeComboBox.Location = new System.Drawing.Point(74, 5); + this.ProxyTypeComboBox.Location = new System.Drawing.Point(74, 36); this.ProxyTypeComboBox.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.ProxyTypeComboBox.Name = "ProxyTypeComboBox"; - this.ProxyTypeComboBox.Size = new System.Drawing.Size(121, 20); + this.ProxyTypeComboBox.Size = new System.Drawing.Size(142, 20); this.ProxyTypeComboBox.TabIndex = 2; // // ProxyTimeoutTextBox // this.ProxyTimeoutTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.ProxyTimeoutTextBox.Location = new System.Drawing.Point(284, 4); + this.ProxyTimeoutTextBox.Location = new System.Drawing.Point(305, 36); this.ProxyTimeoutTextBox.Name = "ProxyTimeoutTextBox"; - this.ProxyTimeoutTextBox.Size = new System.Drawing.Size(100, 21); + this.ProxyTimeoutTextBox.Size = new System.Drawing.Size(58, 21); this.ProxyTimeoutTextBox.TabIndex = 3; // // ProxyTimeoutLabel // this.ProxyTimeoutLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.ProxyTimeoutLabel.AutoSize = true; - this.ProxyTimeoutLabel.Location = new System.Drawing.Point(201, 9); + this.ProxyTimeoutLabel.Location = new System.Drawing.Point(222, 40); this.ProxyTimeoutLabel.Name = "ProxyTimeoutLabel"; this.ProxyTimeoutLabel.Size = new System.Drawing.Size(77, 12); this.ProxyTimeoutLabel.TabIndex = 4; this.ProxyTimeoutLabel.Text = "Timeout(Sec)"; // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel1.ColumnCount = 4; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); + this.tableLayoutPanel1.Controls.Add(this.UseProxyCheckBox, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.ProxyTypeLabel, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.ProxyPortTextBox, 3, 2); + this.tableLayoutPanel1.Controls.Add(this.ProxyTypeComboBox, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.ProxyTimeoutLabel, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.ProxyPortLabel, 2, 2); + this.tableLayoutPanel1.Controls.Add(this.ProxyTimeoutTextBox, 3, 1); + this.tableLayoutPanel1.Controls.Add(this.ProxyServerTextBox, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.ProxyAddrLabel, 0, 2); + this.tableLayoutPanel1.Controls.Add(this.ProxyNotificationLabel, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 4); + this.tableLayoutPanel1.Location = new System.Drawing.Point(15, 15); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 5; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.95122F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.95122F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.95122F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 34.14634F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(366, 177); + this.tableLayoutPanel1.TabIndex = 14; + // + // ProxyNotificationLabel + // + this.ProxyNotificationLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.ProxyNotificationLabel.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.ProxyNotificationLabel, 4); + this.ProxyNotificationLabel.ForeColor = System.Drawing.Color.Red; + this.ProxyNotificationLabel.Location = new System.Drawing.Point(3, 111); + this.ProxyNotificationLabel.Name = "ProxyNotificationLabel"; + this.ProxyNotificationLabel.Size = new System.Drawing.Size(360, 12); + this.ProxyNotificationLabel.TabIndex = 5; + this.ProxyNotificationLabel.Text = "If server has a plugin, proxy will not be used"; + // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.AutoSize = true; + this.flowLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 4); + this.flowLayoutPanel1.Controls.Add(this.MyCancelButton); + this.flowLayoutPanel1.Controls.Add(this.OKButton); + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Right; + this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.flowLayoutPanel1.Location = new System.Drawing.Point(204, 145); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(159, 29); + this.flowLayoutPanel1.TabIndex = 6; + // // ProxyForm // this.AcceptButton = this.OKButton; @@ -254,7 +228,7 @@ this.AutoSize = true; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.CancelButton = this.MyCancelButton; - this.ClientSize = new System.Drawing.Size(441, 165); + this.ClientSize = new System.Drawing.Size(448, 231); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.MaximizeBox = false; @@ -266,32 +240,25 @@ this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.ProxyForm_FormClosed); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.tableLayoutPanel4.ResumeLayout(false); - this.tableLayoutPanel4.PerformLayout(); + this.flowLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private System.Windows.Forms.CheckBox UseProxyCheckBox; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.Label ProxyAddrLabel; private System.Windows.Forms.TextBox ProxyServerTextBox; private System.Windows.Forms.Label ProxyPortLabel; private System.Windows.Forms.TextBox ProxyPortTextBox; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3; private System.Windows.Forms.Button MyCancelButton; private System.Windows.Forms.Button OKButton; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.Label ProxyTypeLabel; private System.Windows.Forms.ComboBox ProxyTypeComboBox; private System.Windows.Forms.TextBox ProxyTimeoutTextBox; private System.Windows.Forms.Label ProxyTimeoutLabel; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label ProxyNotificationLabel; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; } } \ No newline at end of file diff --git a/shadowsocks-csharp/View/ProxyForm.cs b/shadowsocks-csharp/View/ProxyForm.cs index c178900a..2837477a 100644 --- a/shadowsocks-csharp/View/ProxyForm.cs +++ b/shadowsocks-csharp/View/ProxyForm.cs @@ -36,6 +36,7 @@ namespace Shadowsocks.View ProxyAddrLabel.Text = I18N.GetString("Proxy Addr"); ProxyPortLabel.Text = I18N.GetString("Proxy Port"); ProxyTimeoutLabel.Text = I18N.GetString("Timeout(Sec)"); + ProxyNotificationLabel.Text = I18N.GetString("If server has a plugin, proxy will not be used"); OKButton.Text = I18N.GetString("OK"); MyCancelButton.Text = I18N.GetString("Cancel"); this.Text = I18N.GetString("Edit Proxy");