From d3c44b986ce40764bf6fe1777e9971245559a383 Mon Sep 17 00:00:00 2001
From: Harry Chen <373685963@qq.com>
Date: Sun, 1 Nov 2015 15:00:40 +0800
Subject: [PATCH 1/2] Add translation of Chinese Simplified

Signed-off-by: Harry Chen <373685963@qq.com>
---
 app/src/main/res/values-zh-rCN/strings.xml | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 app/src/main/res/values-zh-rCN/strings.xml

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..b3eff0c
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">SocksDroid</string>
+    
+	<string name="profile">配置文件</string>
+	<string name="prof_default">默认</string>
+	
+	<string name="connection">连接</string>
+	<string name="server_ip">服务器IP</string>
+	<string name="server_port">服务器端口</string>
+	<string name="ipv6_proxy">IPv6</string>
+	<string name="ipv6_proxy_sum">启用IPv6转发。如果服务器支持IPv6，打开这个选项后你可以通过IPv4网络访问IPv6内容。</string>
+	<string name="udp_proxy">UDP转发</string>
+	<string name="udp_proxy_sum">通过SOCKS5将UDP数据包转发给badvpn-udpgw，这需要远端服务器上运行badvpn-udpgw（通常在127.0.0.1上监听）。</string>
+	<string name="udp_gw">UDP网关（远端）</string>
+	
+	<string name="authentication">认证</string>
+	<string name="auth_userpw">用户名&amp;密码认证/string>
+	<string name="auth_username">用户名</string>
+	<string name="auth_password">密码</string>
+	
+	<string name="advanced">高级</string>
+	<string name="adv_route">Route</string>
+	<string name="adv_route_all">所有（默认）</string>
+	<string name="adv_route_non_chn">非中国地址</string>
+	<string name="adv_dns">DNS服务器</string>
+	<string name="adv_dns_port">DNS端口（TCP）</string>
+	<string name="adv_auto_connect">开机自动连接</string>
+	<string name="adv_per_app">单App代理</string>
+	<string name="adv_app_bypass">绕行模式</string>
+	<string name="adv_app_bypass_sum">启用这个选项后，选中的App将不经过代理，否则反之。</string>
+	<string name="adv_app_list">App列表</string>
+	<string name="adv_app_list_sum">每行输入一个App的包名（可通过设置-App查询）</string>
+	
+	<string name="prof_add">添加配置文件</string>
+	<string name="prof_del">删除配置文件</string>
+	<string name="prof_del_confirm">删除配置文件｢%s｣吗?</string>
+	<string name="switch_main">开/关代理</string>
+	
+	<string name="err_add_prof">添加配置文件｢%s｣失败</string>
+	<string name="err_del_prof">删除配置文件｢%s｣失败</string>
+	<string name="notify_title">SOCKS5代理已激活</string>
+	<string name="notify_msg">已连接至｢%s｣</string>
+	
+</resources>

From 9797cd19509d53a0eb6599cce703e4ab969a7340 Mon Sep 17 00:00:00 2001
From: Harry Chen <373685963@qq.com>
Date: Sun, 1 Nov 2015 15:27:52 +0800
Subject: [PATCH 2/2] Fix error in Chinese Translation

Signed-off-by: Harry Chen <373685963@qq.com>
---
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b3eff0c..41f3320 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -16,7 +16,7 @@
 	<string name="udp_gw">UDP网关（远端）</string>
 	
 	<string name="authentication">认证</string>
-	<string name="auth_userpw">用户名&amp;密码认证/string>
+	<string name="auth_userpw">用户名&amp;密码认证</string>
 	<string name="auth_username">用户名</string>
 	<string name="auth_password">密码</string>