diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index e8a90333..8f8f8489 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -134,6 +134,10 @@ 发送: 接收: + 已连接, 轻触以检查连接状态 + 已连接 + 未连接 + 关闭连接中... 启用 KCP 协议 diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 434e5f7f..99b76076 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -136,6 +136,11 @@ 傳送: 接收: + 連線中... + 已連線, 輕觸以檢查連線能力 + 已連線 + 未連線 + 關閉連線中... 啟用 KCP 協定 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7350ffd4..2006b67b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -146,6 +146,11 @@ Sent: Received: + Connecting... + Connected, tap to check connection + Connected + Not connected + Shutting down... KCP diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala index 4d323893..4a00ef5f 100644 --- a/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -104,16 +104,16 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe case State.CONNECTING => fab.setImageResource(R.drawable.ic_start_busy) fabProgressCircle.show() - statusText.setText("Connecting...") + statusText.setText(R.string.connecting) case State.CONNECTED => if (state == State.CONNECTING) fabProgressCircle.beginFinalAnimation() else fabProgressCircle.postDelayed(hideCircle, 1000) fab.setImageResource(R.drawable.ic_start_connected) - statusText.setText(if (app.isNatEnabled) "Connected" else "Connected, tap to check connection") + statusText.setText(if (app.isNatEnabled) R.string.nat_connected else R.string.vpn_connected) case State.STOPPING => fab.setImageResource(R.drawable.ic_start_busy) if (state == State.CONNECTED) fabProgressCircle.show() // ignore for stopped - statusText.setText("Shutting down...") + statusText.setText(R.string.shutting_down) case _ => fab.setImageResource(R.drawable.ic_start_idle) fabProgressCircle.postDelayed(hideCircle, 1000) @@ -124,7 +124,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe snackbar.show() Log.e(TAG, "Error to start VPN service: " + m) } - statusText.setText("Not connected") + statusText.setText(R.string.not_connected) } state = s if (state == State.CONNECTED) fab.setBackgroundTintList(greenTint) else {