Commit 8cb0d0d7 authored by Mygod's avatar Mygod

Remove duplicate string entry shutting_down

parent 77ddc3ac
...@@ -130,10 +130,10 @@ ...@@ -130,10 +130,10 @@
<!-- status --> <!-- status -->
<string name="sent">发送:</string> <string name="sent">发送:</string>
<string name="received">接收:</string> <string name="received">接收:</string>
<string name="connecting">连接中…</string>
<string name="vpn_connected">已连接, 轻触以检查连接状态</string> <string name="vpn_connected">已连接, 轻触以检查连接状态</string>
<string name="nat_connected">已连接</string> <string name="nat_connected">已连接</string>
<string name="not_connected">未连接</string> <string name="not_connected">未连接</string>
<string name="shutting_down">关闭连接中...</string>
<!-- kcp --> <!-- kcp -->
<string name="kcp_summary">启用 KCP 协议</string> <string name="kcp_summary">启用 KCP 协议</string>
......
...@@ -131,11 +131,10 @@ ...@@ -131,11 +131,10 @@
<!-- status --> <!-- status -->
<string name="sent">傳送:</string> <string name="sent">傳送:</string>
<string name="received">接收:</string> <string name="received">接收:</string>
<string name="connecting">連線中...</string> <string name="connecting">連線中</string>
<string name="vpn_connected">已連線, 輕觸以檢查連線能力</string> <string name="vpn_connected">已連線, 輕觸以檢查連線能力</string>
<string name="nat_connected">已連線</string> <string name="nat_connected">已連線</string>
<string name="not_connected">未連線</string> <string name="not_connected">未連線</string>
<string name="shutting_down">關閉連線中...</string>
<!-- kcp --> <!-- kcp -->
<string name="kcp_summary">啟用 KCP 協定</string> <string name="kcp_summary">啟用 KCP 協定</string>
......
...@@ -147,7 +147,6 @@ ...@@ -147,7 +147,6 @@
<string name="vpn_connected">Connected, tap to check connection</string> <string name="vpn_connected">Connected, tap to check connection</string>
<string name="nat_connected">Connected</string> <string name="nat_connected">Connected</string>
<string name="not_connected">Not connected</string> <string name="not_connected">Not connected</string>
<string name="shutting_down">Shutting down…</string>
<!-- kcp --> <!-- kcp -->
<string name="kcp" translatable="false">KCP</string> <string name="kcp" translatable="false">KCP</string>
......
...@@ -112,7 +112,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe ...@@ -112,7 +112,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
case State.STOPPING => case State.STOPPING =>
fab.setImageResource(R.drawable.ic_start_busy) fab.setImageResource(R.drawable.ic_start_busy)
if (state == State.CONNECTED) fabProgressCircle.show() // ignore for stopped if (state == State.CONNECTED) fabProgressCircle.show() // ignore for stopped
statusText.setText(R.string.shutting_down) statusText.setText(R.string.stopping)
case _ => case _ =>
fab.setImageResource(R.drawable.ic_start_idle) fab.setImageResource(R.drawable.ic_start_idle)
fabProgressCircle.postDelayed(hideCircle, 1000) fabProgressCircle.postDelayed(hideCircle, 1000)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment