From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 2 Sep 2015 11:06:14 +0000 (-0400)
Subject: [tx-robot] updated from transifex
X-Git-Tag: oc-android-1.8~24
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2b001a8bf288aac751418f1d4d3418bd8d3e4d5d?ds=inline;hp=--cc

[tx-robot] updated from transifex
---

2b001a8bf288aac751418f1d4d3418bd8d3e4d5d
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fc58f953..f29976da 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -202,6 +202,8 @@
   <string name="confirmation_remove_folder_alert">您确定要删除 %1$s 及其内容吗？</string>
   <string name="confirmation_remove_local">仅本地</string>
   <string name="confirmation_remove_folder_local">仅本地</string>
+  <string name="confirmation_remove_remote">来自服务器</string>
+  <string name="confirmation_remove_remote_and_local">远程 &amp; 本地</string>
   <string name="remove_success_msg">成功删除</string>
   <string name="remove_fail_msg">无法完成删除</string>
   <string name="rename_dialog_title">请输出新的名字</string>
@@ -256,6 +258,8 @@
   <string name="conflict_title">文件冲突</string>
   <string name="conflict_message">您想要保留哪个文件？如果您同时选中了两个版本，本地的文件的文件名将被加上一个数字</string>
   <string name="conflict_keep_both">保留两者</string>
+  <string name="conflict_use_local_version">本地版本</string>
+  <string name="conflict_use_server_version">服务器版本</string>
   <string name="preview_image_description">图片预览</string>
   <string name="preview_image_error_unknown_format">无法显示图片</string>
   <string name="error__upload__local_file_not_copied">无法复制 %1$s 到本地目录 %2$s</string>