diff --git a/shadowsocks-csharp/Controller/I18N.cs b/shadowsocks-csharp/Controller/I18N.cs
index a86788d7..45217b7a 100755
--- a/shadowsocks-csharp/Controller/I18N.cs
+++ b/shadowsocks-csharp/Controller/I18N.cs
@@ -35,12 +35,12 @@ namespace Shadowsocks.Controller
{
// choose Traditional Chinese only if we get explicit indication
Init(name.Contains("Traditional")
- ? Resources.zh_tw
- : Resources.cn);
+ ? Resources.zh_TW
+ : Resources.zh_CN);
}
else if (name.StartsWith("Japan", StringComparison.OrdinalIgnoreCase))
{
- Init(Resources.jp);
+ Init(Resources.ja);
}
}
diff --git a/shadowsocks-csharp/Data/jp.txt b/shadowsocks-csharp/Data/ja.txt
similarity index 100%
rename from shadowsocks-csharp/Data/jp.txt
rename to shadowsocks-csharp/Data/ja.txt
diff --git a/shadowsocks-csharp/Data/cn.txt b/shadowsocks-csharp/Data/zh-CN.txt
similarity index 100%
rename from shadowsocks-csharp/Data/cn.txt
rename to shadowsocks-csharp/Data/zh-CN.txt
diff --git a/shadowsocks-csharp/Data/zh_tw.txt b/shadowsocks-csharp/Data/zh-TW.txt
similarity index 100%
rename from shadowsocks-csharp/Data/zh_tw.txt
rename to shadowsocks-csharp/Data/zh-TW.txt
diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs
index 467865ce..ab946b69 100644
--- a/shadowsocks-csharp/Properties/Resources.Designer.cs
+++ b/shadowsocks-csharp/Properties/Resources.Designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
//
-// 此代码由工具生成。
-// 运行时版本:4.0.30319.42000
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
//
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@ namespace Shadowsocks.Properties {
///
- /// 一个强类型的资源类，用于查找本地化的字符串等。
+ /// A strongly-typed resource class, for looking up localized strings, etc.
///
- // 此类是由 StronglyTypedResourceBuilder
- // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
- // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
- // (以 /str 作为命令选项)，或重新生成 VS 项目。
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 返回此类使用的缓存的 ResourceManager 实例。
+ /// Returns the cached ResourceManager instance used by this class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Shadowsocks.Properties {
}
///
- /// 使用此强类型资源类，为所有资源查找
- /// 重写当前线程的 CurrentUICulture 属性。
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
///
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] abp_js {
get {
@@ -71,69 +71,37 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找类似 # translation for Simplified Chinese
+ /// Looks up a localized string similar to # translation for Japanese
///
///Shadowsocks=Shadowsocks
///
///# Menu items
///
- ///Enable System Proxy=启用系统代理
- ///Mode=系统代理模式
- ///PAC=PAC 模式
- ///Global=全局模式
- ///Servers=服务器
- ///Edit Servers...=编辑服务器...
- ///Statistics Config...=统计配置...
- ///Start on Boot=开机启动
- ///Forward Proxy...=正向代理设置...
- ///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 的用户规则...
- ///Secure Local PAC=保护本地 PAC
- ///Cop [字符串的其余部分被截断]"; 的本地化字符串。
- ///
- internal static string cn {
- get {
- return ResourceManager.GetString("cn", resourceCulture);
- }
- }
-
- ///
- /// 查找类似 # translation for Japanese
- ///
- ///Shadowsocks=Shadowsocks
- ///
- ///# Menu items
- ///
- ///Enable System Proxy=システムの代理を有効にする
- ///Mode=モード
- ///PAC=PAC
- ///Global=全般
- ///Servers=サーバ
- ///Edit Servers...=サーバーを編集する...
- ///Statistics Config...=統計情報の設定...
- ///Start on Boot=システムと同時に起動
- ///Forward Proxy...=代理を転送する...
- ///Allow Clients from LAN=LANからのクライアントを許可する
- ///Local PAC=ローカル PAC
- ///Online PAC=オンライン PAC
- ///Edit Local PAC File...=ローカル PAC ファイルを編集する...
- ///Update Local PAC from GFWList=GFWList から、ローカル PACを更新する
- ///Edit User Rule for GFWList...=利用者規則を編集する...
- ///Secure Local PAC=安全なローカル PAC
- ///Copy [字符串的其余部分被截断]"; 的本地化字符串。
+ ///Enable System Proxy=システムの代理を有効にする
+ ///Mode=モード
+ ///PAC=PAC
+ ///Global=全般
+ ///Servers=サーバ
+ ///Edit Servers...=サーバーを編集する...
+ ///Statistics Config...=統計情報の設定...
+ ///Start on Boot=システムと同時に起動
+ ///Forward Proxy...=代理を転送する...
+ ///Allow Clients from LAN=LANからのクライアントを許可する
+ ///Local PAC=ローカル PAC
+ ///Online PAC=オンライン PAC
+ ///Edit Local PAC File...=ローカル PAC ファイルを編集する...
+ ///Update Local PAC from GFWList=GFWList から、ローカル PACを更新する
+ ///Edit User Rule for GFWList...=利用者規則を編集する...
+ ///Secure Local [rest of string was truncated]";.
///
- internal static string jp {
+ internal static string ja {
get {
- return ResourceManager.GetString("jp", resourceCulture);
+ return ResourceManager.GetString("ja", resourceCulture);
}
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] libsscrypto_dll {
get {
@@ -143,7 +111,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] mgwz_dll {
get {
@@ -153,14 +121,14 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找类似 listen-address __PRIVOXY_BIND_IP__:__PRIVOXY_BIND_PORT__
+ /// Looks up a localized string similar to listen-address __PRIVOXY_BIND_IP__:__PRIVOXY_BIND_PORT__
///toggle 0
///logfile ss_privoxy.log
///show-on-task-bar 0
///activity-animation 0
///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
///hide-console
- /// 的本地化字符串。
+ ///.
///
internal static string privoxy_conf {
get {
@@ -169,7 +137,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] privoxy_exe {
get {
@@ -179,7 +147,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] proxy_pac_txt {
get {
@@ -189,7 +157,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap ss16 {
get {
@@ -199,7 +167,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap ss20 {
get {
@@ -209,7 +177,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap ss24 {
get {
@@ -219,7 +187,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap ssIn24 {
get {
@@ -229,7 +197,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap ssOut24 {
get {
@@ -239,7 +207,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
///
internal static System.Drawing.Bitmap ssw128 {
get {
@@ -249,7 +217,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] sysproxy_exe {
get {
@@ -259,7 +227,7 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找 System.Byte[] 类型的本地化资源。
+ /// Looks up a localized resource of type System.Byte[].
///
internal static byte[] sysproxy64_exe {
get {
@@ -269,9 +237,9 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找类似 ! Put user rules line by line in this file.
+ /// Looks up a localized string similar to ! Put user rules line by line in this file.
///! See https://adblockplus.org/en/filter-cheatsheet
- /// 的本地化字符串。
+ ///.
///
internal static string user_rule {
get {
@@ -280,7 +248,38 @@ namespace Shadowsocks.Properties {
}
///
- /// 查找类似 # translation for Traditional Chinese
+ /// Looks up a localized string similar to # translation for Simplified Chinese
+ ///
+ ///Shadowsocks=Shadowsocks
+ ///
+ ///# Menu items
+ ///
+ ///Enable System Proxy=启用系统代理
+ ///Mode=系统代理模式
+ ///PAC=PAC 模式
+ ///Global=全局模式
+ ///Servers=服务器
+ ///Edit Servers...=编辑服务器...
+ ///Statistics Config...=统计配置...
+ ///Start on Boot=开机启动
+ ///Forward Proxy...=正向代理设置...
+ ///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 的用户规则...
+ ///Secure Local PAC=保护本地 PAC
+ ///Cop [rest of string was truncated]";.
+ ///
+ internal static string zh_CN {
+ get {
+ return ResourceManager.GetString("zh_CN", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to # translation for Traditional Chinese
///
///Shadowsocks=Shadowsocks
///
@@ -301,11 +300,11 @@ namespace Shadowsocks.Properties {
///Edit Local PAC File...=編輯本機 PAC 檔案...
///Update Local PAC from GFWList=從 GFWList 更新本機 PAC
///Edit User Rule for GFWList...=編輯 GFWList 的使用者規則...
- ///Secure Local PAC=安全本機 [字符串的其余部分被截断]"; 的本地化字符串。
+ ///Secure Local PAC=安全本機 [rest of string was truncated]";.
///
- internal static string zh_tw {
+ internal static string zh_TW {
get {
- return ResourceManager.GetString("zh_tw", resourceCulture);
+ return ResourceManager.GetString("zh_TW", resourceCulture);
}
}
}
diff --git a/shadowsocks-csharp/Properties/Resources.resx b/shadowsocks-csharp/Properties/Resources.resx
index 3b15cf92..733ade0d 100755
--- a/shadowsocks-csharp/Properties/Resources.resx
+++ b/shadowsocks-csharp/Properties/Resources.resx
@@ -121,11 +121,8 @@
..\Data\abp.js.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ..\data\cn.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
-
-
- ..\Data\jp.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+
+ ..\Data\ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
..\data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -169,7 +166,10 @@
..\data\user-rule.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
-
- ..\Data\zh_tw.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+
+ ..\data\zh-CN.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+
+
+ ..\Data\zh-TW.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
\ No newline at end of file
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index 62ea4e60..8493e788 100644
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -301,11 +301,11 @@
-
-
+
+
+
-
Designer