diff --git a/shadow-notify.png b/shadow-notify.png
new file mode 100644
index 00000000..55151eb7
Binary files /dev/null and b/shadow-notify.png differ
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 14d82d9c..636530c5 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
android:hardwareAccelerated="true"
android:icon="@drawable/ic_launcher"
android:backupAgent=".ShadowsocksBackupAgent"
- android:label="@string/app_name">
+ android:label="@string/screen_name">
@@ -32,7 +32,7 @@
diff --git a/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png
index 62db8b92..58590365 100755
Binary files a/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png and b/src/main/res/drawable-hdpi-v11/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png
index 2ad06c79..cdb8b7f7 100755
Binary files a/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-hdpi/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png
index ade0de1d..455a6417 100755
Binary files a/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png and b/src/main/res/drawable-mdpi-v11/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png
index 427e4099..f38943be 100755
Binary files a/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-mdpi/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png b/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png
index 6770d0d9..271e2d62 100755
Binary files a/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png and b/src/main/res/drawable-xhdpi-v11/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png
index 0a9d318c..3557be9a 100755
Binary files a/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png and b/src/main/res/drawable-xhdpi/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/drawable-xxhdpi-v11 b/src/main/res/drawable-xxhdpi-v11
new file mode 100755
index 00000000..dd6cc3db
Binary files /dev/null and b/src/main/res/drawable-xxhdpi-v11 differ
diff --git a/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png b/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png
new file mode 100755
index 00000000..78e5f33b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_stat_shadowsocks.png differ
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index a76c3768..ac8b36df 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -2,26 +2,27 @@
shadowsocks
- 服务控制器
+ 影梭
+ 服务控制
代理开关
- 启动/关闭 代理服务器
+ 启动/关闭后台服务
服务器设置
配置文件
配置文件名称
服务器
- 你的Shadwossocks代理服务器IP地址或主机名
+ 您的影梭服务器的地址
远程端口
- 您的Shadowsocks服务器的端口号
+ 您的影梭服务器的端口号
本地端口
- 您的Shadowssocks客户端的端口号
+ 您的影梭客户端的端口号
密码
- 您的Shadowsocks服务器的密码
+ 您的影梭服务器的密码
加密方法
功能设置
HTTP 代理服务器
本地 HTTP 代理
DNS 代理
- 重定向DNS查询到远程服务器
+ 重定向 DNS 查询到远程服务器
国内路由
绕过所有位于中国的网站
全局代理
@@ -32,15 +33,15 @@
绕行模式
启用该选项,以使所选应用程序的流量不经过代理
自动连接
- 随系统启动 Shadowsocks
+ 随系统启动后台服务
流量统计
在通知栏上显示当前上下行速率
- Shadowsocks 已开始运行。
+ 后台服务已开始运行。
已连接到 %s。
- 当前速度: %d KB/s
- Shadowsocks 启动失败。
- Shadowsocks 已停止。
- Shadowsocks 已停止。
+ 当前速度:%d KB/s
+ 后台服务启动失败。
+ 后台服务已停止。
+ 后台服务已停止。
请检查你的网络状态后并重试。
停止服务
您仅能通过通知栏关闭 VPN 服务
@@ -56,10 +57,12 @@
正在加载...
是
否
+ 配置文件
+ 设置选项
删除此配置文件: %s?
重置
关于
- Shadowsocks %s
+ 影梭(shadowsocks)%s
刷新 DNS 缓存
刷新中...
添加配置文件
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0d4cd57f..2556175e 100755
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
shadowsocks
+ ss
Service Controller
@@ -73,6 +74,8 @@
Remove this profile: %s ?
+ Profiles
+ Settings
Reset
About
Shadowsocks %s
diff --git a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
index f1b84ac6..b5e3862c 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowVpnService.scala
@@ -350,7 +350,7 @@ class ShadowVpnService extends VpnService {
.setSmallIcon(R.drawable.ic_stat_shadowsocks)
.setWhen(0)
.setTicker(title)
- .setContentTitle(getString(R.string.app_name))
+ .setContentTitle(getString(R.string.screen_name))
.setContentText(info)
.setContentIntent(contentIntent)
.setAutoCancel(true)
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index 537f4d60..b0dde940 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -658,13 +658,13 @@ class Shadowsocks
val buf = new ListBuffer[Any]()
- buf += new Category("Profiles")
+ buf += new Category(getString(R.string.profiles))
buf ++= getProfileList
buf += new Item(-400, getString(R.string.add_profile), android.R.drawable.ic_menu_add, addProfile)
- buf += new Category("Settings")
+ buf += new Category(getString(R.string.settings))
buf += new Item(-100, getString(R.string.recovery), android.R.drawable.ic_menu_revert, _ => {
EasyTracker.getInstance(this).send(
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
index 580d368b..36b38105 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksService.scala
@@ -358,7 +358,7 @@ class ShadowsocksService extends Service {
builder
.setWhen(0)
.setTicker(title)
- .setContentTitle(getString(R.string.app_name))
+ .setContentTitle(getString(R.string.screen_name))
.setContentText(info)
.setContentIntent(contentIntent)
.addAction(android.R.drawable.ic_menu_close_clear_cancel, getString(R.string.stop),
@@ -376,7 +376,7 @@ class ShadowsocksService extends Service {
.setSmallIcon(R.drawable.ic_stat_shadowsocks)
.setWhen(0)
.setTicker(title)
- .setContentTitle(getString(R.string.app_name))
+ .setContentTitle(getString(R.string.screen_name))
.setContentText(info)
.setContentIntent(contentIntent)
.setAutoCancel(true)