[tx-robot] updated from transifex

8 files changed, 302 insertions, 233 deletions

diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index f321e4cfc4b..6ccbe49cfa9 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.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-09-22 12:55-0400\n"
-"PO-Revision-Date: 2013-09-20 15:01+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-05 15: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"
@@ -20,12 +20,17 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:97
+#: ajax/share.php:118 ajax/share.php:197
 #, php-format
 msgid "%s shared »%s« with you"
 msgstr "%s 向您分享了 »%s«"
 
-#: ajax/share.php:227
+#: ajax/share.php:168
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/share.php:327
 msgid "group"
 msgstr "组"
 
@@ -312,8 +317,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:129 js/share.js:142 js/share.js:149
-#: js/share.js:645 js/share.js:657
+#: js/oc-vcategories.js:199 js/share.js:130 js/share.js:143 js/share.js:150
+#: js/share.js:665 js/share.js:677
 msgid "Error"
 msgstr "错误"
 
@@ -333,126 +338,134 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:131 js/share.js:685
+#: js/share.js:132 js/share.js:705
 msgid "Error while sharing"
 msgstr "共享时出错"
 
-#: js/share.js:142
+#: js/share.js:143
 msgid "Error while unsharing"
 msgstr "取消共享时出错"
 
-#: js/share.js:149
+#: js/share.js:150
 msgid "Error while changing permissions"
 msgstr "修改权限时出错"
 
-#: js/share.js:158
+#: js/share.js:159
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 共享给您及 {group} 组"
 
-#: js/share.js:160
+#: js/share.js:161
 msgid "Shared with you by {owner}"
 msgstr "{owner} 与您共享"
 
-#: js/share.js:183
+#: js/share.js:184
 msgid "Share with"
 msgstr "分享之"
 
-#: js/share.js:188
+#: js/share.js:189
 msgid "Share with link"
 msgstr "共享链接"
 
-#: js/share.js:191
+#: js/share.js:192
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:193 templates/installation.php:57 templates/login.php:26
+#: js/share.js:194 templates/installation.php:57 templates/login.php:26
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:198
+#: js/share.js:199
 msgid "Allow Public Upload"
 msgstr "允许公开上传"
 
-#: js/share.js:202
+#: js/share.js:203
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:203
+#: js/share.js:204
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:208
+#: js/share.js:209
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:209
+#: js/share.js:210
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:242
+#: js/share.js:243
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:245
+#: js/share.js:246
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:283
+#: js/share.js:284
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:319
+#: js/share.js:320
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:340
+#: js/share.js:341
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:352
+#: js/share.js:353
+msgid "notify user by email"
+msgstr ""
+
+#: js/share.js:361
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:354
+#: js/share.js:363
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:357
+#: js/share.js:366
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:360
+#: js/share.js:369
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:363
+#: js/share.js:372
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:366
+#: js/share.js:375
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:400 js/share.js:632
+#: js/share.js:409 js/share.js:652
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:645
+#: js/share.js:665
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:657
+#: js/share.js:677
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:672
+#: js/share.js:692
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:683
+#: js/share.js:703
 msgid "Email sent"
 msgstr "邮件已发送"
 
+#: js/share.js:727
+msgid "Warning"
+msgstr "警告"
+
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
@@ -561,8 +574,18 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-"Cheers!"
-msgstr "您好，\n\n%s 向您分享了 %s。\n查看： %s"
+msgstr ""
+
+#: templates/altmail.php:4
+#, php-format
+msgid ""
+"The share will expire on %s.\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:6 templates/mail.php:19
+msgid "Cheers!"
+msgstr ""
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -615,48 +638,52 @@ msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\"
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:65
+#: templates/installation.php:66
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:67
+#: templates/installation.php:73
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:77
+#: templates/installation.php:85
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:82 templates/installation.php:94
-#: templates/installation.php:105 templates/installation.php:116
-#: templates/installation.php:128
+#: templates/installation.php:90 templates/installation.php:102
+#: templates/installation.php:113 templates/installation.php:124
+#: templates/installation.php:136
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:140
+#: templates/installation.php:148
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:147
+#: templates/installation.php:155
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:152
+#: templates/installation.php:160
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:160
+#: templates/installation.php:168
 msgid "Database tablespace"
 msgstr "数据库表空间"
 
-#: templates/installation.php:167
+#: templates/installation.php:175
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:175
+#: templates/installation.php:184
 msgid "Finish setup"
 msgstr "安装完成"
 
+#: templates/installation.php:184
+msgid "Finishing …"
+msgstr ""
+
 #: templates/layout.user.php:41
 #, php-format
 msgid "%s is available. Get more information on how to update."
@@ -688,11 +715,11 @@ msgstr "忘记密码？"
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:39
+#: templates/login.php:40
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:45
+#: templates/login.php:46
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
@@ -700,8 +727,13 @@ msgstr "其他登录方式"
 #, php-format
 msgid ""
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>Cheers!"
-msgstr "您好，<br><br>%s 向您分享了 »%s«。<br><a href=\"%s\">查看</a>"
+"href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s.<br><br>"
+msgstr ""
 
 #: templates/update.php:3
 #, php-format
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 26678e7a453..555d270359b 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-09-20 10:44-0400\n"
-"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-05 15:12+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"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Invalid directory."
 msgstr "无效文件夹。"
 
-#: appinfo/app.php:12
+#: appinfo/app.php:11
 msgid "Files"
 msgstr "文件"
 
@@ -122,7 +122,7 @@ msgstr "URL不能为空"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
 msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:507 js/files.js:545
+#: js/file-upload.js:557 js/file-upload.js:573 js/files.js:516 js/files.js:554
 msgid "Error"
 msgstr "错误"
 
@@ -166,12 +166,12 @@ msgstr "已将 {old_name}替换成 {new_name}"
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:533 js/filelist.js:599 js/files.js:576
+#: js/filelist.js:533 js/filelist.js:599 js/files.js:585
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/filelist.js:534 js/filelist.js:600 js/files.js:582
+#: js/filelist.js:534 js/filelist.js:600 js/files.js:591
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
@@ -207,31 +207,44 @@ msgstr "您的存储空间已满，文件将无法更新或同步！"
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:67
+#: js/files.js:68
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:72
+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
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:296
+#: js/files.js:305
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:507 js/files.js:545
+#: js/files.js:516 js/files.js:554
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 templates/index.php:61
+#: js/files.js:567 templates/index.php:59
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:559 templates/index.php:73
+#: js/files.js:568 templates/index.php:71
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:560 templates/index.php:75
+#: js/files.js:569 templates/index.php:73
 msgid "Modified"
 msgstr "修改日期"
 
@@ -292,49 +305,49 @@ msgstr "文件夹"
 msgid "From link"
 msgstr "来自链接"
 
-#: templates/index.php:33
+#: templates/index.php:32
 msgid "Deleted files"
 msgstr "已删除文件"
 
-#: templates/index.php:39
+#: templates/index.php:37
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:45
+#: templates/index.php:43
 msgid "You don’t have write permissions here."
 msgstr "您没有写权限"
 
-#: templates/index.php:50
+#: templates/index.php:48
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:67
+#: templates/index.php:65
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:80 templates/index.php:81
+#: templates/index.php:78 templates/index.php:79
 msgid "Unshare"
 msgstr "取消共享"
 
-#: templates/index.php:86 templates/index.php:87
+#: templates/index.php:84 templates/index.php:85
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:100
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:102
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:107
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:110
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "当前扫描"
 
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index fd619e23d55..e61f96811ed 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.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-08-21 08:10-0400\n"
-"PO-Revision-Date: 2013-08-19 19:20+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-06 23:07+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"
@@ -46,17 +46,24 @@ msgstr "密码修改成功。"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "不能修改密码。旧密码可能不正确。"
 
-#: ajax/updatePrivateKeyPassword.php:51
+#: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
 msgstr "私钥密码成功更新。"
 
-#: ajax/updatePrivateKeyPassword.php:53
+#: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
 msgstr "无法更新私钥密码。可能旧密码不正确。"
 
-#: files/error.php:7
+#: files/error.php:9
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:12
 msgid ""
 "Your private key is not valid! Likely your password was changed outside the "
 "ownCloud system (e.g. your corporate directory). You can update your private"
@@ -64,36 +71,30 @@ msgid ""
 "files."
 msgstr "您的私有密钥无效！也许是您在 ownCloud 系统外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。"
 
-#: hooks/hooks.php:41
+#: hooks/hooks.php:53
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:42
+#: hooks/hooks.php:54
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:249
+#: hooks/hooks.php:254
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
-#: js/settings-admin.js:11
+#: js/settings-admin.js:13
 msgid "Saving..."
 msgstr "保存中"
 
-#: templates/invalid_private_key.php:5
-msgid ""
-"Your private key is not valid! Maybe the your password was changed from "
-"outside."
-msgstr "您的私钥不正确！可能您在别处更改了密码。"
-
-#: templates/invalid_private_key.php:7
-msgid "You can unlock your private key in your "
-msgstr "您可以在这里解锁您的私钥："
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
 
-#: templates/invalid_private_key.php:7
+#: templates/invalid_private_key.php:8
 msgid "personal settings"
 msgstr "个人设置"
 
@@ -110,27 +111,35 @@ msgstr "启用恢复密钥（允许你在密码丢失后恢复文件）："
 msgid "Recovery key password"
 msgstr "恢复密钥密码"
 
-#: templates/settings-admin.php:21 templates/settings-personal.php:54
+#: templates/settings-admin.php:17
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:24 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "开启"
 
-#: templates/settings-admin.php:29 templates/settings-personal.php:62
+#: templates/settings-admin.php:32 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "禁用"
 
-#: templates/settings-admin.php:34
+#: templates/settings-admin.php:37
 msgid "Change recovery key password:"
 msgstr "更改恢复密钥密码"
 
-#: templates/settings-admin.php:41
+#: templates/settings-admin.php:43
 msgid "Old Recovery key password"
 msgstr "旧的恢复密钥密码"
 
-#: templates/settings-admin.php:48
+#: templates/settings-admin.php:50
 msgid "New Recovery key password"
 msgstr "新的恢复密钥密码"
 
-#: templates/settings-admin.php:53
+#: templates/settings-admin.php:56
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:61
 msgid "Change Password"
 msgstr "修改密码"
 
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 10f2bcf69e3..3a5df5a89f1 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-07-23 01:55-0400\n"
-"PO-Revision-Date: 2013-07-23 05:05+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-01 18:37+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
 msgid "Access granted"
 msgstr "权限已授予。"
 
@@ -25,7 +25,7 @@ msgstr "权限已授予。"
 msgid "Error configuring Dropbox storage"
 msgstr "配置Dropbox存储时出错"
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:65 js/google.js:86
 msgid "Grant access"
 msgstr "授权"
 
@@ -33,24 +33,24 @@ msgstr "授权"
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "请提供有效的Dropbox应用key和secret"
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:42 js/google.js:121
 msgid "Error configuring Google Drive storage"
 msgstr "配置Google Drive存储时出错"
 
-#: lib/config.php:447
+#: lib/config.php:453
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>警告：</b>“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。"
 
-#: lib/config.php:450
+#: lib/config.php:457
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>警告：</b>PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。"
 
-#: lib/config.php:453
+#: lib/config.php:460
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 3b1a2c82069..b4b860b9760 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.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-08-19 15:06-0400\n"
-"PO-Revision-Date: 2013-08-16 16:20+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-03 12:22+0000\n"
 "Last-Translator: waterone <suiy02@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -28,41 +28,41 @@ msgstr "无法彻底删除文件%s"
 msgid "Couldn't restore %s"
 msgstr "无法恢复%s"
 
-#: js/trash.js:7 js/trash.js:100
+#: js/trash.js:7 js/trash.js:102
 msgid "perform restore operation"
 msgstr "执行恢复操作"
 
-#: js/trash.js:20 js/trash.js:48 js/trash.js:118 js/trash.js:146
+#: js/trash.js:20 js/trash.js:49 js/trash.js:120 js/trash.js:148
 msgid "Error"
 msgstr "错误"
 
-#: js/trash.js:36
+#: js/trash.js:37
 msgid "delete file permanently"
 msgstr "彻底删除文件"
 
-#: js/trash.js:127
+#: js/trash.js:129
 msgid "Delete permanently"
 msgstr "永久删除"
 
-#: js/trash.js:182 templates/index.php:17
+#: js/trash.js:190 templates/index.php:21
 msgid "Name"
 msgstr "名称"
 
-#: js/trash.js:183 templates/index.php:27
+#: js/trash.js:191 templates/index.php:31
 msgid "Deleted"
 msgstr "已删除"
 
-#: js/trash.js:191
+#: js/trash.js:199
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 文件夹"
 
-#: js/trash.js:197
+#: js/trash.js:205
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n个文件"
 
-#: lib/trash.php:819 lib/trash.php:821
+#: lib/trashbin.php:814 lib/trashbin.php:816
 msgid "restored"
 msgstr "已恢复"
 
@@ -70,11 +70,11 @@ msgstr "已恢复"
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "这里没有东西. 你的回收站是空的!"
 
-#: templates/index.php:20 templates/index.php:22
+#: templates/index.php:24 templates/index.php:26
 msgid "Restore"
 msgstr "恢复"
 
-#: templates/index.php:30 templates/index.php:31
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "删除"
 
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 6d3267bb037..f79a9210b9c 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-09-16 11:33-0400\n"
-"PO-Revision-Date: 2013-09-16 15:34+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-02 13:21+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"
@@ -20,314 +20,321 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:239
+#: private/app.php:237
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: app.php:250
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: app.php:361
+#: private/app.php:352
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:374
+#: private/app.php:365
 msgid "Personal"
 msgstr "个人"
 
-#: app.php:385
+#: private/app.php:376
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:397
+#: private/app.php:388
 msgid "Users"
 msgstr "用户"
 
-#: app.php:410
+#: private/app.php:401
 msgid "Admin"
 msgstr "管理"
 
-#: app.php:839
+#: private/app.php:832
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
-#: avatar.php:56
+#: private/avatar.php:56
 msgid "Custom profile pictures don't work with encryption yet"
 msgstr ""
 
-#: avatar.php:64
+#: private/avatar.php:64
 msgid "Unknown filetype"
 msgstr ""
 
-#: avatar.php:69
+#: private/avatar.php:69
 msgid "Invalid image"
 msgstr ""
 
-#: defaults.php:35
+#: private/defaults.php:36
 msgid "web services under your control"
 msgstr "您控制的web服务"
 
-#: files.php:66 files.php:98
+#: private/files.php:66 private/files.php:98
 #, php-format
 msgid "cannot open \"%s\""
 msgstr ""
 
-#: files.php:226
+#: private/files.php:226
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
 
-#: files.php:227
+#: private/files.php:227
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: files.php:228 files.php:256
+#: private/files.php:228 private/files.php:256
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: files.php:253
+#: private/files.php:253
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大，无法生成 zip 文件。"
 
-#: files.php:254
+#: private/files.php:254
 msgid ""
 "Download the files in smaller chunks, seperately or kindly ask your "
 "administrator."
 msgstr ""
 
-#: installer.php:63
+#: private/installer.php:63
 msgid "No source specified when installing app"
 msgstr ""
 
-#: installer.php:70
+#: private/installer.php:70
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: installer.php:75
+#: private/installer.php:75
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: installer.php:89
+#: private/installer.php:89
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: installer.php:103
+#: private/installer.php:103
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: installer.php:125
+#: private/installer.php:125
 msgid "App does not provide an info.xml file"
 msgstr "应用未提供 info.xml 文件"
 
-#: installer.php:131
+#: private/installer.php:131
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: installer.php:140
+#: private/installer.php:140
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: installer.php:146
+#: private/installer.php:146
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: installer.php:152
+#: private/installer.php:152
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: installer.php:162
+#: private/installer.php:162
 msgid "App directory already exists"
 msgstr ""
 
-#: installer.php:175
+#: private/installer.php:175
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: json.php:28
+#: private/json.php:28
 msgid "Application is not enabled"
 msgstr "应用程序未启用"
 
-#: json.php:39 json.php:62 json.php:73
+#: private/json.php:39 private/json.php:62 private/json.php:73
 msgid "Authentication error"
 msgstr "认证出错"
 
-#: json.php:51
+#: private/json.php:51
 msgid "Token expired. Please reload page."
 msgstr "Token 过期，请刷新页面。"
 
-#: search/provider/file.php:17 search/provider/file.php:35
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "文件"
 
-#: search/provider/file.php:26 search/provider/file.php:33
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
 msgid "Text"
 msgstr "文本"
 
-#: search/provider/file.php:29
+#: private/search/provider/file.php:30
 msgid "Images"
 msgstr "图片"
 
-#: setup/abstractdatabase.php:22
+#: private/setup/abstractdatabase.php:22
 #, php-format
 msgid "%s enter the database username."
 msgstr "%s 输入数据库用户名。"
 
-#: setup/abstractdatabase.php:25
+#: private/setup/abstractdatabase.php:25
 #, php-format
 msgid "%s enter the database name."
 msgstr "%s 输入数据库名称。"
 
-#: setup/abstractdatabase.php:28
+#: private/setup/abstractdatabase.php:28
 #, php-format
 msgid "%s you may not use dots in the database name"
 msgstr "%s 您不能在数据库名称中使用英文句号。"
 
-#: setup/mssql.php:20
+#: private/setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 用户名和/或密码无效：%s"
 
-#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
-#: setup/postgresql.php:24 setup/postgresql.php:70
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: private/setup/oci.php:114 private/setup/postgresql.php:24
+#: private/setup/postgresql.php:70
 msgid "You need to enter either an existing account or the administrator."
 msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
 
-#: setup/mysql.php:12
+#: private/setup/mysql.php:12
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL 数据库用户名和/或密码无效"
 
-#: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:147
-#: setup/oci.php:154 setup/oci.php:165 setup/oci.php:172 setup/oci.php:181
-#: setup/oci.php:189 setup/oci.php:198 setup/oci.php:204
-#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
-#: setup/postgresql.php:125 setup/postgresql.php:134
+#: private/setup/mysql.php:67 private/setup/oci.php:54
+#: private/setup/oci.php:121 private/setup/oci.php:147
+#: private/setup/oci.php:154 private/setup/oci.php:165
+#: private/setup/oci.php:172 private/setup/oci.php:181
+#: private/setup/oci.php:189 private/setup/oci.php:198
+#: private/setup/oci.php:204 private/setup/postgresql.php:89
+#: private/setup/postgresql.php:98 private/setup/postgresql.php:115
+#: private/setup/postgresql.php:125 private/setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "数据库错误：\"%s\""
 
-#: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:148
-#: setup/oci.php:155 setup/oci.php:166 setup/oci.php:182 setup/oci.php:190
-#: setup/oci.php:199 setup/postgresql.php:90 setup/postgresql.php:99
-#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: private/setup/oci.php:122 private/setup/oci.php:148
+#: private/setup/oci.php:155 private/setup/oci.php:166
+#: private/setup/oci.php:182 private/setup/oci.php:190
+#: private/setup/oci.php:199 private/setup/postgresql.php:90
+#: private/setup/postgresql.php:99 private/setup/postgresql.php:116
+#: private/setup/postgresql.php:126 private/setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "冲突命令为：\"%s\""
 
-#: setup/mysql.php:85
+#: private/setup/mysql.php:85
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
 
-#: setup/mysql.php:86
+#: private/setup/mysql.php:86
 msgid "Drop this user from MySQL"
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
 
-#: setup/mysql.php:91
+#: private/setup/mysql.php:91
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL 用户 '%s'@'%%' 已存在"
 
-#: setup/mysql.php:92
+#: private/setup/mysql.php:92
 msgid "Drop this user from MySQL."
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
 
-#: setup/oci.php:34
+#: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
 msgstr "不能建立甲骨文连接"
 
-#: setup/oci.php:41 setup/oci.php:113
+#: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle 数据库用户名和/或密码无效"
 
-#: setup/oci.php:173 setup/oci.php:205
+#: private/setup/oci.php:173 private/setup/oci.php:205
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "冲突命令为：\"%s\"，名称：%s，密码：%s"
 
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL 数据库用户名和/或密码无效"
 
-#: setup.php:28
+#: private/setup.php:28
 msgid "Set an admin username."
 msgstr "请设置一个管理员用户名。"
 
-#: setup.php:31
+#: private/setup.php:31
 msgid "Set an admin password."
 msgstr "请设置一个管理员密码。"
 
-#: setup.php:184
+#: private/setup.php:184
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: setup.php:185
+#: private/setup.php:185
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: template/functions.php:96
+#: private/tags.php:194
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr "无法找到分类 \"%s\""
+
+#: private/template/functions.php:122
 msgid "seconds ago"
 msgstr "秒前"
 
-#: template/functions.php:97
+#: private/template/functions.php:123
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: template/functions.php:98
+#: private/template/functions.php:124
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: template/functions.php:99
+#: private/template/functions.php:125
 msgid "today"
 msgstr "今天"
 
-#: template/functions.php:100
+#: private/template/functions.php:126
 msgid "yesterday"
 msgstr "昨天"
 
-#: template/functions.php:101
+#: private/template/functions.php:128
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: template/functions.php:102
+#: private/template/functions.php:130
 msgid "last month"
 msgstr "上月"
 
-#: template/functions.php:103
+#: private/template/functions.php:131
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: template/functions.php:104
+#: private/template/functions.php:133
 msgid "last year"
 msgstr "去年"
 
-#: template/functions.php:105
+#: private/template/functions.php:134
 msgid "years ago"
 msgstr "年前"
 
-#: template.php:297
+#: private/template.php:297
 msgid "Caused by:"
 msgstr ""
-
-#: vcategories.php:188 vcategories.php:249
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr "无法找到分类 \"%s\""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index fc3228827b0..d24fe6ee6d6 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-09-20 10:45-0400\n"
-"PO-Revision-Date: 2013-09-20 14:45+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-05 15:12+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"
@@ -122,11 +122,11 @@ msgstr ""
 msgid "Update to {appversion}"
 msgstr "更新至 {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:108
+#: js/apps.js:49 js/apps.js:82 js/apps.js:110
 msgid "Disable"
 msgstr "禁用"
 
-#: js/apps.js:49 js/apps.js:89 js/apps.js:102 js/apps.js:117
+#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
 msgid "Enable"
 msgstr "开启"
 
@@ -134,43 +134,43 @@ msgstr "开启"
 msgid "Please wait...."
 msgstr "请稍等...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:100
+#: js/apps.js:79 js/apps.js:80 js/apps.js:101
 msgid "Error while disabling app"
 msgstr "禁用 app 时出错"
 
-#: js/apps.js:99 js/apps.js:112 js/apps.js:113
+#: js/apps.js:100 js/apps.js:114 js/apps.js:115
 msgid "Error while enabling app"
 msgstr "启用 app 时出错"
 
-#: js/apps.js:123
+#: js/apps.js:125
 msgid "Updating...."
 msgstr "正在更新...."
 
-#: js/apps.js:126
+#: js/apps.js:128
 msgid "Error while updating app"
 msgstr "更新 app 时出错"
 
-#: js/apps.js:126
+#: js/apps.js:128
 msgid "Error"
 msgstr "错误"
 
-#: js/apps.js:127 templates/apps.php:43
+#: js/apps.js:129 templates/apps.php:43
 msgid "Update"
 msgstr "更新"
 
-#: js/apps.js:130
+#: js/apps.js:132
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:220
+#: js/personal.js:225
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:265
+#: js/personal.js:270
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
-#: js/personal.js:287
+#: js/personal.js:292
 msgid "Saving..."
 msgstr "保存中"
 
@@ -346,46 +346,54 @@ msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
 #: templates/admin.php:170
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:171
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:178
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:183
+#: templates/admin.php:191
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:185
+#: templates/admin.php:193
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:191
+#: templates/admin.php:199
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
 
-#: templates/admin.php:203
+#: templates/admin.php:211
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:204
+#: templates/admin.php:212
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:235
+#: templates/admin.php:243
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:236
+#: templates/admin.php:244
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:242 templates/personal.php:161
+#: templates/admin.php:250 templates/personal.php:161
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:246 templates/personal.php:164
+#: templates/admin.php:254 templates/personal.php:164
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 22c5379e558..fc1b3807b3d 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-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-05 11:51+0000\n"
+"POT-Creation-Date: 2013-10-06 19:07-0400\n"
+"PO-Revision-Date: 2013-10-03 12:22+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"
@@ -26,17 +26,17 @@ msgstr "清除映射失败。"
 msgid "Failed to delete the server configuration"
 msgstr "未能删除服务器配置"
 
-#: ajax/testConfiguration.php:36
+#: ajax/testConfiguration.php:37
 msgid "The configuration is valid and the connection could be established!"
 msgstr "配置有效，能够建立连接！"
 
-#: ajax/testConfiguration.php:39
+#: ajax/testConfiguration.php:40
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr "配置有效但绑定失败。请检查服务器设置和认证信息。"
 
-#: ajax/testConfiguration.php:43
+#: ajax/testConfiguration.php:44
 msgid ""
 "The configuration is invalid. Please look in the ownCloud log for further "
 "details."