diff options
| author | Christian S <christian@pix-art.de> | 2015-08-26 20:05:42 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-08-26 20:05:42 +0200 |
| commit | b250727089e6ad5d5d26ccf963c57b0cbddc3868 (patch) | |
| tree | ceb391c2b3f7cf098c0dff988e02dd4be941ac5d /src/main/res/values-zh-rCN/strings.xml | |
| parent | c3abe068063fea43b9e1d42955962ea8281049d1 (diff) | |
| parent | 85e35b3a75804203f226219abcfc86582892fb30 (diff) | |
Merge branch 'development'
Diffstat (limited to 'src/main/res/values-zh-rCN/strings.xml')
| -rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 7803f5b27..de8751c51 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -76,7 +76,6 @@ <string name="delete_messages">删除消息</string> <string name="also_end_conversation">之后结束该会话</string> <string name="choose_presence">添加在线用户至联系人</string> - <string name="send_plain_text_message">发送纯文本信息</string> <string name="send_otr_message">发送 OTR 加密信息</string> <string name="send_pgp_message">发送 OpenPGP 加密信息</string> <string name="your_nick_has_been_changed">昵称修改成功</string> @@ -147,7 +146,6 @@ <string name="account_status_regis_not_sup">服务器不支持注册</string> <string name="account_status_security_error">安全错误</string> <string name="account_status_incompatible_server">服务器不兼容</string> - <string name="encryption_choice_none">纯文本内容</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> <string name="mgmt_account_edit">编辑账号</string> |