[tx-robot] updated from transifex

2 files changed, 30 insertions, 18 deletions

diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index e0a975a63f4..35d1ea5d83f 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-21 15:01+0000\n"
+"POT-Creation-Date: 2013-11-29 14:08-0500\n"
+"PO-Revision-Date: 2013-11-29 19:08+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -154,23 +154,23 @@ msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:519
+#: js/file-upload.js:523
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:523 js/filelist.js:377
+#: js/file-upload.js:527 js/filelist.js:377
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:525 js/filelist.js:379
+#: js/file-upload.js:529 js/filelist.js:379
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/file-upload.js:585
+#: js/file-upload.js:595
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:601
+#: js/file-upload.js:611
 msgid "Could not create folder"
 msgstr ""
 
@@ -186,7 +186,7 @@ msgstr "永久删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:873
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
 msgid "Pending"
 msgstr "等待"
 
@@ -194,33 +194,33 @@ msgstr "等待"
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:524
+#: js/filelist.js:539
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:524
+#: js/filelist.js:539
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:576
+#: js/filelist.js:591
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:594 js/filelist.js:668 js/files.js:631
+#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:595 js/filelist.js:669 js/files.js:637
+#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:602
+#: js/filelist.js:617
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:812 js/filelist.js:850
+#: js/filelist.js:828 js/filelist.js:866
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -292,7 +292,7 @@ msgstr "修改日期"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:88
+#: lib/app.php:101
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
@@ -338,10 +338,18 @@ msgid "New"
 msgstr "新建"
 
 #: templates/index.php:8
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:8
 msgid "Text file"
 msgstr "文本文件"
 
 #: templates/index.php:10
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:10
 msgid "Folder"
 msgstr "文件夹"
 
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index d5185cd250c..bd66314a7c6 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-03 12:38-0500\n"
-"PO-Revision-Date: 2013-11-03 17:38+0000\n"
+"POT-Creation-Date: 2013-11-29 14:08-0500\n"
+"PO-Revision-Date: 2013-11-29 19:09+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -98,6 +98,10 @@ msgstr ""
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
 #: js/settings-admin.js:13
 msgid "Saving..."
 msgstr "保存中"