diff options
| author | Christian S <christian@pix-art.de> | 2015-10-16 21:48:33 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-10-16 21:48:33 +0200 |
| commit | 662b9e60da4605d954c50d80f12e348723b5c61e (patch) | |
| tree | 1588b44c16ef0aa7ffe26be9f93feb19b91bf906 /src/main/res/values-zh-rCN | |
| parent | 98c15fbc50f5f08a569355742e4d22b739151405 (diff) | |
| parent | c1716a35e359cf9b2e8d1b75cc4f0bac413bee5b (diff) | |
Merge remote-tracking branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values-zh-rCN')
| -rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 5b65d7bf7..8c41f1950 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -74,7 +74,6 @@ <string name="clear_conversation_history">清除会话记录</string> <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string> <string name="delete_messages">删除消息</string> - <string name="also_end_conversation">之后结束该会话</string> <string name="choose_presence">添加在线用户至联系人</string> <string name="send_otr_message">发送 OTR 加密信息</string> <string name="send_pgp_message">发送 OpenPGP 加密信息</string> |