From db626dac428430311f8f81b812a0a4f3db05462d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=B4=E5=A8=83=E9=85=B1?= Date: Sat, 17 Sep 2016 19:19:38 +0800 Subject: [PATCH 1/3] set AutoScaleMode is DPI --- shadowsocks-csharp/View/HotkeySettingsForm.designer.cs | 4 ++-- shadowsocks-csharp/View/LogForm.Designer.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs b/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs index 5367fc88..6f374a33 100644 --- a/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs +++ b/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs @@ -312,8 +312,8 @@ // // HotkeySettingsForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 19F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(475, 271); this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); diff --git a/shadowsocks-csharp/View/LogForm.Designer.cs b/shadowsocks-csharp/View/LogForm.Designer.cs index 2f9a4942..ec0b02ee 100644 --- a/shadowsocks-csharp/View/LogForm.Designer.cs +++ b/shadowsocks-csharp/View/LogForm.Designer.cs @@ -290,8 +290,8 @@ // // LogForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ClientSize = new System.Drawing.Size(384, 161); this.Controls.Add(this.tableLayoutPanel1); this.Menu = this.MainMenu; From d284cd04e88b095532a3a8e875d0f68b20859789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=B4=E5=A8=83=E9=85=B1?= Date: Sat, 17 Sep 2016 20:01:08 +0800 Subject: [PATCH 2/3] Set the newline mode to CRLF --- shadowsocks-csharp/Data/cn.txt | 262 ++++++++++++++++++++--------------------- 1 file changed, 131 insertions(+), 131 deletions(-) diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/cn.txt index 001490ce..3823429e 100644 --- a/shadowsocks-csharp/Data/cn.txt +++ b/shadowsocks-csharp/Data/cn.txt @@ -1,132 +1,132 @@ -# translation for Simplified Chinese - -Shadowsocks=Shadowsocks - -# Menu items - -Enable System Proxy=启用系统代理 -Mode=系统代理模式 -PAC=PAC 模式 -Global=全局模式 -Servers=服务器 -Edit Servers...=编辑服务器... -Statistics Config...=统计配置... -Start on Boot=开机启动 -SOCKS5 Proxy...=SOCKS5代理设置... -Allow Clients from LAN=允许来自局域网的连接 -Local PAC=使用本地 PAC -Online PAC=使用在线 PAC -Edit Local PAC File...=编辑本地 PAC 文件... -Update Local PAC from GFWList=从 GFWList 更新本地 PAC -Edit User Rule for GFWList...=编辑 GFWList 的用户规则... -Show QRCode...=显示二维码... -Scan QRCode from Screen...=扫描屏幕上的二维码... -Availability Statistics=统计可用性 -Show Logs...=显示日志... -Verbose Logging=详细记录日志 -Updates...=更新... -Check for Updates...=检查更新 -Check for Updates at Startup=启动时检查更新 -Edit Hotkeys...=编辑快捷键... -About...=关于... -Quit=退出 -Edit Servers=编辑服务器 -Load Balance=负载均衡 -High Availability=高可用 -Choose by statistics=根据统计 - -# Config Form - -&Add=添加(&A) -&Delete=删除(&D) -Server=服务器 -Server Addr=服务器地址 -Server Port=服务器端口 -Password=密码 -Encryption=加密 -Proxy Port=代理端口 -Remarks=备注 -Onetime Authentication=一次性认证 -OK=确定 -Cancel=取消 -New server=未配置的服务器 -Move &Up=上移(&U) -Move D&own=下移(&O) - -# Proxy Form - -Edit Proxy=代理设置 -Use Proxy=使用代理 -Proxy Addr=代理地址 -Proxy Port=代理端口 - -# Log Form - -&File=文件(&F) -&Open Location=在资源管理器中打开(&O) -E&xit=退出(&X) -&View=视图(&V) -&Clean Logs=清空日志(&C) -Change &Font=设置字体(&F) -&Wrap Text=自动换行(&W) -&Top Most=置顶(&T) -&Show Toolbar=显示工具栏(&S) -Log Viewer=日志查看器 -Inbound=入站 -Outbound=出站 - -# QRCode Form - -QRCode=二维码 - -# PAC Url Form - -Edit Online PAC URL=编辑在线 PAC 网址 -Edit Online PAC URL...=编辑在线 PAC 网址... -Please input PAC Url=请输入 PAC 网址 - +# translation for Simplified Chinese + +Shadowsocks=Shadowsocks + +# Menu items + +Enable System Proxy=启用系统代理 +Mode=系统代理模式 +PAC=PAC 模式 +Global=全局模式 +Servers=服务器 +Edit Servers...=编辑服务器... +Statistics Config...=统计配置... +Start on Boot=开机启动 +SOCKS5 Proxy...=SOCKS5代理设置... +Allow Clients from LAN=允许来自局域网的连接 +Local PAC=使用本地 PAC +Online PAC=使用在线 PAC +Edit Local PAC File...=编辑本地 PAC 文件... +Update Local PAC from GFWList=从 GFWList 更新本地 PAC +Edit User Rule for GFWList...=编辑 GFWList 的用户规则... +Show QRCode...=显示二维码... +Scan QRCode from Screen...=扫描屏幕上的二维码... +Availability Statistics=统计可用性 +Show Logs...=显示日志... +Verbose Logging=详细记录日志 +Updates...=更新... +Check for Updates...=检查更新 +Check for Updates at Startup=启动时检查更新 +Edit Hotkeys...=编辑快捷键... +About...=关于... +Quit=退出 +Edit Servers=编辑服务器 +Load Balance=负载均衡 +High Availability=高可用 +Choose by statistics=根据统计 + +# Config Form + +&Add=添加(&A) +&Delete=删除(&D) +Server=服务器 +Server Addr=服务器地址 +Server Port=服务器端口 +Password=密码 +Encryption=加密 +Proxy Port=代理端口 +Remarks=备注 +Onetime Authentication=一次性认证 +OK=确定 +Cancel=取消 +New server=未配置的服务器 +Move &Up=上移(&U) +Move D&own=下移(&O) + +# Proxy Form + +Edit Proxy=代理设置 +Use Proxy=使用代理 +Proxy Addr=代理地址 +Proxy Port=代理端口 + +# Log Form + +&File=文件(&F) +&Open Location=在资源管理器中打开(&O) +E&xit=退出(&X) +&View=视图(&V) +&Clean Logs=清空日志(&C) +Change &Font=设置字体(&F) +&Wrap Text=自动换行(&W) +&Top Most=置顶(&T) +&Show Toolbar=显示工具栏(&S) +Log Viewer=日志查看器 +Inbound=入站 +Outbound=出站 + +# QRCode Form + +QRCode=二维码 + +# PAC Url Form + +Edit Online PAC URL=编辑在线 PAC 网址 +Edit Online PAC URL...=编辑在线 PAC 网址... +Please input PAC Url=请输入 PAC 网址 + # HotkeySettings Form - -Switch system proxy=切换系统代理状态 -Switch to PAC mode=切换到PAC模式 -Switch to Global mode=切换到全局模式 -Switch share over LAN=切换局域网共享 -Show Logs=显示日志 -Switch to prev server=切换上个服务器 -Switch to next server=切换下个服务器 -Reg All=注册全部热键 - -# Messages - -Shadowsocks Error: {0}=Shadowsocks 错误: {0} -Port already in use=端口已被占用 -Illegal port number format=非法端口格式 -Please add at least one server=请添加至少一个服务器 -Server IP can not be blank=服务器 IP 不能为空 -Password can not be blank=密码不能为空 -Port out of range=端口超出范围 -Port can't be 8123=端口不能为 8123 -Shadowsocks {0} Update Found=Shadowsocks {0} 更新 -No update is available=没有可用的更新 -Click here to update=点击这里升级 -Shadowsocks is here=Shadowsocks 在这里 -You can turn on/off Shadowsocks in the context menu=可以在右键菜单中开关 Shadowsocks -System Proxy Enabled=系统代理已启用 -System Proxy Disabled=系统代理未启用 -Failed to update PAC file =更新 PAC 文件失败 -PAC updated=更新 PAC 成功 -No updates found. Please report to GFWList if you have problems with it.=未发现更新。如有问题请提交给 GFWList。 -No QRCode found. Try to zoom in or move it to the center of the screen.=未发现二维码，尝试把它放大或移动到靠近屏幕中间的位置 -Shadowsocks is already running.=Shadowsocks 已经在运行。 -Find Shadowsocks icon in your notify tray.=请在任务栏里寻找 Shadowsocks 图标。 -If you want to start multiple Shadowsocks, make a copy in another directory.=如果想同时启动多个，可以另外复制一份到别的目录。 -Failed to decode QRCode=无法解析二维码 -Failed to update registry=无法修改注册表 -System Proxy On: =系统代理已启用： -Running: Port {0}=正在运行：端口 {0} -Unexpected error, shadowsocks will exit. Please report to=非预期错误，Shadowsocks将退出。请提交此错误到 -Unsupported operating system, use Windows Vista at least.=不支持的操作系统版本，最低需求为Windows Vista。 -Proxy request failed=代理请求失败 -Proxy handshake failed=代理握手失败 -Register hotkey failed=注册热键失败 -Cannot parse hotkey: {0}=解析热键失败: {0} + +Switch system proxy=切换系统代理状态 +Switch to PAC mode=切换到PAC模式 +Switch to Global mode=切换到全局模式 +Switch share over LAN=切换局域网共享 +Show Logs=显示日志 +Switch to prev server=切换上个服务器 +Switch to next server=切换下个服务器 +Reg All=注册全部热键 + +# Messages + +Shadowsocks Error: {0}=Shadowsocks 错误: {0} +Port already in use=端口已被占用 +Illegal port number format=非法端口格式 +Please add at least one server=请添加至少一个服务器 +Server IP can not be blank=服务器 IP 不能为空 +Password can not be blank=密码不能为空 +Port out of range=端口超出范围 +Port can't be 8123=端口不能为 8123 +Shadowsocks {0} Update Found=Shadowsocks {0} 更新 +No update is available=没有可用的更新 +Click here to update=点击这里升级 +Shadowsocks is here=Shadowsocks 在这里 +You can turn on/off Shadowsocks in the context menu=可以在右键菜单中开关 Shadowsocks +System Proxy Enabled=系统代理已启用 +System Proxy Disabled=系统代理未启用 +Failed to update PAC file =更新 PAC 文件失败 +PAC updated=更新 PAC 成功 +No updates found. Please report to GFWList if you have problems with it.=未发现更新。如有问题请提交给 GFWList。 +No QRCode found. Try to zoom in or move it to the center of the screen.=未发现二维码，尝试把它放大或移动到靠近屏幕中间的位置 +Shadowsocks is already running.=Shadowsocks 已经在运行。 +Find Shadowsocks icon in your notify tray.=请在任务栏里寻找 Shadowsocks 图标。 +If you want to start multiple Shadowsocks, make a copy in another directory.=如果想同时启动多个，可以另外复制一份到别的目录。 +Failed to decode QRCode=无法解析二维码 +Failed to update registry=无法修改注册表 +System Proxy On: =系统代理已启用： +Running: Port {0}=正在运行：端口 {0} +Unexpected error, shadowsocks will exit. Please report to=非预期错误，Shadowsocks将退出。请提交此错误到 +Unsupported operating system, use Windows Vista at least.=不支持的操作系统版本，最低需求为Windows Vista。 +Proxy request failed=代理请求失败 +Proxy handshake failed=代理握手失败 +Register hotkey failed=注册热键失败 +Cannot parse hotkey: {0}=解析热键失败: {0} From fabe270813b611993639d9c2df255748c1e067a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=B4=E5=A8=83=E9=85=B1?= Date: Sat, 17 Sep 2016 20:22:29 +0800 Subject: [PATCH 3/3] Resize the button --- shadowsocks-csharp/View/HotkeySettingsForm.designer.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs b/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs index 6f374a33..b2b854f7 100644 --- a/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs +++ b/shadowsocks-csharp/View/HotkeySettingsForm.designer.cs @@ -70,9 +70,9 @@ // btnOK // this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; - this.btnOK.Location = new System.Drawing.Point(381, 10); + this.btnOK.Location = new System.Drawing.Point(333, 10); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(75, 31); + this.btnOK.Size = new System.Drawing.Size(123, 31); this.btnOK.TabIndex = 0; this.btnOK.Text = "OK"; this.btnOK.UseVisualStyleBackColor = true; @@ -81,9 +81,9 @@ // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(300, 10); + this.btnCancel.Location = new System.Drawing.Point(204, 10); this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(75, 31); + this.btnCancel.Size = new System.Drawing.Size(123, 31); this.btnCancel.TabIndex = 1; this.btnCancel.Text = "Cancel"; this.btnCancel.UseVisualStyleBackColor = true; @@ -92,9 +92,9 @@ // btnRegisterAll // this.btnRegisterAll.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnRegisterAll.Location = new System.Drawing.Point(219, 10); + this.btnRegisterAll.Location = new System.Drawing.Point(75, 10); this.btnRegisterAll.Name = "btnRegisterAll"; - this.btnRegisterAll.Size = new System.Drawing.Size(75, 31); + this.btnRegisterAll.Size = new System.Drawing.Size(123, 31); this.btnRegisterAll.TabIndex = 2; this.btnRegisterAll.Text = "Reg All"; this.btnRegisterAll.UseVisualStyleBackColor = true;