2 files changed, 43 insertions, 43 deletions
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 428eaa941b3..1993d8aed9a 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ msgstr "没有分类添加了?"
 msgid "This category already exists: "
 msgstr "这个分类已经存在了:"
 
-#: js/jquery-ui-1.8.16.custom.min.js:511
-msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "十二月"
 
@@ -114,7 +110,7 @@ msgstr "错误"
 msgid "ownCloud password reset"
 msgstr "私有云密码重置"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用下面的链接来重置你的密码:{link}"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 00bdb62e96f..3224b4b01df 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+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"
@@ -56,31 +56,35 @@ msgstr "文件"
 msgid "Delete"
 msgstr "删除"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "已经存在了"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "替换过了"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "随着"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "随着"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "删除"
 
@@ -96,44 +100,44 @@ msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大�
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pending"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "文件"