diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index c9457d6f..809d3219 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -26,7 +26,6 @@
国内路由
绕过所有位于中国的网站
路由
- 绕过指定路由列表中的地址
全局代理
设置系统代理
分应用代理
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7b8660ee..a7f1f2c7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -37,7 +37,6 @@
Bypass all sites located in China
Route
- Bypass IP addresses in the route list
Global Proxy
Set up system-wide proxy
Per-App Proxy
diff --git a/src/main/res/xml/pref_all.xml b/src/main/res/xml/pref_all.xml
index fbac2c70..95738358 100644
--- a/src/main/res/xml/pref_all.xml
+++ b/src/main/res/xml/pref_all.xml
@@ -37,27 +37,28 @@
android:summary="@string/sitekey_summary"
android:title="@string/sitekey">
-
-
+
-
-
+
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- *
- * ___====-_ _-====___
- * _--^^^#####// \\#####^^^--_
- * _-^##########// ( ) \\##########^-_
- * -############// |\^^/| \\############-
- * _/############// (@::@) \\############\_
- * /#############(( \\// ))#############\
- * -###############\\ (oo) //###############-
- * -#################\\ / VV \ //#################-
- * -###################\\/ \//###################-
- * _#/|##########/\######( /\ )######/\##########|\#_
- * |/ |#/\#/\#/\/ \#/\##\ | | /##/\#/ \/\#/\#/\#| \|
- * ` |/ V V ` V \#\| | | |/#/ V ' V V \| '
- * ` ` ` ` / | | | | \ ' ' ' '
- * ( | | | | )
- * __\ | | | | /__
- * (vvv(VVV)(VVV)vvv)
- *
- * HERE BE DRAGONS
- *
- */
-
-package com.github.shadowsocks.preferences
-
-import android.preference.ListPreference
-import android.content.Context
-import android.util.AttributeSet
-
-class SummaryListPreference(context: Context, attrs: AttributeSet)
- extends ListPreference(context, attrs) {
-
- override def setValue(text: String) {
- super.setValue(text)
- val entry = getEntry
- if (entry != null)
- setSummary(entry)
- else
- setSummary(text)
- }
-
- override def setSummary(summary: CharSequence) {
- if (summary == null || summary.toString.isEmpty) {
- super.setSummary("")
- } else {
- super.setSummary(summary)
- }
- }
-
-}