[tx-robot] updated from transifex

3 files changed, 45 insertions, 45 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 646962f3e38..b3869067f91 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-05 01:54-0400\n"
-"PO-Revision-Date: 2014-07-05 02:50+0000\n"
+"POT-Creation-Date: 2014-07-09 01:54-0400\n"
+"PO-Revision-Date: 2014-07-08 06:12+0000\n"
 "Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -175,47 +175,47 @@ msgstr "声音"
 msgid "Saving..."
 msgstr "保存中"
 
-#: js/js.js:1276
+#: js/js.js:1278
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:1277
+#: js/js.js:1279
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: js/js.js:1278
+#: js/js.js:1280
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: js/js.js:1279
+#: js/js.js:1281
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:1280
+#: js/js.js:1282
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:1281
+#: js/js.js:1283
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:1282
+#: js/js.js:1284
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:1283
+#: js/js.js:1285
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: js/js.js:1284
+#: js/js.js:1286
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:1285
+#: js/js.js:1287
 msgid "years ago"
 msgstr "年前"
 
@@ -250,94 +250,94 @@ msgstr "重置密码"
 msgid "Password can not be changed. Please contact your administrator."
 msgstr "无法修改密码，请联系管理员。"
 
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
-msgid "Yes"
-msgstr "是"
-
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
+#: js/oc-dialogs.js:108 js/oc-dialogs.js:255
 msgid "No"
 msgstr "否"
 
-#: js/oc-dialogs.js:204
+#: js/oc-dialogs.js:116 js/oc-dialogs.js:264
+msgid "Yes"
+msgstr "是"
+
+#: js/oc-dialogs.js:202
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: js/oc-dialogs.js:231
+#: js/oc-dialogs.js:229
 msgid "Error loading file picker template: {error}"
 msgstr "加载文件分拣模板出错: {error}"
 
-#: js/oc-dialogs.js:284
+#: js/oc-dialogs.js:282
 msgid "Ok"
 msgstr "好"
 
-#: js/oc-dialogs.js:304
+#: js/oc-dialogs.js:302
 msgid "Error loading message template: {error}"
 msgstr "加载消息模板出错: {error}"
 
-#: js/oc-dialogs.js:432
+#: js/oc-dialogs.js:430
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} 个文件冲突"
 
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:444
 msgid "One file conflict"
 msgstr "1个文件冲突"
 
-#: js/oc-dialogs.js:452
+#: js/oc-dialogs.js:450
 msgid "New Files"
 msgstr "新文件"
 
-#: js/oc-dialogs.js:453
+#: js/oc-dialogs.js:451
 msgid "Already existing files"
 msgstr "已经存在的文件"
 
-#: js/oc-dialogs.js:455
+#: js/oc-dialogs.js:453
 msgid "Which files do you want to keep?"
 msgstr "想要保留哪一个文件呢？"
 
-#: js/oc-dialogs.js:456
+#: js/oc-dialogs.js:454
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "如果同时选择了两个版本，复制的文件名将会增加上一个数字。"
 
-#: js/oc-dialogs.js:464
+#: js/oc-dialogs.js:462
 msgid "Cancel"
 msgstr "取消"
 
-#: js/oc-dialogs.js:474
+#: js/oc-dialogs.js:472
 msgid "Continue"
 msgstr "继续"
 
-#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
+#: js/oc-dialogs.js:519 js/oc-dialogs.js:532
 msgid "(all selected)"
 msgstr "(选中全部)"
 
-#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
+#: js/oc-dialogs.js:522 js/oc-dialogs.js:536
 msgid "({count} selected)"
 msgstr "(选择了{count}个)"
 
-#: js/oc-dialogs.js:546
+#: js/oc-dialogs.js:544
 msgid "Error loading file exists template"
 msgstr "加载文件存在性模板失败"
 
-#: js/setup.js:92
+#: js/setup.js:96
 msgid "Very weak password"
 msgstr "非常弱的密码"
 
-#: js/setup.js:93
+#: js/setup.js:97
 msgid "Weak password"
 msgstr "弱密码"
 
-#: js/setup.js:94
+#: js/setup.js:98
 msgid "So-so password"
 msgstr "一般强度的密码"
 
-#: js/setup.js:95
+#: js/setup.js:99
 msgid "Good password"
 msgstr "较强的密码"
 
-#: js/setup.js:96
+#: js/setup.js:100
 msgid "Strong password"
 msgstr "强密码"
 
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index cbd46992898..8da10853556 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-08 01:54-0400\n"
-"PO-Revision-Date: 2014-07-08 05:54+0000\n"
+"POT-Creation-Date: 2014-07-09 01:54-0400\n"
+"PO-Revision-Date: 2014-07-08 06:12+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr ""
 
 #: js/external.js:76
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #: js/external.js:77
 msgid "Add remote share"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 6732b2d056c..ac28939bd4b 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-05 01:54-0400\n"
-"PO-Revision-Date: 2014-07-05 02:41+0000\n"
-"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
+"POT-Creation-Date: 2014-07-09 01:54-0400\n"
+"PO-Revision-Date: 2014-07-09 05:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -566,8 +566,8 @@ msgid ""
 msgstr "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。"
 
 #: templates/admin.php:229
-msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr "使用系统 cron 服务每15分钟调用一次 cron.php 文件。"
+msgid "Use system's cron service to call the cron.php file every 15 minutes."
+msgstr ""
 
 #: templates/admin.php:234
 msgid "Sharing"