8 files changed, 126 insertions, 105 deletions
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index cf859bcc04f..2c536e6781c 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:14+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-29 00:03+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"
@@ -226,8 +226,8 @@ msgstr "未指定对象类型。"
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
 #: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
-#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
-#: js/share.js:589
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:618
+#: js/share.js:630
 msgid "Error"
 msgstr "错误"
 
@@ -247,7 +247,7 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:125 js/share.js:617
+#: js/share.js:125 js/share.js:658
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -267,99 +267,103 @@ msgstr "{owner}共享给您及{group}组"
 msgid "Shared with you by {owner}"
 msgstr " {owner}与您共享"
 
-#: js/share.js:159
+#: js/share.js:172
 msgid "Share with"
 msgstr "分享之"
 
-#: js/share.js:164
+#: js/share.js:177
 msgid "Share with link"
 msgstr "共享链接"
 
-#: js/share.js:167
+#: js/share.js:180
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+#: js/share.js:182 templates/installation.php:54 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:173
+#: js/share.js:186
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:174
+#: js/share.js:190
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:179
+#: js/share.js:196
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:211
+#: js/share.js:228
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:213
+#: js/share.js:230
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:251
+#: js/share.js:268
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:287
+#: js/share.js:304
 msgid "Shared in {item} with {user}"
 msgstr "在{item} 与 {user}共享。"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:320
+#: js/share.js:337
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:325
+#: js/share.js:342
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:328
+#: js/share.js:345
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:331
+#: js/share.js:348
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:334
+#: js/share.js:351
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:368 js/share.js:564
+#: js/share.js:385 js/share.js:605
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:577
+#: js/share.js:618
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:589
+#: js/share.js:630
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:604
+#: js/share.js:645
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:615
+#: js/share.js:656
 msgid "Email sent"
 msgstr "邮件已发送"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 2fe5f4dd9c8..5a39c5d3ebd 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:15+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-29 00:04+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,46 +28,54 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/upload.php:19
+#: ajax/upload.php:16 ajax/upload.php:39
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:23
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:55
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:62
 msgid "There is no error, the file uploaded with success"
 msgstr "文件上传成功，没有错误发生"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:63
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:65
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
 
-#: ajax/upload.php:30
+#: ajax/upload.php:66
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分（不完整）"
 
-#: ajax/upload.php:31
+#: ajax/upload.php:67
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/upload.php:32
+#: ajax/upload.php:68
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:33
+#: ajax/upload.php:69
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: ajax/upload.php:51
+#: ajax/upload.php:87
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:83
+#: ajax/upload.php:119
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -75,6 +83,36 @@ msgstr "无效文件夹。"
 msgid "Files"
 msgstr "文件"
 
+#: js/file-upload.js:11
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "无法上传您的文件，文件夹或者空文件"
+
+#: js/file-upload.js:24
+msgid "Not enough space available"
+msgstr "没有足够可用空间"
+
+#: js/file-upload.js:64
+msgid "Upload cancelled."
+msgstr "上传已取消"
+
+#: js/file-upload.js:167 js/files.js:266
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
+
+#: js/file-upload.js:233 js/files.js:339
+msgid "URL cannot be empty."
+msgstr "URL不能为空"
+
+#: js/file-upload.js:238 lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
+
+#: js/file-upload.js:267 js/file-upload.js:283 js/files.js:373 js/files.js:389
+#: js/files.js:693 js/files.js:731
+msgid "Error"
+msgstr "错误"
+
 #: js/fileactions.js:116
 msgid "Share"
 msgstr "分享"
@@ -91,43 +129,43 @@ msgstr "删除"
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:433
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:271 js/filelist.js:273
 msgid "{new_name} already exists"
 msgstr "{new_name} 已存在"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:271 js/filelist.js:273
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:259
+#: js/filelist.js:271
 msgid "suggest name"
 msgstr "建议名称"
 
-#: js/filelist.js:259 js/filelist.js:261
+#: js/filelist.js:271 js/filelist.js:273
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:306
+#: js/filelist.js:318
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:306
+#: js/filelist.js:318
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:331
+#: js/filelist.js:343
 msgid "perform delete operation"
 msgstr "进行删除操作"
 
-#: js/filelist.js:413
+#: js/filelist.js:425
 msgid "1 file uploading"
 msgstr "1个文件上传中"
 
-#: js/filelist.js:416 js/filelist.js:470
+#: js/filelist.js:428 js/filelist.js:486
 msgid "files uploading"
 msgstr "文件上传中"
 
@@ -159,67 +197,38 @@ msgid ""
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:264
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "无法上传您的文件，文件夹或者空文件"
-
-#: js/files.js:277
-msgid "Not enough space available"
-msgstr "没有足够可用空间"
-
-#: js/files.js:317
-msgid "Upload cancelled."
-msgstr "上传已取消"
-
-#: js/files.js:413
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-
-#: js/files.js:486
-msgid "URL cannot be empty."
-msgstr "URL不能为空"
-
-#: js/files.js:491
+#: js/files.js:344
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
-msgid "Error"
-msgstr "错误"
-
-#: js/files.js:891 templates/index.php:69
+#: js/files.js:744 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:892 templates/index.php:80
+#: js/files.js:745 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:893 templates/index.php:82
+#: js/files.js:746 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:912
+#: js/files.js:765
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:914
+#: js/files.js:767
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:922
+#: js/files.js:775
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:924
+#: js/files.js:777
 msgid "{count} files"
 msgstr "{count} 个文件"
 
-#: lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
-
 #: lib/app.php:73
 msgid "Unable to rename file"
 msgstr "无法重命名文件"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 37924fa6220..90a86e2f091 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:15+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-28 23:25+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"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index bd4527b0b3d..bc3420fa1eb 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:15+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-29 00:04+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"
@@ -25,20 +25,28 @@ msgstr "密码"
 msgid "Submit"
 msgstr "提交"
 
-#: templates/public.php:10
+#: templates/public.php:14
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr "%s与您共享了%s文件夹"
 
-#: templates/public.php:13
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr "%s与您共享了%s文件"
 
-#: templates/public.php:19 templates/public.php:43
+#: templates/public.php:25 templates/public.php:83
 msgid "Download"
 msgstr "下载"
 
-#: templates/public.php:40
+#: templates/public.php:41
+msgid "Upload"
+msgstr ""
+
+#: templates/public.php:51
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/public.php:80
 msgid "No preview available for"
 msgstr "没有预览"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 4f9b8f4464a..9190b6e0d14 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:15+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-28 23:25+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"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index d6dd4f2e1ab..04503ab5086 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:15+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-28 23:25+0000\n"
 "Last-Translator: modokwang <modokwang@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index c374a790f0b..50d71d1370a 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:15+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-28 23:25+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"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index e9d8ec160bd..02d810e6934 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-28 01:58+0200\n"
-"PO-Revision-Date: 2013-06-27 23:16+0000\n"
+"POT-Creation-Date: 2013-06-29 02:03+0200\n"
+"PO-Revision-Date: 2013-06-28 23:25+0000\n"
 "Last-Translator: modokwang <modokwang@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"