aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-zh-rCN/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2014-12-30 09:36:17 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2014-12-30 09:36:17 +0100
commitb71740f0d40ed3fb3e5b790d80ed6cb235f97d04 (patch)
tree99367303fb7b92cb1f34d8c236ad53c31c1d4bb4 /src/main/res/values-zh-rCN/strings.xml
parent8f93f9c314d1bf731eac64007f3c9459fa92de1f (diff)
parentcacddef75668c1811d951795c2276c20255c9142 (diff)
Merge remote-tracking branch 'origin/development' into development
Diffstat (limited to 'src/main/res/values-zh-rCN/strings.xml')
-rw-r--r--src/main/res/values-zh-rCN/strings.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a7898425..b3b9604e 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">Conversations</string>
<string name="action_settings">设置</string>
<string name="action_add">新会话</string>
<string name="action_accounts">管理账户</string>
@@ -257,4 +256,4 @@
<string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string>
<string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string>
-</resources> \ No newline at end of file
+</resources>