From b64e13cc0633ccdab3313827f2fa69a7ca859277 Mon Sep 17 00:00:00 2001 From: yyq-404 Date: Mon, 28 Oct 2019 13:05:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0SS=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2rayN/Forms/AddServer3Form.Designer.cs | 3 +- v2rayN/v2rayN/Forms/AddServer3Form.resx | 190 ++++++++++-------- .../v2rayN/Forms/AddServer3Form.zh-Hans.resx | 15 +- 3 files changed, 118 insertions(+), 90 deletions(-) diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs b/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs index 3515e6b9..6b399cfb 100644 --- a/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs +++ b/v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs @@ -174,6 +174,7 @@ // this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuItemImportClipboard}); + this.MenuItem1.Image = global::v2rayN.Properties.Resources.option; this.MenuItem1.Name = "MenuItem1"; resources.ApplyResources(this.MenuItem1, "MenuItem1"); // @@ -212,7 +213,6 @@ private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Button btnOK; private System.Windows.Forms.TextBox txtRemarks; - private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox txtId; private System.Windows.Forms.Label label3; @@ -227,5 +227,6 @@ private System.Windows.Forms.MenuStrip menuServer; private System.Windows.Forms.ToolStripMenuItem MenuItem1; private System.Windows.Forms.ToolStripMenuItem menuItemImportClipboard; + private System.Windows.Forms.Label label6; } } \ No newline at end of file diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.resx b/v2rayN/v2rayN/Forms/AddServer3Form.resx index f2f23bba..83b59a50 100644 --- a/v2rayN/v2rayN/Forms/AddServer3Form.resx +++ b/v2rayN/v2rayN/Forms/AddServer3Form.resx @@ -119,7 +119,7 @@ - 396, 17 + 460, 6 75, 23 @@ -147,10 +147,10 @@ True - 337, 158 + 96, 111 - 113, 12 + 101, 17 22 @@ -195,10 +195,10 @@ chacha20-ietf-poly1305 - 127, 120 + 380, 49 - 194, 20 + 152, 25 6 @@ -216,10 +216,10 @@ 1 - 127, 154 + 99, 85 - 194, 21 + 194, 23 11 @@ -236,20 +236,24 @@ 2 - - True + + + Right - 12, 158 + 6, 90 - 95, 12 + 73, 18 10 - Alias (remarks) + Alias + + + BottomRight label6 @@ -263,14 +267,14 @@ 3 - - True + + Right - 12, 124 + 305, 57 - 65, 12 + 69, 17 8 @@ -278,6 +282,9 @@ Encryption + + BottomRight + label5 @@ -291,13 +298,13 @@ 4 - 127, 85 + 99, 49 * - 278, 21 + 194, 23 5 @@ -314,14 +321,17 @@ 5 - - True + + Right + + + NoControl - 12, 89 + 6, 56 - 53, 12 + 73, 18 4 @@ -329,6 +339,9 @@ Password + + BottomRight + label3 @@ -342,10 +355,10 @@ 6 - 127, 56 + 380, 14 - 194, 21 + 152, 23 3 @@ -362,20 +375,23 @@ 7 - - True + + Right - 12, 60 + 323, 19 - 71, 12 + 51, 18 2 - Server port + port + + + BottomRight label2 @@ -390,10 +406,10 @@ 8 - 127, 27 + 99, 14 - 359, 21 + 194, 23 1 @@ -410,14 +426,17 @@ 9 - - True + + Right + + + NoControl - 12, 31 + 6, 19 - 89, 12 + 76, 18 0 @@ -425,6 +444,9 @@ Server address + + BottomRight + label1 @@ -437,22 +459,18 @@ 10 - - - Fill + + 微软雅黑, 9pt 0, 35 - 547, 196 + 547, 147 3 - - Server - groupBox1 @@ -465,8 +483,44 @@ 0 + + btnOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel2 + + + 1 + + + 微软雅黑, 9pt + + + 0, 188 + + + 547, 39 + + + 7 + + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + - 303, 17 + 379, 6 75, 23 @@ -489,30 +543,6 @@ 1 - - Bottom - - - 0, 231 - - - 547, 60 - - - 7 - - - panel2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - Top @@ -540,18 +570,6 @@ 17, 17 - - 235, 22 - - - Import URL from clipboard - - - 162, 21 - - - Import configuration file - 0, 0 @@ -573,6 +591,18 @@ 3 + + 178, 21 + + + Import configuration file + + + 235, 22 + + + Import URL from clipboard + True @@ -580,7 +610,7 @@ 6, 12 - 547, 291 + 547, 227 Edit or add a [Shadowsocks] server diff --git a/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx b/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx index 2a5968ca..4d281c11 100644 --- a/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx +++ b/v2rayN/v2rayN/Forms/AddServer3Form.zh-Hans.resx @@ -121,25 +121,22 @@ 取消(&C) - *手填,方便识别管理 + *备注,便于管理 - 别名(remarks) + 别名: - 加密方式 + 加密方式: - 密码 + 密码: - 服务器端口 + 端口: - 服务器地址 - - - 服务器 + IP地址: 确定(&O)