Browse Source

I18n. Rename language resources

cn -> zh-CN
zh-tw -> zh-TW
jp -> ja
tags/4.0
celeron533 7 years ago
parent
commit
d8ccc9810e
7 changed files with 96 additions and 97 deletions
  1. +3
    -3
      shadowsocks-csharp/Controller/I18N.cs
  2. +0
    -0
      shadowsocks-csharp/Data/ja.txt
  3. +0
    -0
      shadowsocks-csharp/Data/zh-CN.txt
  4. +0
    -0
      shadowsocks-csharp/Data/zh-TW.txt
  5. +83
    -84
      shadowsocks-csharp/Properties/Resources.Designer.cs
  6. +7
    -7
      shadowsocks-csharp/Properties/Resources.resx
  7. +3
    -3
      shadowsocks-csharp/shadowsocks-csharp.csproj

+ 3
- 3
shadowsocks-csharp/Controller/I18N.cs View File

@@ -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);
}
}


shadowsocks-csharp/Data/jp.txt → shadowsocks-csharp/Data/ja.txt View File


shadowsocks-csharp/Data/cn.txt → shadowsocks-csharp/Data/zh-CN.txt View File


shadowsocks-csharp/Data/zh_tw.txt → shadowsocks-csharp/Data/zh-TW.txt View File


+ 83
- 84
shadowsocks-csharp/Properties/Resources.Designer.cs View File

@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: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.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@ namespace Shadowsocks.Properties {
/// <summary>
/// 一个强类型的资源类,用于查找本地化的字符串等。
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// 此类是由 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 {
}
/// <summary>
/// 返回此类使用的缓存的 ResourceManager 实例。
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 使用此强类型资源类,为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性。
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] abp_js {
get {
@@ -71,69 +71,37 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找类似 # 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 [字符串的其余部分被截断]&quot;; 的本地化字符串。
/// </summary>
internal static string cn {
get {
return ResourceManager.GetString("cn", resourceCulture);
}
}
/// <summary>
/// 查找类似 # 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 [字符串的其余部分被截断]&quot;; 的本地化字符串。
///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]&quot;;.
/// </summary>
internal static string jp {
internal static string ja {
get {
return ResourceManager.GetString("jp", resourceCulture);
return ResourceManager.GetString("ja", resourceCulture);
}
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] libsscrypto_dll {
get {
@@ -143,7 +111,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] mgwz_dll {
get {
@@ -153,14 +121,14 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找类似 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
/// 的本地化字符串。
///.
/// </summary>
internal static string privoxy_conf {
get {
@@ -169,7 +137,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] privoxy_exe {
get {
@@ -179,7 +147,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] proxy_pac_txt {
get {
@@ -189,7 +157,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ss16 {
get {
@@ -199,7 +167,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ss20 {
get {
@@ -209,7 +177,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ss24 {
get {
@@ -219,7 +187,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ssIn24 {
get {
@@ -229,7 +197,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ssOut24 {
get {
@@ -239,7 +207,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ssw128 {
get {
@@ -249,7 +217,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] sysproxy_exe {
get {
@@ -259,7 +227,7 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// Looks up a localized resource of type System.Byte[].
/// </summary>
internal static byte[] sysproxy64_exe {
get {
@@ -269,9 +237,9 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找类似 ! 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
/// 的本地化字符串。
///.
/// </summary>
internal static string user_rule {
get {
@@ -280,7 +248,38 @@ namespace Shadowsocks.Properties {
}
/// <summary>
/// 查找类似 # 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]&quot;;.
/// </summary>
internal static string zh_CN {
get {
return ResourceManager.GetString("zh_CN", resourceCulture);
}
}
/// <summary>
/// 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=安全本機 [字符串的其余部分被截断]&quot;; 的本地化字符串。
///Secure Local PAC=安全本機 [rest of string was truncated]&quot;;.
/// </summary>
internal static string zh_tw {
internal static string zh_TW {
get {
return ResourceManager.GetString("zh_tw", resourceCulture);
return ResourceManager.GetString("zh_TW", resourceCulture);
}
}
}


+ 7
- 7
shadowsocks-csharp/Properties/Resources.resx View File

@@ -121,11 +121,8 @@
<data name="abp_js" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\abp.js.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="cn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\data\cn.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="jp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\jp.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
<data name="ja" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="libsscrypto_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -169,7 +166,10 @@
<data name="user_rule" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\data\user-rule.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="zh_tw" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\zh_tw.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
<data name="zh_CN" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\data\zh-CN.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
<data name="zh_TW" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Data\zh-TW.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
</root>

+ 3
- 3
shadowsocks-csharp/shadowsocks-csharp.csproj View File

@@ -301,11 +301,11 @@
<None Include="Resources\ss16.png" />
<None Include="Resources\ss24.png" />
<None Include="Resources\ssw128.png" />
<Content Include="Data\cn.txt" />
<Content Include="Data\jp.txt" />
<Content Include="Data\zh-CN.txt" />
<Content Include="Data\zh-TW.txt" />
<Content Include="Data\ja.txt" />
<Content Include="Data\privoxy_conf.txt" />
<Content Include="Data\user-rule.txt" />
<Content Include="Data\zh_tw.txt" />
<Content Include="FodyWeavers.xml">
<SubType>Designer</SubType>
</Content>


Loading…
Cancel
Save