[tx-robot] updated from transifex

2 files changed, 102 insertions, 49 deletions

diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 19aa6d0c44f..1bc40e3a8f7 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"POT-Creation-Date: 2012-09-26 13:19+0200\n"
+"PO-Revision-Date: 2012-09-26 11:19+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -31,55 +31,55 @@ msgstr "没有分类添加了?"
 msgid "This category already exists: "
 msgstr "这个分类已经存在了:"
 
-#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
+#: js/js.js:213 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:642
+#: js/js.js:645
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:643
+#: js/js.js:646
 msgid "December"
 msgstr "十二月"
 
@@ -107,7 +107,8 @@ msgstr "好的"
 msgid "No categories selected for deletion."
 msgstr "没有选者要删除的分类."
 
-#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:485
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:489
+#: js/share.js:501
 msgid "Error"
 msgstr "错误"
 
@@ -124,12 +125,12 @@ msgid "Error while changing permissions"
 msgstr ""
 
 #: js/share.js:130
-#, perl-format
+#, python-format
 msgid "Shared with you and the group %s by %s"
 msgstr ""
 
 #: js/share.js:132
-#, perl-format
+#, python-format
 msgid "Shared with you by %s"
 msgstr ""
 
@@ -157,57 +158,61 @@ msgstr ""
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:182
-#, perl-format
+#: js/share.js:185
+#, python-format
 msgid "Share via email: %s"
 msgstr ""
 
-#: js/share.js:184
+#: js/share.js:187
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:214
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:246
-#, perl-format
+#: js/share.js:250
+#, python-format
 msgid "Shared in %s with %s"
 msgstr ""
 
-#: js/share.js:267
+#: js/share.js:271
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:279
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:277
+#: js/share.js:281
 msgid "access control"
 msgstr ""
 
-#: js/share.js:280
+#: js/share.js:284
 msgid "create"
 msgstr ""
 
-#: js/share.js:283
+#: js/share.js:287
 msgid "update"
 msgstr ""
 
-#: js/share.js:286
+#: js/share.js:290
 msgid "delete"
 msgstr ""
 
-#: js/share.js:289
+#: js/share.js:293
 msgid "share"
 msgstr ""
 
-#: js/share.js:313 js/share.js:463
+#: js/share.js:317 js/share.js:476
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:485
+#: js/share.js:489
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:501
 msgid "Error setting expiration date"
 msgstr ""
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 237eb0741fc..88323a828af 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:13+0200\n"
-"PO-Revision-Date: 2012-09-21 23:14+0000\n"
+"POT-Creation-Date: 2012-09-26 13:19+0200\n"
+"PO-Revision-Date: 2012-09-26 11:20+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -65,39 +65,39 @@ msgstr "删除"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "already exists"
 msgstr "已经存在了"
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:188
+#: js/filelist.js:190
 msgid "suggest name"
 msgstr "推荐名称"
 
-#: js/filelist.js:188 js/filelist.js:190
+#: js/filelist.js:190 js/filelist.js:192
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:237 js/filelist.js:239
+#: js/filelist.js:239 js/filelist.js:241
 msgid "replaced"
 msgstr "替换过了"
 
-#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273
+#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:239
+#: js/filelist.js:241
 msgid "with"
 msgstr "随着"
 
-#: js/filelist.js:271
+#: js/filelist.js:273
 msgid "unshared"
 msgstr "已取消共享"
 
-#: js/filelist.js:273
+#: js/filelist.js:275
 msgid "deleted"
 msgstr "删除"
 
@@ -117,7 +117,15 @@ msgstr "上传错误"
 msgid "Pending"
 msgstr "Pending"
 
-#: js/files.js:355
+#: js/files.js:256
+msgid "1 file uploading"
+msgstr ""
+
+#: js/files.js:259 js/files.js:304 js/files.js:319
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:322 js/files.js:355
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
@@ -138,6 +146,10 @@ msgstr "文件已扫描"
 msgid "error while scanning"
 msgstr "扫描出错"
 
+#: js/files.js:748 templates/index.php:48
+msgid "Name"
+msgstr "名字"
+
 #: js/files.js:749 templates/index.php:56
 msgid "Size"
 msgstr "大小"
@@ -162,6 +174,46 @@ msgstr "文件"
 msgid "files"
 msgstr "文件"
 
+#: js/files.js:833
+msgid "seconds ago"
+msgstr ""
+
+#: js/files.js:834
+msgid "minute ago"
+msgstr ""
+
+#: js/files.js:835
+msgid "minutes ago"
+msgstr ""
+
+#: js/files.js:838
+msgid "today"
+msgstr ""
+
+#: js/files.js:839
+msgid "yesterday"
+msgstr ""
+
+#: js/files.js:840
+msgid "days ago"
+msgstr ""
+
+#: js/files.js:841
+msgid "last month"
+msgstr ""
+
+#: js/files.js:843
+msgid "months ago"
+msgstr ""
+
+#: js/files.js:844
+msgid "last year"
+msgstr ""
+
+#: js/files.js:845
+msgid "years ago"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "文件处理中"
@@ -222,10 +274,6 @@ msgstr "取消上传"
 msgid "Nothing in here. Upload something!"
 msgstr "这里没有东西.上传点什么!"
 
-#: templates/index.php:48
-msgid "Name"
-msgstr "名字"
-
 #: templates/index.php:50
 msgid "Share"
 msgstr "分享"