diff options
| author | Christian S <christian@pix-art.de> | 2015-07-23 12:12:56 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-07-23 12:12:56 +0200 |
| commit | 076beb57e331c76aebba9bc735b57af3a5484ce0 (patch) | |
| tree | ddbaa93e87295c25f0f76f21fb6dbc7c398f40c7 /src/main/res/values-zh-rCN/strings.xml | |
| parent | 14de9d5f595d3f539189e195b58111b4d9d4fb3e (diff) | |
corrected language file
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/values-zh-rCN/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 528afed72..95110d034 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -288,11 +288,8 @@ <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> |