[tx-robot] updated from transifex

3 files changed, 40 insertions, 31 deletions

diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index ea076b5be39..6610a6233f2 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-14 01:54-0400\n"
-"PO-Revision-Date: 2014-08-13 16:02+0000\n"
+"POT-Creation-Date: 2014-08-15 01:54-0400\n"
+"PO-Revision-Date: 2014-08-15 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"
@@ -62,11 +62,11 @@ msgid ""
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
 #: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:159
-#: lib/app.php:77
+#: lib/app.php:87
 msgid "The target folder has been moved or deleted."
 msgstr "目标文件夹已经被移动或删除。"
 
-#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:86
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:96
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
@@ -171,49 +171,49 @@ msgstr "文件"
 msgid "All files"
 msgstr "全部文件"
 
-#: js/file-upload.js:268
+#: js/file-upload.js:269
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "不能上传文件 {filename} ，由于它是一个目录或者为0字节"
 
-#: js/file-upload.js:281
+#: js/file-upload.js:284
 msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr "总文件大小 {size1} 超过上传限制 {size2}"
 
-#: js/file-upload.js:292
+#: js/file-upload.js:295
 msgid ""
 "Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。"
 
-#: js/file-upload.js:369
+#: js/file-upload.js:372
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:415
+#: js/file-upload.js:418
 msgid "Could not get result from server."
 msgstr "不能从服务器得到结果"
 
-#: js/file-upload.js:499
+#: js/file-upload.js:502
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:564
+#: js/file-upload.js:567
 msgid "URL cannot be empty"
 msgstr "URL不能为空"
 
-#: js/file-upload.js:568 js/filelist.js:1275
+#: js/file-upload.js:571 js/filelist.js:1275
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/file-upload.js:623
+#: js/file-upload.js:626
 msgid "Could not create file"
 msgstr "不能创建文件"
 
-#: js/file-upload.js:639
+#: js/file-upload.js:642
 msgid "Could not create folder"
 msgstr "不能创建文件夹"
 
-#: js/file-upload.js:686
+#: js/file-upload.js:689
 msgid "Error fetching URL"
 msgstr "获取URL出错"
 
@@ -247,7 +247,7 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/filelist.js:680 js/filelist.js:1799
+#: js/filelist.js:680 js/filelist.js:1803
 msgid "Pending"
 msgstr "等待"
 
@@ -267,33 +267,33 @@ msgstr "错误"
 msgid "Could not rename file"
 msgstr "不能重命名文件"
 
-#: js/filelist.js:1441
+#: js/filelist.js:1445
 msgid "Error deleting file."
 msgstr "删除文件出错。"
 
-#: js/filelist.js:1544 templates/list.php:61
+#: js/filelist.js:1548 templates/list.php:61
 msgid "Name"
 msgstr "名称"
 
-#: js/filelist.js:1545 templates/list.php:72
+#: js/filelist.js:1549 templates/list.php:72
 msgid "Size"
 msgstr "大小"
 
-#: js/filelist.js:1546 templates/list.php:75
+#: js/filelist.js:1550 templates/list.php:75
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/filelist.js:1556 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1560 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:1562 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1566 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:1692 js/filelist.js:1731
+#: js/filelist.js:1696 js/filelist.js:1735
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "上传 %n 个文件"
@@ -333,7 +333,12 @@ msgstr "加密是被禁用的，但是您的文件还是被加密了。请到您
 msgid "{dirs} and {files}"
 msgstr "{dirs} 和 {files}"
 
-#: lib/app.php:103
+#: lib/app.php:80
+#, php-format
+msgid "%s could not be renamed as it has been deleted"
+msgstr ""
+
+#: lib/app.php:113
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 9c4370dbd45..63eb3e70d86 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-14 01:54-0400\n"
-"PO-Revision-Date: 2014-08-13 16:02+0000\n"
-"Last-Translator: Kaijia Feng <fengkaijia@gmail.com>\n"
+"POT-Creation-Date: 2014-08-15 01:54-0400\n"
+"PO-Revision-Date: 2014-08-15 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"
@@ -25,7 +25,11 @@ msgstr ""
 msgid "Server to server sharing is not enabled on this server"
 msgstr "此服务器未启用服务器到服务器分享功能"
 
-#: ajax/external.php:47
+#: ajax/external.php:38
+msgid "Invalid or untrusted ssl certificate"
+msgstr ""
+
+#: ajax/external.php:52
 msgid "Couldn't add remote share"
 msgstr "无法添加远程分享"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index c2ce713162b..0d7dd4d6779 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-12 01:54-0400\n"
-"PO-Revision-Date: 2014-08-12 05:54+0000\n"
+"POT-Creation-Date: 2014-08-15 01:54-0400\n"
+"PO-Revision-Date: 2014-08-15 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"
@@ -507,7 +507,7 @@ msgstr ""
 
 #: templates/admin.php:150
 msgid ""
-"PHP charset is not set to UTF-8. This can cause major issues with non-acsii "
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII "
 "characters in file names. We highly recommend to change the value of "
 "'default_charset' php.ini to 'UTF-8'."
 msgstr ""