From 84cf926df18bbd5aca48dffba6df49865d75d3e8 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sun, 21 Jan 2018 13:58:20 -0800
Subject: [PATCH] Add translations

---
 mobile/build.gradle                             |  1 +
 .../be/mygod/vpnhotspot/RepeaterFragment.kt     |  1 -
 .../java/be/mygod/vpnhotspot/net/IpNeighbour.kt |  5 ++---
 mobile/src/main/res/values-zh-rCN/strings.xml   | 17 +++++++++++------
 mobile/src/main/res/values/strings.xml          |  3 +--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 6473e0b3..f4983d15 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -9,6 +9,7 @@ android {
         applicationId "be.mygod.vpnhotspot"
         minSdkVersion 21
         targetSdkVersion 27
+        resConfigs "zh-rCN"
         versionCode 4
         versionName "0.9.1-beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
index b34b5522..e3afb3b2 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
@@ -84,7 +84,6 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
         val description get() = getString(when (neighbour?.state) {
             IpNeighbour.State.INCOMPLETE, null -> R.string.connected_state_incomplete
             IpNeighbour.State.VALID -> R.string.connected_state_valid
-            IpNeighbour.State.VALID_DELAY -> R.string.connected_state_valid_delay
             IpNeighbour.State.FAILED -> R.string.connected_state_failed
             else -> throw IllegalStateException()
         }, iface)
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
index b64035c4..f73c6c72 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
@@ -6,7 +6,7 @@ import java.io.IOException
 
 data class IpNeighbour(val ip: String, val dev: String, val lladdr: String, val state: State) {
     enum class State {
-        INCOMPLETE, VALID, VALID_DELAY, FAILED, DELETING
+        INCOMPLETE, VALID, FAILED, DELETING
     }
 
     companion object {
@@ -38,8 +38,7 @@ data class IpNeighbour(val ip: String, val dev: String, val lladdr: String, val
                     .singleOrNull() ?: "")
             val state = if (match.groupValues[1].isNotEmpty()) State.DELETING else when (match.groupValues[9]) {
                 "", "INCOMPLETE" -> State.INCOMPLETE
-                "REACHABLE", "STALE", "PROBE", "PERMANENT" -> State.VALID
-                "DELAY" -> State.VALID_DELAY
+                "REACHABLE", "DELAY", "STALE", "PROBE", "PERMANENT" -> State.VALID
                 "FAILED" -> State.FAILED
                 "NOARP" -> return null  // skip
                 else -> {
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index 10efa167..b37a80e9 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -7,7 +7,6 @@
 
     <string name="repeater_ssid">中继名称</string>
     <string name="repeater_password">中继密码</string>
-    <string name="connected_devices">已连接设备</string>
     <string name="repeater_wps_dialog_title">输入 PIN</string>
     <string name="repeater_wps_dialog_pbc">一键加密</string>
     <string name="repeater_wps_success_pbc">请在 2 分钟内在需要连接的设备上使用一键加密以连接到此中继。</string>
@@ -21,7 +20,6 @@
     <string name="repeater_reset_credentials_failure">重置凭据失败（原因：%s）</string>
 
     <string name="repeater_inactive">未打开</string>
-    <string name="repeater_connecting">正在连接……</string>
     <string name="repeater_vpn_unavailable">无法找到 VPN，请启用任意 VPN</string>
     <string name="repeater_root_unavailable">似乎没有 root</string>
     <string name="repeater_p2p_unavailable">Wi-Fi 直连不可用</string>
@@ -35,8 +33,12 @@
     <string name="repeater_failure_reason_no_service_requests">未添加服务请求</string>
     <string name="repeater_failure_reason_unknown">未知 #%d</string>
 
-    <string name="tethering_system_tethering">系统共享</string>
-    <string name="tethering_no_interfaces">请先打开系统共享后使用此功能。</string>
+    <string name="tethering_manage">管理…</string>
+
+    <string name="connected_devices">已连接设备</string>
+    <string name="connected_state_incomplete">正在通过 %s 连接</string>
+    <string name="connected_state_valid">已连接到 %s</string>
+    <string name="connected_state_failed">已从 %s 断开</string>
 
     <string name="settings_service">服务</string>
     <string name="settings_service_dns">下游 DNS 服务器:端口</string>
@@ -49,9 +51,12 @@
     <string name="settings_misc_donate">捐款</string>
     <string name="settings_misc_donate_summary">请给我钱</string>
 
-    <string name="notification_channel_repeater">无线中继服务</string>
+    <string name="notification_channel_tethering">VPN 共享服务</string>
     <plurals name="notification_connected_devices">
-        <item quantity="other">已连接 %d 个设备</item>
+        <item quantity="other">%d 个设备已连接到 %s</item>
+    </plurals>
+    <plurals name="notification_interfaces">
+        <item quantity="other">%d 个接口</item>
     </plurals>
 
     <string name="exception_interface_not_found">错误：未找到下游接口</string>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index aec195ef..f6de6b26 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -40,8 +40,7 @@
     <string name="connected_devices">Connected devices</string>
     <string name="connected_state_incomplete">Connecting to %s</string>
     <string name="connected_state_valid">Connected to %s</string>
-    <string name="connected_state_valid_delay">Connected to %s (losing)</string>
-    <string name="connected_state_failed">Failed to connect to %s</string>
+    <string name="connected_state_failed">Lost from %s</string>
 
     <string name="settings_service">Service</string>
     <string name="settings_service_dns">Downstream DNS server:port</string>