[tx-robot] updated from transifex

9 files changed, 210 insertions, 193 deletions

diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 1993d8aed9a..b5a49cd5b24 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 15:26+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
@@ -30,55 +31,55 @@ msgstr "没有分类添加了?"
 msgid "This category already exists: "
 msgstr "这个分类已经存在了:"
 
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "December"
 msgstr "十二月"
 
@@ -226,7 +227,7 @@ msgstr "数据库用户名"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "数据库表格空间"
 
 #: templates/installation.php:115
 msgid "Database host"
@@ -236,11 +237,11 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "完成安装"
 
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
 msgid "web services under your control"
 msgstr "你控制下的网络服务"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
 msgid "Log out"
 msgstr "注销"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 27fb4d0b39a..bbf13e6f0f2 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-18 00:02+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"
@@ -54,7 +55,7 @@ msgstr "文件"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "取消共享"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -70,7 +71,7 @@ msgstr "替换"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "推荐名称"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -80,7 +81,7 @@ msgstr "取消"
 msgid "replaced"
 msgstr "替换过了"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269
 msgid "undo"
 msgstr "撤销"
 
@@ -88,11 +89,11 @@ msgstr "撤销"
 msgid "with"
 msgstr "随着"
 
-#: js/filelist.js:268
+#: js/filelist.js:267
 msgid "unshared"
-msgstr ""
+msgstr "已取消共享"
 
-#: js/filelist.js:270
+#: js/filelist.js:269
 msgid "deleted"
 msgstr "删除"
 
@@ -119,33 +120,41 @@ msgstr "上传取消了"
 #: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "文件正在上传。关闭页面会取消上传。"
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
-#: js/files.js:746 templates/index.php:56
+#: js/files.js:666
+msgid "files scanned"
+msgstr ""
+
+#: js/files.js:674
+msgid "error while scanning"
+msgstr ""
+
+#: js/files.js:748 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:747 templates/index.php:58
+#: js/files.js:749 templates/index.php:58
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:774
+#: js/files.js:776
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:776
+#: js/files.js:778
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:784
+#: js/files.js:786
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:786
+#: js/files.js:788
 msgid "files"
 msgstr "文件"
 
@@ -179,7 +188,7 @@ msgstr "最大的ZIP文件输入大小"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "保存"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index 2073826c24d..eb4ddd9c548 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -3,32 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 10:51+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "加密"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "从加密中排除如下文件类型"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "启用加密"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 27dfa58801b..4573b7bbddf 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -3,80 +3,81 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 12:25+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "外部存储"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "挂载点"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "后端"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "配置"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "可应用"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "添加挂载点"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "未设置"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "所有用户"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "群组"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL 根证书"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "导入根证书"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "启用用户外部存储"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "允许用户挂载他们的外部存储"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 4fdcb4f36f6..e7446b30595 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/files_sharing.po
@@ -3,36 +3,37 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# marguerite su <i@marguerite.su>, 2012.
 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:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 10:46+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "提交"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "下载"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "没有预览可用于"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "您控制的网络服务"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 82b317a32e1..e2016da8c6d 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-17 02:02+0200\n"
-"PO-Revision-Date: 2012-09-17 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 10:51+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
@@ -19,20 +20,20 @@ msgstr ""
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr ""
+msgstr "作废所有版本"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "版本"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "这将删除所有您现有文件的备份版本"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "文件版本"
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "启用"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 541a462fb8a..4eac71c656e 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.po
@@ -3,123 +3,124 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 12:19+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
-msgstr ""
+msgstr "私人"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
-msgstr ""
+msgstr "设置"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
-msgstr ""
+msgstr "程序"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
-msgstr ""
+msgstr "管理员"
 
 #: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP 下载已关闭"
 
 #: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "需要逐个下载文件。"
 
 #: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "返回到文件"
 
 #: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "选择的文件太大而不能生成 zip 文件。"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "应用未启用"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "验证错误"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "会话过期。请刷新页面。"
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
-msgstr ""
+msgstr "秒前"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 分钟前"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d 分钟前"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
-msgstr ""
+msgstr "今天"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
-msgstr ""
+msgstr "昨天"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d 天前"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
-msgstr ""
+msgstr "上个月"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
-msgstr ""
+msgstr "月前"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
-msgstr ""
+msgstr "去年"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "年前"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s 不可用。获知 <a href=\"%s\">详情</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "最新"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "更新检测已禁用"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 247d5f6e3f8..d6d1b69b01e 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <bluehattree@126.com>, 2012.
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-17 02:03+0200\n"
-"PO-Revision-Date: 2012-09-17 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 15:24+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
@@ -29,15 +30,15 @@ msgstr "认证错误"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "群组已存在"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "未能添加群组"
 
-#: ajax/enableapp.php:13
+#: ajax/enableapp.php:14
 msgid "Could not enable app. "
-msgstr ""
+msgstr "未能启用应用"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -57,11 +58,11 @@ msgstr "非法请求"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "未能删除群组"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "未能删除用户"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -70,12 +71,12 @@ msgstr "语言改变了"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "未能添加用户到群组 %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "未能将用户从群组 %s 移除"
 
 #: js/apps.js:18
 msgid "Error"
@@ -108,7 +109,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "您的数据文件夹和您的文件可能可以从互联网访问。ownCloud 提供的 .htaccess 文件未工作。我们强烈建议您配置您的网络服务器，让数据文件夹不能访问，或将数据文件夹移出网络服务器文档根目录。"
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -116,55 +117,55 @@ msgstr "定时"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "在每个页面载入时执行一项任务"
 
 #: templates/admin.php:43
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php 已作为 webcron 服务注册。owncloud 根用户将通过 http 协议每分钟调用一次 cron.php。"
 
 #: templates/admin.php:49
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php"
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "分享"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
-msgstr ""
+msgstr "启用分享 API"
 
 #: templates/admin.php:62
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "允许应用使用分享 API"
 
 #: templates/admin.php:67
 msgid "Allow links"
-msgstr ""
+msgstr "允许链接"
 
 #: templates/admin.php:68
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "允许用户使用链接与公众分享条目"
 
 #: templates/admin.php:73
 msgid "Allow resharing"
-msgstr ""
+msgstr "允许重复分享"
 
 #: templates/admin.php:74
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "允许用户再次分享已经分享过的条目"
 
 #: templates/admin.php:79
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "允许用户与任何人分享"
 
 #: templates/admin.php:81
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "只允许用户与群组内用户分享"
 
 #: templates/admin.php:88
 msgid "Log"
@@ -182,7 +183,7 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。"
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -198,7 +199,7 @@ msgstr "在owncloud.com上查看应用程序"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
@@ -314,7 +315,7 @@ msgstr "其他的"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "群组管理员"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 67a667a8eea..119c7188675 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -3,168 +3,169 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# marguerite su <i@marguerite.su>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-18 02:01+0200\n"
+"PO-Revision-Date: 2012-09-17 12:39+0000\n"
+"Last-Translator: marguerite su <i@marguerite.su>\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"
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "主机"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "基本判别名"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "用户判别名"
 
 #: templates/settings.php:10
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "匿名访问请留空判别名和密码。"
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "用户登录过滤器"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "用户列表过滤器"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "定义撷取用户时要应用的过滤器。"
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "不能使用占位符，例如 \"objectClass=person\"。"
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "群组过滤器"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "定义撷取群组时要应用的过滤器"
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。"
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "端口"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "基本用户树"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "基本群组树"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "群组-成员组合"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "使用 TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "不要使用它进行 SSL 连接，会失败的。"
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "关闭 SSL 证书校验。"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "不推荐，仅供测试"
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "用户显示名称字段"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "群组显示名称字段"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "以字节计"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "以秒计。修改会清空缓存。"
 
 #: templates/settings.php:30
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "帮助"