[tx-robot] updated from transifex

5 files changed, 428 insertions, 273 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 46282f4b063..563f9b3583b 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# hanfeng <appweb.cn@gmail.com>, 2013
 # Xuetian Weng <wengxt@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+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"
@@ -30,10 +31,6 @@ msgstr "%s 向您分享了 »%s«"
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
 
-#: ajax/share.php:327
-msgid "group"
-msgstr "组"
-
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
 msgstr "启用维护模式"
@@ -65,11 +62,11 @@ msgstr ""
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "未知的文件类型"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "无效的图像"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -270,144 +267,148 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
-#: js/share.js:30 js/share.js:45 js/share.js:87
+#: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "已共享"
 
-#: js/share.js:90
+#: js/share.js:109
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:130 js/share.js:143 js/share.js:150 js/share.js:667
-#: js/share.js:679
+#: js/share.js:149 js/share.js:162 js/share.js:169 js/share.js:676
+#: js/share.js:688
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:132 js/share.js:707
+#: js/share.js:151 js/share.js:716
 msgid "Error while sharing"
 msgstr "共享时出错"
 
-#: js/share.js:143
+#: js/share.js:162
 msgid "Error while unsharing"
 msgstr "取消共享时出错"
 
-#: js/share.js:150
+#: js/share.js:169
 msgid "Error while changing permissions"
 msgstr "修改权限时出错"
 
-#: js/share.js:159
+#: js/share.js:178
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 共享给您及 {group} 组"
 
-#: js/share.js:161
+#: js/share.js:180
 msgid "Shared with you by {owner}"
 msgstr "{owner} 与您共享"
 
-#: js/share.js:184
-msgid "Share with"
-msgstr "分享之"
+#: js/share.js:203
+msgid "Share with user or group …"
+msgstr ""
 
-#: js/share.js:189
-msgid "Share with link"
-msgstr "共享链接"
+#: js/share.js:209
+msgid "Share link"
+msgstr ""
 
-#: js/share.js:192
+#: js/share.js:212
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:194 templates/installation.php:57 templates/login.php:32
+#: js/share.js:214 templates/installation.php:57 templates/login.php:32
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:199
+#: js/share.js:219
 msgid "Allow Public Upload"
 msgstr "允许公开上传"
 
-#: js/share.js:203
+#: js/share.js:223
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:204
+#: js/share.js:224
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:209
+#: js/share.js:229
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:210
+#: js/share.js:230
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:243
+#: js/share.js:263
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:246
+#: js/share.js:266
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:284
+#: js/share.js:295 js/share.js:332
+msgid "group"
+msgstr "组"
+
+#: js/share.js:306
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:320
+#: js/share.js:348
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:341
+#: js/share.js:370
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:353
-msgid "notify user by email"
+#: js/share.js:378
+msgid "notify by email"
 msgstr ""
 
-#: js/share.js:361
+#: js/share.js:381
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:363
+#: js/share.js:383
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:366
+#: js/share.js:386
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:369
+#: js/share.js:389
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:372
+#: js/share.js:392
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:375
+#: js/share.js:395
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:409 js/share.js:654
+#: js/share.js:437 js/share.js:663
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:667
+#: js/share.js:676
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:679
+#: js/share.js:688
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:694
+#: js/share.js:703
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:705
+#: js/share.js:714
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:729
+#: js/share.js:738
 msgid "Warning"
 msgstr "警告"
 
@@ -519,7 +520,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7 templates/layout.user.php:109
+#: strings.php:7 templates/layout.user.php:110
 msgid "Apps"
 msgstr "应用"
 
@@ -677,12 +678,12 @@ msgstr "安装完成"
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:42
+#: templates/layout.user.php:43
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:70
+#: templates/layout.user.php:71
 msgid "Log out"
 msgstr "注销"
 
@@ -736,7 +737,26 @@ msgstr ""
 msgid "The share will expire on %s.<br><br>"
 msgstr ""
 
-#: templates/update.php:3
+#: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "更新 ownCloud 到版本 %s，这可能需要一些时间。"
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
+
+#: templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index eb4a0fef3e9..64d7fdca662 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: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-16 00:26-0400\n"
-"PO-Revision-Date: 2013-10-14 00:41+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+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"
@@ -30,62 +30,102 @@ msgstr "无法移动 %s - 同名文件已存在"
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/upload.php:16 ajax/upload.php:45
+#: ajax/newfile.php:56
+msgid "File name cannot not be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+msgid "File name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:81
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:94
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:127
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot not be empty."
+msgstr ""
+
+#: ajax/newfolder.php:27
+msgid "Folder name must not contain \"/\". Please choose a different name."
+msgstr ""
+
+#: ajax/newfolder.php:56
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:18 ajax/upload.php:50
 msgid "Unable to set upload directory."
 msgstr "无法设置上传文件夹。"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:27
 msgid "Invalid Token"
 msgstr "无效密匙"
 
-#: ajax/upload.php:59
+#: ajax/upload.php:64
 msgid "No file was uploaded. Unknown error"
 msgstr "没有文件被上传。未知错误"
 
-#: ajax/upload.php:66
+#: ajax/upload.php:71
 msgid "There is no error, the file uploaded with success"
 msgstr "文件上传成功，没有错误发生"
 
-#: ajax/upload.php:67
+#: ajax/upload.php:72
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:74
 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:70
+#: ajax/upload.php:75
 msgid "The uploaded file was only partially uploaded"
 msgstr "已上传文件只上传了部分（不完整）"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:76
 msgid "No file was uploaded"
 msgstr "没有文件被上传"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:77
 msgid "Missing a temporary folder"
 msgstr "缺少临时目录"
 
-#: ajax/upload.php:73
+#: ajax/upload.php:78
 msgid "Failed to write to disk"
 msgstr "写入磁盘失败"
 
-#: ajax/upload.php:91
+#: ajax/upload.php:96
 msgid "Not enough storage available"
 msgstr "没有足够的存储空间"
 
-#: ajax/upload.php:122 ajax/upload.php:148
+#: ajax/upload.php:127 ajax/upload.php:153
 msgid "Upload failed. Could not get file info."
 msgstr ""
 
-#: ajax/upload.php:138
+#: ajax/upload.php:143
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:165
+#: ajax/upload.php:170
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
@@ -93,94 +133,90 @@ msgstr "无效文件夹。"
 msgid "Files"
 msgstr "文件"
 
-#: js/file-upload.js:224
+#: js/file-upload.js:228
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:235
+#: js/file-upload.js:239
 msgid "Not enough space available"
 msgstr "没有足够可用空间"
 
-#: js/file-upload.js:302
+#: js/file-upload.js:306
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/file-upload.js:336
+#: js/file-upload.js:340
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:426
+#: js/file-upload.js:432
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
-#: js/file-upload.js:500
-msgid "URL cannot be empty."
-msgstr "URL不能为空"
+#: js/file-upload.js:511
+msgid "URL cannot be empty"
+msgstr ""
 
-#: js/file-upload.js:505 lib/app.php:53
-msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
+#: js/file-upload.js:515 js/filelist.js:361
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
 
-#: js/file-upload.js:540 js/file-upload.js:556 js/files.js:518 js/files.js:556
-msgid "Error"
-msgstr "错误"
+#: js/file-upload.js:517 js/filelist.js:363
+msgid "{new_name} already exists"
+msgstr "{new_name} 已存在"
+
+#: js/file-upload.js:576
+msgid "Could not create file"
+msgstr ""
 
-#: js/fileactions.js:119
+#: js/file-upload.js:592
+msgid "Could not create folder"
+msgstr ""
+
+#: js/fileactions.js:125
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:131
+#: js/fileactions.js:137
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/fileactions.js:184
+#: js/fileactions.js:194
 msgid "Rename"
 msgstr "重命名"
 
-#: js/filelist.js:71 js/filelist.js:74 js/filelist.js:789
+#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:850
 msgid "Pending"
 msgstr "等待"
 
-#: js/filelist.js:416 js/filelist.js:418
-msgid "{new_name} already exists"
-msgstr "{new_name} 已存在"
-
-#: js/filelist.js:416 js/filelist.js:418
-msgid "replace"
-msgstr "替换"
-
-#: js/filelist.js:416
-msgid "suggest name"
-msgstr "建议名称"
-
-#: js/filelist.js:416 js/filelist.js:418
-msgid "cancel"
-msgstr "取消"
+#: js/filelist.js:389
+msgid "Could not rename file"
+msgstr ""
 
-#: js/filelist.js:463
+#: js/filelist.js:508
 msgid "replaced {new_name} with {old_name}"
 msgstr "已将 {old_name}替换成 {new_name}"
 
-#: js/filelist.js:463
+#: js/filelist.js:508
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:587
+#: js/filelist.js:579 js/filelist.js:645 js/files.js:587
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:593
+#: js/filelist.js:580 js/filelist.js:646 js/files.js:593
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: js/filelist.js:541
+#: js/filelist.js:587
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:732 js/filelist.js:770
+#: js/filelist.js:789 js/filelist.js:827
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -189,53 +225,57 @@ msgstr[0] ""
 msgid "'.' is an invalid file name."
 msgstr "'.' 是一个无效的文件名。"
 
-#: js/files.js:29
+#: js/files.js:27
 msgid "File name cannot be empty."
 msgstr "文件名不能为空。"
 
-#: js/files.js:37
+#: js/files.js:34
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
-#: js/files.js:51
+#: js/files.js:46
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "您的存储空间已满，文件将无法更新或同步！"
 
-#: js/files.js:55
+#: js/files.js:50
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:68
+#: js/files.js:63
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:72
+#: js/files.js:67
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:76
+#: js/files.js:71
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:307
+#: js/files.js:302
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:518 js/files.js:556
+#: js/files.js:514 js/files.js:552
 msgid "Error moving file"
 msgstr ""
 
+#: js/files.js:514 js/files.js:552
+msgid "Error"
+msgstr "错误"
+
 #: js/files.js:569 templates/index.php:56
 msgid "Name"
 msgstr "名称"
@@ -248,7 +288,11 @@ msgstr "大小"
 msgid "Modified"
 msgstr "修改日期"
 
-#: lib/app.php:73
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
+
+#: lib/app.php:88
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
@@ -314,8 +358,8 @@ msgid "Cancel upload"
 msgstr "取消上传"
 
 #: templates/index.php:40
-msgid "You don’t have write permissions here."
-msgstr "您没有写权限"
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
 
 #: templates/index.php:45
 msgid "Nothing in here. Upload something!"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 7358a8ace13..565eec293a6 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-17 13:47-0400\n"
-"PO-Revision-Date: 2013-10-17 17:47+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-26 13:20+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"
@@ -27,42 +27,42 @@ msgid ""
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:254
+#: private/app.php:255
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:359
+#: private/app.php:360
 msgid "Help"
 msgstr "帮助"
 
-#: private/app.php:372
+#: private/app.php:373
 msgid "Personal"
 msgstr "个人"
 
-#: private/app.php:383
+#: private/app.php:384
 msgid "Settings"
 msgstr "设置"
 
-#: private/app.php:395
+#: private/app.php:396
 msgid "Users"
 msgstr "用户"
 
-#: private/app.php:408
+#: private/app.php:409
 msgid "Admin"
 msgstr "管理"
 
-#: private/app.php:872
+#: private/app.php:873
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
 #: private/avatar.php:60
 msgid "Unknown filetype"
-msgstr ""
+msgstr "未知的文件类型"
 
 #: private/avatar.php:65
 msgid "Invalid image"
-msgstr ""
+msgstr "无效的图像"
 
 #: private/defaults.php:36
 msgid "web services under your control"
@@ -287,50 +287,50 @@ msgstr "请认真检查<a href='%s'>安装指南</a>."
 msgid "Could not find category \"%s\""
 msgstr "无法找到分类 \"%s\""
 
-#: private/template/functions.php:122
+#: private/template/functions.php:130
 msgid "seconds ago"
 msgstr "秒前"
 
-#: private/template/functions.php:123
+#: private/template/functions.php:131
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: private/template/functions.php:124
+#: private/template/functions.php:132
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: private/template/functions.php:125
+#: private/template/functions.php:133
 msgid "today"
 msgstr "今天"
 
-#: private/template/functions.php:126
+#: private/template/functions.php:134
 msgid "yesterday"
 msgstr "昨天"
 
-#: private/template/functions.php:128
+#: private/template/functions.php:136
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:138
 msgid "last month"
 msgstr "上月"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:139
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:141
 msgid "last year"
 msgstr "去年"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:142
 msgid "years ago"
 msgstr "年前"
 
-#: private/template.php:297
+#: private/template.php:297 public/util.php:103
 msgid "Caused by:"
 msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9eb78f65d97..8227ba35c33 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:01+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:28+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"
@@ -215,6 +215,10 @@ msgstr "创建用户出错"
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
+#: js/users.js:472
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
 #: personal.php:45 personal.php:46
 msgid "__language_name__"
 msgstr "简体中文"
@@ -543,9 +547,9 @@ msgstr "WebDAV"
 #: templates/personal.php:135
 #, php-format
 msgid ""
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" "
-"target=\"_blank\">access your Files via WebDAV</a>"
-msgstr "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>"
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
 
 #: templates/personal.php:146
 msgid "Encryption"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index d3df2b84ca7..a1e1cd49ccb 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-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
+"POT-Creation-Date: 2013-10-27 02:28-0400\n"
+"PO-Revision-Date: 2013-10-27 06:30+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"
@@ -42,298 +42,393 @@ msgid ""
 "details."
 msgstr "配置无效。更多细节请查看 ownCloud 日志。"
 
-#: js/settings.js:66
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:78
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:86
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
 msgid "Deletion failed"
 msgstr "删除失败"
 
-#: js/settings.js:82
+#: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
 msgstr "从近期的服务器配置中导入设置？"
 
-#: js/settings.js:83
+#: js/settings.js:84
 msgid "Keep settings?"
 msgstr "保留设置吗？"
 
-#: js/settings.js:97
+#: js/settings.js:99
 msgid "Cannot add server configuration"
 msgstr "无法添加服务器配置"
 
-#: js/settings.js:111
+#: js/settings.js:113
 msgid "mappings cleared"
 msgstr "清除映射"
 
-#: js/settings.js:112
+#: js/settings.js:114
 msgid "Success"
 msgstr "成功"
 
-#: js/settings.js:117
+#: js/settings.js:119
 msgid "Error"
 msgstr "错误"
 
-#: js/settings.js:141
+#: js/settings.js:660 js/settings.js:669
+msgid "Select groups"
+msgstr "选择分组"
+
+#: js/settings.js:663 js/settings.js:672
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:666
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:694
 msgid "Connection test succeeded"
 msgstr "连接测试成功"
 
-#: js/settings.js:146
+#: js/settings.js:699
 msgid "Connection test failed"
 msgstr "连接测试失败"
 
-#: js/settings.js:156
+#: js/settings.js:709
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的想要删除当前服务器配置吗？"
 
-#: js/settings.js:157
+#: js/settings.js:710
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
-#: templates/settings.php:9
-msgid ""
-"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
-" experience unexpected behavior. Please ask your system administrator to "
-"disable one of them."
+#: lib/wizard.php:78 lib/wizard.php:92
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+
+#: lib/wizard.php:123
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+
+#: lib/wizard.php:752 lib/wizard.php:764
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:910
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr "测试配置"
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:13
+msgid "Help"
+msgstr "帮助"
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Limit the access to %s to groups meeting this criteria:"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
 msgid ""
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
-"work. Please ask your system administrator to install it."
-msgstr "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。"
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
 
-#: templates/settings.php:16
-msgid "Server configuration"
-msgstr "服务器配置"
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
 
-#: templates/settings.php:32
+#: templates/part.wizard-loginfilter.php:4
+msgid "What attribute shall be used as login name:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
 msgstr "添加服务器配置"
 
-#: templates/settings.php:37
+#: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:39
+#: templates/part.wizard-server.php:31
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头"
 
-#: templates/settings.php:40
-msgid "Base DN"
-msgstr "Base DN"
-
-#: templates/settings.php:41
-msgid "One Base DN per line"
-msgstr "每行一个基本判别名"
-
-#: templates/settings.php:42
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "您可以在高级选项卡里为用户和组指定Base DN"
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr "端口"
 
-#: templates/settings.php:44
+#: templates/part.wizard-server.php:44
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:46
+#: templates/part.wizard-server.php:45
 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 "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:47
+#: templates/part.wizard-server.php:52
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:50
+#: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "启用匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:51
-msgid "User Login Filter"
-msgstr "用户登录过滤"
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr "每行一个基本判别名"
 
-#: templates/settings.php:54
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr "您可以在高级选项卡里为用户和组指定Base DN"
+
+#: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
+msgid "Limit the access to %s to users meeting this criteria:"
 msgstr ""
 
-#: templates/settings.php:55
-msgid "User List Filter"
-msgstr "用户列表过滤"
-
-#: templates/settings.php:58
+#: templates/part.wizard-userfilter.php:31
+#, php-format
 msgid ""
-"Defines the filter to apply, when retrieving users (no placeholders). "
-"Example: \"objectClass=person\""
+"The filter specifies which LDAP users shall have access to the %s instance."
 msgstr ""
 
-#: templates/settings.php:59
-msgid "Group Filter"
-msgstr "组过滤"
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
 
-#: templates/settings.php:62
+#: templates/part.wizardcontrols.php:4
+msgid "Back"
+msgstr "返回"
+
+#: templates/part.wizardcontrols.php:7
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
 msgid ""
-"Defines the filter to apply, when retrieving groups (no placeholders). "
-"Example: \"objectClass=posixGroup\""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
 msgstr ""
 
-#: templates/settings.php:66
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。"
+
+#: templates/settings.php:20
 msgid "Connection Settings"
 msgstr "连接设置"
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "Configuration Active"
 msgstr "现行配置"
 
-#: templates/settings.php:68
+#: templates/settings.php:22
 msgid "When unchecked, this configuration will be skipped."
 msgstr "当反选后，此配置将被忽略。"
 
-#: templates/settings.php:69
-msgid "Port"
-msgstr "端口"
+#: templates/settings.php:23
+msgid "User Login Filter"
+msgstr "用户登录过滤"
 
-#: templates/settings.php:70
+#: templates/settings.php:26
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:27
 msgid "Backup (Replica) Host"
 msgstr "备份 (镜像) 主机"
 
-#: templates/settings.php:70
+#: templates/settings.php:27
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。"
 
-#: templates/settings.php:71
+#: templates/settings.php:28
 msgid "Backup (Replica) Port"
 msgstr "备份 (镜像) 端口"
 
-#: templates/settings.php:72
+#: templates/settings.php:29
 msgid "Disable Main Server"
 msgstr "禁用主服务器"
 
-#: templates/settings.php:72
+#: templates/settings.php:29
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:73
-msgid "Use TLS"
-msgstr "使用TLS"
-
-#: templates/settings.php:73
-msgid "Do not use it additionally for LDAPS connections, it will fail."
-msgstr "对于 LDAPS 连接不要额外启用它，连接必然失败。"
-
-#: templates/settings.php:74
+#: templates/settings.php:30
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:75
+#: templates/settings.php:31
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:75
+#: templates/settings.php:31
 #, php-format
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
 msgstr ""
 
-#: templates/settings.php:76
+#: templates/settings.php:32
 msgid "Cache Time-To-Live"
 msgstr "缓存存活时间"
 
-#: templates/settings.php:76
+#: templates/settings.php:32
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改将清空缓存。"
 
-#: templates/settings.php:78
+#: templates/settings.php:34
 msgid "Directory Settings"
 msgstr "目录设置"
 
-#: templates/settings.php:80
+#: templates/settings.php:36
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:80
+#: templates/settings.php:36
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:81
+#: templates/settings.php:37
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:81
+#: templates/settings.php:37
 msgid "One User Base DN per line"
 msgstr "每行一个用户基准判别名"
 
-#: templates/settings.php:82
+#: templates/settings.php:38
 msgid "User Search Attributes"
 msgstr "用户搜索属性"
 
-#: templates/settings.php:82 templates/settings.php:85
+#: templates/settings.php:38 templates/settings.php:41
 msgid "Optional; one attribute per line"
 msgstr "可选;每行一个属性"
 
-#: templates/settings.php:83
+#: templates/settings.php:39
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:83
+#: templates/settings.php:39
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:40
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:84
+#: templates/settings.php:40
 msgid "One Group Base DN per line"
 msgstr "每行一个群组基准判别名"
 
-#: templates/settings.php:85
+#: templates/settings.php:41
 msgid "Group Search Attributes"
 msgstr "群组搜索属性"
 
-#: templates/settings.php:86
+#: templates/settings.php:42
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:88
+#: templates/settings.php:44
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:90
+#: templates/settings.php:46
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:91
+#: templates/settings.php:47
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:91
+#: templates/settings.php:47
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:92
+#: templates/settings.php:48
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:93
+#: templates/settings.php:49
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:93
+#: templates/settings.php:49
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:98
+#: templates/settings.php:55
 msgid "Internal Username"
 msgstr "内部用户名"
 
-#: templates/settings.php:99
+#: templates/settings.php:56
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -349,15 +444,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:57
 msgid "Internal Username Attribute:"
 msgstr "内部用户名属性："
 
-#: templates/settings.php:101
+#: templates/settings.php:58
 msgid "Override UUID detection"
 msgstr "超越UUID检测"
 
-#: templates/settings.php:102
+#: templates/settings.php:59
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -368,19 +463,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:103
+#: templates/settings.php:60
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:104
+#: templates/settings.php:61
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:105
+#: templates/settings.php:62
 msgid "Username-LDAP User Mapping"
 msgstr "用户名-LDAP用户映射"
 
-#: templates/settings.php:106
+#: templates/settings.php:63
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -394,18 +489,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:107
+#: templates/settings.php:64
 msgid "Clear Username-LDAP User Mapping"
 msgstr "清除用户-LDAP用户映射"
 
-#: templates/settings.php:107
+#: templates/settings.php:64
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "清除组用户-LDAP级映射"
-
-#: templates/settings.php:109
-msgid "Test Configuration"
-msgstr "测试配置"
-
-#: templates/settings.php:109
-msgid "Help"
-msgstr "帮助"