From 5206b4c1f13104305c6e8d7bb264d3d9cbf91387 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sat, 7 Jan 2017 17:17:28 +0800
Subject: [PATCH] Simplify strings.xml

---
 src/main/res/values-ja-v21/strings.xml     |  4 ----
 src/main/res/values-ja/strings.xml         | 17 +++++++---------
 src/main/res/values-ru-v21/strings.xml     |  4 ----
 src/main/res/values-ru/strings.xml         | 15 ++++++--------
 src/main/res/values-v21/strings.xml        |  2 +-
 src/main/res/values-zh-rCN-v21/strings.xml |  4 ----
 src/main/res/values-zh-rCN/strings.xml     | 21 ++++++++------------
 src/main/res/values-zh-rTW-v21/strings.xml |  4 ----
 src/main/res/values-zh-rTW/strings.xml     | 23 +++++++++-------------
 src/main/res/values/arrays.xml             | 14 +++++++++++++
 src/main/res/values/strings.xml            | 21 ++++++++------------
 11 files changed, 53 insertions(+), 76 deletions(-)
 delete mode 100644 src/main/res/values-ja-v21/strings.xml
 delete mode 100644 src/main/res/values-ru-v21/strings.xml
 delete mode 100644 src/main/res/values-zh-rCN-v21/strings.xml
 delete mode 100644 src/main/res/values-zh-rTW-v21/strings.xml

diff --git a/src/main/res/values-ja-v21/strings.xml b/src/main/res/values-ja-v21/strings.xml
deleted file mode 100644
index fa6efdfa..00000000
--- a/src/main/res/values-ja-v21/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="proxied_apps_summary">選択したアプリにプロキシを設定する</string>
-</resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 6547f46d..db3d79a2 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -23,6 +23,7 @@
   <string name="route_list">プロキシ方式</string>
   <string name="proxied_apps">アプリ別のプロキシを使用</string>
   <string name="proxied_apps_summary">アプリ別でプロキシを指定、Android 4.x では必ずNATモードを使用して下さい</string>
+  <string name="proxied_apps_summary_v21">選択したアプリにプロキシを設定する</string>
   <string name="on">ON</string>
   <string name="bypass_apps">バイパスモード（迂回モード）</string>
   <string name="bypass_apps_summary">このモードを選択した場合、指定したアプリのパケットはプロキシを経由しない</string>
@@ -76,7 +77,7 @@
   <string name="stat_summary">送信済み: \t%3$s\t↑\t%1$s/s\n受信済み: \t%4$s\t↓\t%2$s/s</string>
 
   <string name="connection_test_pending">接続状況確認</string>
-  <string name="connection_test_testing">テスト中...</string>
+  <string name="connection_test_testing">テスト中…</string>
   <string name="connection_test_available">成功: %dmsの遅延</string>
   <string name="connection_test_fail">インターネット利用不可</string>
   <string name="connection_test_error">失敗しました：%s</string>
@@ -87,16 +88,12 @@
   <string name="add_profile_methods_scan_qr_code">QRコードを読み取る</string>
   <string name="add_profile_methods_manual_settings">手動でセットアップ</string>
 
+  <string name="route_entry_all">すべて</string>
+  <string name="route_entry_bypass_lan">LANアドレスを迂回する</string>
+  <string name="route_entry_bypass_chn">中国本土のアドレスを迂回する</string>
+  <string name="route_entry_bypass_lan_chn">LAN及び中国本土のアドレスを迂回する</string>
   <string name="route_entry_gfwlist">中国本土からアクセス不可なアドレス以外を迂回する</string>
-  <string-array name="route_entry">
-    <item>すべて</item>
-    <item>LANアドレスを迂回する</item>
-    <item>中国本土のアドレスを迂回する</item>
-    <item>LAN及び中国本土のアドレスを迂回する</item>
-    <item>@string/route_entry_gfwlist</item>
-    <item>中国本土のアドレス以外を迂回する</item>
-    <item>@string/custom_rules</item>
-  </string-array>
+  <string name="route_entry_chinalist">中国本土のアドレス以外を迂回する</string>
 
   <string name="action_apply_all">設定をすべてのプロファイルに適応する</string>
   <string name="action_export">クリップボードに出力</string>
diff --git a/src/main/res/values-ru-v21/strings.xml b/src/main/res/values-ru-v21/strings.xml
deleted file mode 100644
index 2869e5f9..00000000
--- a/src/main/res/values-ru-v21/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="proxied_apps_summary">Установить прокси для выбранных приложений</string>
-</resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 63b83e11..cd14f7f8 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -41,18 +41,15 @@
   <string name="auto_set_gfwlist">CHN Маршрут</string>
   <string name="auto_set_gfwlist_summary">Игнорировать все сайты находящиеся в Китае</string>
   <string name="route_list">Маршрут</string>
+  <string name="route_entry_all">Все</string>
+  <string name="route_entry_bypass_lan">Обход LAN</string>
+  <string name="route_entry_bypass_chn">Обходной Китай</string>
+  <string name="route_entry_bypass_lan_chn">Обход LAN и Китай</string>
   <string name="route_entry_gfwlist">Список GFW</string>
-  <string-array name="route_entry">
-    <item>Все</item>
-    <item>Обход LAN</item>
-    <item>Обходной Китай</item>
-    <item>Обход LAN и Китай</item>
-    <item>@string/route_entry_gfwlist</item>
-    <item>Список Китай</item>
-    <item>@string/custom_rules</item>
-  </string-array>
+  <string name="route_entry_chinalist">Список Китай</string>
   <string name="proxied_apps">Прокси для выбранных приложений</string>
   <string name="proxied_apps_summary">Установить прокси для выбранных приложений, требует режим NAT под Android 4.x</string>
+  <string name="proxied_apps_summary_v21">Установить прокси для выбранных приложений</string>
   <string name="on">Вкл</string>
   <string name="bypass_apps">В обход прокси</string>
   <string name="bypass_apps_summary">Включите эту опцию для работы выбранных приложений в обход прокси</string>
diff --git a/src/main/res/values-v21/strings.xml b/src/main/res/values-v21/strings.xml
index 14c389ed..4cb3b9a0 100644
--- a/src/main/res/values-v21/strings.xml
+++ b/src/main/res/values-v21/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="proxied_apps_summary">Set proxy for selected apps</string>
+    <string name="proxied_apps_summary">@string/proxied_apps_summary_v21</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN-v21/strings.xml b/src/main/res/values-zh-rCN-v21/strings.xml
deleted file mode 100644
index e16254e2..00000000
--- a/src/main/res/values-zh-rCN-v21/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="proxied_apps_summary">为应用程序分别设置代理</string>
-</resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index b4c6d9ca..e97af7fe 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -23,6 +23,7 @@
   <string name="route_list">路由</string>
   <string name="proxied_apps">分应用代理</string>
   <string name="proxied_apps_summary">为应用程序分别设置代理，在 4.x 下需要启用 NAT 模式</string>
+  <string name="proxied_apps_summary_v21">为应用程序分别设置代理</string>
   <string name="on">开</string>
   <string name="bypass_apps">绕行模式</string>
   <string name="bypass_apps_summary">启用该选项，以使所选应用程序的流量不经过代理</string>
@@ -99,16 +100,12 @@
   <string name="add_profile_methods_manual_settings">手动设置</string>
   <string name="add_profile_scanner_not_installed">请安装任意兼容 ZXing 的二维码扫描应用。</string>
 
+  <string name="route_entry_all">全局</string>
+  <string name="route_entry_bypass_lan">绕过局域网地址</string>
+  <string name="route_entry_bypass_chn">绕过中国大陆地址</string>
+  <string name="route_entry_bypass_lan_chn">绕过局域网及中国大陆地址</string>
   <string name="route_entry_gfwlist">仅代理中国大陆无法访问的地址</string>
-  <string-array name="route_entry">
-    <item>全局</item>
-    <item>绕过局域网地址</item>
-    <item>绕过中国大陆地址</item>
-    <item>绕过局域网及中国大陆地址</item>
-    <item>@string/route_entry_gfwlist</item>
-    <item>仅代理中国大陆地址</item>
-    <item>@string/custom_rules</item>
-  </string-array>
+  <string name="route_entry_chinalist">仅代理中国大陆地址</string>
 
   <string name="action_apply_all">应用设置到所有配置文件</string>
   <string name="action_export">导出至剪贴板</string>
@@ -147,10 +144,8 @@
   <string name="custom_rules">自定义规则</string>
   <string name="action_selection">选择…</string>
   <string name="action_add_rule">添加规则…</string>
-  <string-array name="acl_rule_templates">
-    <item>子网/域名 PCRE 正则表达式</item>
-    <item>域名及其子域名</item>
-  </string-array>
+  <string name="acl_rule_templates_generic">子网/域名 PCRE 正则表达式</string>
+  <string name="acl_rule_templates_domain">域名及其子域名</string>
   <string name="edit_rule">编辑规则</string>
 
 </resources>
diff --git a/src/main/res/values-zh-rTW-v21/strings.xml b/src/main/res/values-zh-rTW-v21/strings.xml
deleted file mode 100644
index 9294adbf..00000000
--- a/src/main/res/values-zh-rTW-v21/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="proxied_apps_summary">為已選擇的應用程式設定 Proxy</string>
-</resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index cb24d736..38af9fc6 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
   <string name="app_name">Shadowsocks</string>
@@ -24,6 +24,7 @@
   <string name="route_list">路由</string>
   <string name="proxied_apps">個別應用程式的 Proxy</string>
   <string name="proxied_apps_summary">為已選擇的應用程式設定 Proxy，在 Android 4.X 以下需要開啟 NAT 模式</string>
+  <string name="proxied_apps_summary_v21">為已選擇的應用程式設定 Proxy</string>
   <string name="on">開</string>
   <string name="bypass_apps">略過模式</string>
   <string name="bypass_apps_summary">啟用此選項，會略過已選擇的應用程式</string>
@@ -100,16 +101,12 @@
   <string name="add_profile_methods_manual_settings">手動設定</string>
   <string name="add_profile_scanner_not_installed">請安裝任何相容 ZXing 的 QR 碼掃描應用程式。</string>
 
+  <string name="route_entry_all">全部</string>
+  <string name="route_entry_bypass_lan">略過區域網路</string>
+  <string name="route_entry_bypass_chn">略過中國大陸</string>
+  <string name="route_entry_bypass_lan_chn">略過區域網路及中國大陸</string>
   <string name="route_entry_gfwlist">GFW List</string>
-  <string-array name="route_entry">
-    <item>全部</item>
-    <item>略過區域網路</item>
-    <item>略過中國大陸</item>
-    <item>略過區域網路及中國大陸</item>
-    <item>@string/route_entry_gfwlist</item>
-    <item>China List</item>
-    <item>@string/custom_rules</item>
-  </string-array>
+  <string name="route_entry_chinalist">China List</string>
 
   <string name="action_apply_all">套用設定至所有設定檔</string>
   <string name="action_export">匯出至剪貼簿</string>
@@ -148,10 +145,8 @@
   <string name="custom_rules">自訂規則</string>
   <string name="action_selection">選擇…</string>
   <string name="action_add_rule">新增規則…</string>
-  <string-array name="acl_rule_templates">
-    <item>子網路/主機名稱 PCRE 模式</item>
-    <item>網域及其所有子網域</item>
-  </string-array>
+  <string name="acl_rule_templates_generic">子網路/主機名稱 PCRE 模式</string>
+  <string name="acl_rule_templates_domain">網域及其所有子網域</string>
   <string name="edit_rule">編輯規則</string>
 
 </resources>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 7fd25301..58e8ae88 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -38,6 +38,15 @@
         <item>chacha20-ietf</item>
     </string-array>
 
+    <string-array name="route_entry">
+        <item>@string/route_entry_all</item>
+        <item>@string/route_entry_bypass_lan</item>
+        <item>@string/route_entry_bypass_chn</item>
+        <item>@string/route_entry_bypass_lan_chn</item>
+        <item>@string/route_entry_gfwlist</item>
+        <item>@string/route_entry_chinalist</item>
+        <item>@string/custom_rules</item>
+    </string-array>
     <string-array name="route_value">
         <item>all</item>
         <item>bypass-lan</item>
@@ -205,4 +214,9 @@
         <item>204.0.0.0/6</item>
         <item>208.0.0.0/4</item>
     </string-array>
+
+    <string-array name="acl_rule_templates">
+        <item>@string/acl_rule_templates_generic</item>
+        <item>@string/acl_rule_templates_domain</item>
+    </string-array>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a81e7103..1c0e6686 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -48,18 +48,15 @@
   <string name="auto_set_gfwlist_summary">Bypass all sites located in China
   </string>
   <string name="route_list">Route</string>
+  <string name="route_entry_all">All</string>
+  <string name="route_entry_bypass_lan">Bypass LAN</string>
+  <string name="route_entry_bypass_chn">Bypass mainland China</string>
+  <string name="route_entry_bypass_lan_chn">Bypass LAN &amp; mainland China</string>
   <string name="route_entry_gfwlist">GFW List</string>
-  <string-array name="route_entry">
-    <item>All</item>
-    <item>Bypass LAN</item>
-    <item>Bypass mainland China</item>
-    <item>Bypass LAN &amp; mainland China</item>
-    <item>@string/route_entry_gfwlist</item>
-    <item>China List</item>
-    <item>@string/custom_rules</item>
-  </string-array>
+  <string name="route_entry_chinalist">China List</string>
   <string name="proxied_apps">Per-App Proxy</string>
   <string name="proxied_apps_summary">Set proxy for selected apps, requires NAT mode under Android 4.x</string>
+  <string name="proxied_apps_summary_v21">Set proxy for selected apps</string>
   <string name="on">On</string>
   <string name="bypass_apps">Bypass Mode</string>
   <string name="bypass_apps_summary">Enable this option to bypass selected apps</string>
@@ -162,9 +159,7 @@
   <string name="custom_rules">Custom rules</string>
   <string name="action_selection">Selection…</string>
   <string name="action_add_rule">Add rule(s)…</string>
-  <string-array name="acl_rule_templates">
-    <item>Subnet/Hostname PCRE pattern</item>
-    <item>Domain name and all its subdomain names</item>
-  </string-array>
+  <string name="acl_rule_templates_generic">Subnet/Hostname PCRE pattern</string>
+  <string name="acl_rule_templates_domain">Domain name and all its subdomain names</string>
   <string name="edit_rule">Edit rule</string>
 </resources>