update to 5.0.5

shadowsocks-csharp.sln

@@ -1,38 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shadowsocks-csharp", "shadowsocks-csharp\shadowsocks-csharp.csproj", "{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "test\test.csproj", "{45913187-0685-4903-B250-DCEF0479CD86}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637} = {0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062} = {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}
 		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835} = {DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shadowsocks-csharp4.0", "shadowsocks-csharp\shadowsocks-csharp4.0.csproj", "{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062} = {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}
 		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835} = {DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shadowsocks-csharp-console", "shadowsocks-csharp\shadowsocks-csharp-console.csproj", "{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062} = {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|Any CPU.Build.0 = Release|Any CPU
 		{45913187-0685-4903-B250-DCEF0479CD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45913187-0685-4903-B250-DCEF0479CD86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45913187-0685-4903-B250-DCEF0479CD86}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,4 +38,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D7B951DD-1516-479D-A5FA-46E3969EE2E2}
+	EndGlobalSection
 EndGlobal

shadowsocks-csharp/Controller/UpdateChecker.cs

@@ -21,10 +21,8 @@ public class UpdateChecker
 
         public const string Name = "ShadowsocksR";
         public const string Copyright = "Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy";
-        public const string Version = "5.0.4";
-#if !_DOTNET_4_0
-        public const string NetVer = "2.0";
-#elif !_CONSOLE
+        public const string Version = "5.0.3";
+#if !_CONSOLE
         public const string NetVer = "4.0";
 #else
         public const string NetVer = "";
@@ -65,6 +63,7 @@ public void CheckUpdate(Configuration config)
                     http.Proxy = null;
                 }
                 //UseProxy = !UseProxy;
+
                 http.DownloadStringCompleted += http_DownloadStringCompleted;
                 http.DownloadStringAsync(new Uri(UpdateURL + "?rnd=" + Util.Utils.RandUInt32().ToString()));
             }

shadowsocks-csharp/Data/cn.txt

@@ -17,7 +17,9 @@ User custom=用户自定义
 Disable bypass=全局
 Servers=服务器
 Edit servers...=编辑服务器...
-Import servers from file...=从文件导入服务器...
+Import servers from file...=从文件导入...
+Import from clipboard SSR links...=从剪贴板SSR链接导入...
+Import from screen QRCode...=从屏幕二维码导入...
 Servers Subscribe=服务器订阅
 Subscribe setting...=SSR服务器订阅设置...
 Update subscribe SSR node=更新SSR服务器订阅
@@ -37,8 +39,6 @@ Copy PAC URL=复制 PAC URL
 Edit local PAC file...=编辑本地 PAC 文件...
 Edit user rule for GFWList...=编辑 GFWList 的用户规则...
 Show QRCode...=显示二维码...
-Scan QRCode from screen...=二维码扫描...
-Import SSR links from clipboard...=剪贴板批量导入ssr://链接...
 Port settings...=端口设置...
 Server statistic...=服务器连接统计...
 Disconnect current=断开当前所有连接
@@ -182,6 +182,10 @@ Parse gui-config.json error, maybe require password to decrypt=解析 gui-config
 # ResetPassword Form
 
 ResetPassword=重置密码
+This password is use to encrypt local SSR data.=本密码用于加密SSR本地数据
+Old Password=旧密码
+New Password=新密码
+Confirm Password=确认密码
 
 # PortSettingsForm Form
 
@@ -195,9 +199,9 @@ Local Port=本地端口
 Port Forward=端口转发
 Force Proxy=强制代理
 Proxy With Rule=规则代理
-#Enable=
-#Remarks=
-#OK=
+#Enable=启用
+#Remarks=备注
+#OK=确定
 #Cancel=
 #&Add=
 #&Delete=

shadowsocks-csharp/Data/zh-tw.txt

@@ -17,7 +17,9 @@ User custom=用戶自定義
 Disable bypass=全局
 Servers=伺服器
 Edit servers...=編輯伺服器...
-Import servers from file...=從文件導入伺服器...
+Import servers from file...=從文件導入...
+Import from clipboard SSR links...=从剪貼板SSR連結導入...
+Import from screen QRCode...=从熒幕 QR 碼導入...
 Servers Subscribe=伺服器訂閱
 Subscribe setting...=SSR伺服器訂閱設置...
 Update subscribe SSR node=更新SSR伺服器訂閱
@@ -37,8 +39,6 @@ Copy PAC URL=複製 PAC URL
 Edit local PAC file...=編輯本地 PAC 文件...
 Edit user rule for GFWList...=編輯 GFWList 的用戶規則...
 Show QRCode...=顯示 QR 碼...
-Scan QRCode from screen...=QR 碼掃描...
-Copy address from clipboard...=剪貼板批量導入ssr://連結...
 Port settings...=連接埠設置...
 Server statistic...=伺服器連接統計...
 Disconnect current=斷開當前所有連接
@@ -170,6 +170,10 @@ Parse gui-config.json error, maybe require password to decrypt=解析 gui-config
 # ResetPassword Form
 
 ResetPassword=重設密碼
+This password is use to encrypt local SSR data.=本密碼用於加密 SSR 本地數據
+Old Password=舊密碼
+New Password=新密碼
+Confirm Password=確認密碼
 
 # PortSettingsForm Form
 

shadowsocks-csharp/Program.cs

@@ -1,13 +1,12 @@
 using Shadowsocks.Controller;
 using Shadowsocks.Util;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
 using Microsoft.Win32;
 using Shadowsocks.Model;
+using System.Net;
 #if !_CONSOLE
 using Shadowsocks.View;
 #endif
@@ -40,7 +39,8 @@ static void Main(string[] args)
                 }
             }
 
-            if (Utils.isVirusExist()){
+            if (Utils.isVirusExist())
+            {
                 return;
             }
 
@@ -87,8 +87,8 @@ static void Main(string[] args)
 
 #if _DOTNET_4_0
                 // Enable Modern TLS when .NET 4.5+ installed.
-                if (Util.EnvCheck.CheckDotNet45())
-                    ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
+                if (EnvCheck.CheckDotNet45())
+                ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
 #endif
 #if !_CONSOLE
                 _viewController = new MenuViewController(_controller);