Merge pull request #172 from owncloud/login_view_layout_improvements

[pub/Android/ownCloud.git] / res / values-zh-rCN / strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e85f14a..a0437a5 100644 (file)
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -106,6 +106,8 @@
   <string name="sync_fail_ticker">同步失败</string>
   <string name="sync_fail_content"> %1$s同步未完成。</string>
   <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>
   <string name="sync_fail_ticker">同步失败</string>
   <string name="sync_fail_content"> %1$s同步未完成。</string>
   <string name="sync_conflicts_in_favourites_ticker">发现冲突</string>

+  <string name="sync_conflicts_in_favourites_content">%1$d 文件无法同步</string>
+  <string name="sync_fail_in_favourites_ticker">文件同步失败</string>

   <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
   <string name="use_ssl">使用安全链接</string>
   <string name="location_no_provider">ownCloud不能跟踪你的设备。请检查你的位置设置。</string>
   <string name="sync_fail_in_favourites_content">无法同步 %1$d 文件内容(与 %2$d 冲突)</string>
   <string name="use_ssl">使用安全链接</string>
   <string name="location_no_provider">ownCloud不能跟踪你的设备。请检查你的位置设置。</string>


@@ -208,6 +210,7 @@
   <string name="ssl_validator_label_signature_algorithm">算法：</string>
   <string name="text_placeholder">占位符一枚</string>
   <string name="instant_upload_on_wifi">仅通过WIFI上传图片。</string>
   <string name="ssl_validator_label_signature_algorithm">算法：</string>
   <string name="text_placeholder">占位符一枚</string>
   <string name="instant_upload_on_wifi">仅通过WIFI上传图片。</string>

+  <string name="instant_upload_path">/InstantUpload</string>

   <string name="conflict_title">上传冲突</string>
   <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
   <string name="conflict_keep_both">保留两者</string>
   <string name="conflict_title">上传冲突</string>
   <string name="conflict_message">远程文件 %s 未与本地文件同步。继续将替换服务器上的文件内容。</string>
   <string name="conflict_keep_both">保留两者</string>