diff options
| author | Christian S <christian@pix-art.de> | 2015-07-20 23:18:29 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-20 23:18:29 +0200 |
| commit | cdb4ae69eada7176d3faa0a8e9bc07a4e2da3473 (patch) | |
| tree | 066721d8c11357d519d4f83e51aec60da7722ead /src/main/res/values-zh-rCN/strings.xml | |
| parent | db96dd689b185e12c19a3a64dc9081c098247d44 (diff) | |
move typing info to ActionBar subtitle
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 528afed72..ab3f2fe9e 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -288,11 +288,7 @@ <string name="conference_members_only">此讨论组只允许成员加入</string> <string name="conference_kicked">你被从此讨论组踢出</string> <string name="using_account">用账户 %s</string> -<<<<<<< HEAD - <string name="checking_file">正在 HTTP 托管中检查图片</string> <string name="image_file_deleted">此图片已经被删除</string> -======= ->>>>>>> 4f62793a67415e91f589924b70fdd5bdd35c284d <string name="not_connected_try_again">你没有连接。请稍后重试</string> <string name="message_options">消息选项</string> <string name="copy_text">拷贝文本</string> |