summaryrefslogtreecommitdiffstats
path: root/l10n/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/zh_CN')
-rw-r--r--l10n/zh_CN/core.po381
-rw-r--r--l10n/zh_CN/files.po297
-rw-r--r--l10n/zh_CN/files_encryption.po18
-rw-r--r--l10n/zh_CN/files_external.po103
-rw-r--r--l10n/zh_CN/files_sharing.po45
-rw-r--r--l10n/zh_CN/files_trashbin.po36
-rw-r--r--l10n/zh_CN/files_versions.po26
-rw-r--r--l10n/zh_CN/lib.po169
-rw-r--r--l10n/zh_CN/settings.po480
-rw-r--r--l10n/zh_CN/user_ldap.po100
10 files changed, 955 insertions, 700 deletions
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index e5bde42b8b2..543b6afc926 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -4,16 +4,17 @@
#
# Translators:
# hanfeng <appweb.cn@gmail.com>, 2013
+# smartree <smartree@gmail.com>, 2014
# Xuetian Weng <wengxt@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-23 01:54-0400\n"
+"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,44 +22,30 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s 向您分享了 »%s«"
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr ""
-#: ajax/share.php:169
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "发送失败,用户如下: %s "
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "启用维护模式"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "关闭维护模式"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "数据库已更新"
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "正在更新文件缓存,这可能需要较长时间..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "文件缓存已更新"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "...已完成 %d%% ..."
-
#: avatar/controller.php:62
msgid "No image or file provided"
-msgstr ""
+msgstr "没有提供图片或文件"
#: avatar/controller.php:81
msgid "Unknown filetype"
@@ -70,201 +57,229 @@ msgstr "无效的图像"
#: avatar/controller.php:115 avatar/controller.php:142
msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "没有临时概览页图片可用,请重试"
#: avatar/controller.php:135
msgid "No crop data provided"
-msgstr ""
+msgstr "没有提供相应数据"
-#: js/config.php:32
+#: js/config.php:36
msgid "Sunday"
msgstr "星期日"
-#: js/config.php:33
+#: js/config.php:37
msgid "Monday"
msgstr "星期一"
-#: js/config.php:34
+#: js/config.php:38
msgid "Tuesday"
msgstr "星期二"
-#: js/config.php:35
+#: js/config.php:39
msgid "Wednesday"
msgstr "星期三"
-#: js/config.php:36
+#: js/config.php:40
msgid "Thursday"
msgstr "星期四"
-#: js/config.php:37
+#: js/config.php:41
msgid "Friday"
msgstr "星期五"
-#: js/config.php:38
+#: js/config.php:42
msgid "Saturday"
msgstr "星期六"
-#: js/config.php:43
+#: js/config.php:47
msgid "January"
msgstr "一月"
-#: js/config.php:44
+#: js/config.php:48
msgid "February"
msgstr "二月"
-#: js/config.php:45
+#: js/config.php:49
msgid "March"
msgstr "三月"
-#: js/config.php:46
+#: js/config.php:50
msgid "April"
msgstr "四月"
-#: js/config.php:47
+#: js/config.php:51
msgid "May"
msgstr "五月"
-#: js/config.php:48
+#: js/config.php:52
msgid "June"
msgstr "六月"
-#: js/config.php:49
+#: js/config.php:53
msgid "July"
msgstr "七月"
-#: js/config.php:50
+#: js/config.php:54
msgid "August"
msgstr "八月"
-#: js/config.php:51
+#: js/config.php:55
msgid "September"
msgstr "九月"
-#: js/config.php:52
+#: js/config.php:56
msgid "October"
msgstr "十月"
-#: js/config.php:53
+#: js/config.php:57
msgid "November"
msgstr "十一月"
-#: js/config.php:54
+#: js/config.php:58
msgid "December"
msgstr "十二月"
-#: js/js.js:398
+#: js/js.js:489
msgid "Settings"
msgstr "设置"
-#: js/js.js:869
+#: js/js.js:589
+msgid "Saving..."
+msgstr "保存中"
+
+#: js/js.js:1246
msgid "seconds ago"
msgstr "秒前"
-#: js/js.js:870
+#: js/js.js:1247
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: js/js.js:871
+#: js/js.js:1248
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小时前"
-#: js/js.js:872
+#: js/js.js:1249
msgid "today"
msgstr "今天"
-#: js/js.js:873
+#: js/js.js:1250
msgid "yesterday"
msgstr "昨天"
-#: js/js.js:874
+#: js/js.js:1251
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: js/js.js:875
+#: js/js.js:1252
msgid "last month"
msgstr "上月"
-#: js/js.js:876
+#: js/js.js:1253
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月前"
-#: js/js.js:877
-msgid "months ago"
-msgstr "月前"
-
-#: js/js.js:878
+#: js/js.js:1254
msgid "last year"
msgstr "去年"
-#: js/js.js:879
+#: js/js.js:1255
msgid "years ago"
msgstr "年前"
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:125
msgid "Choose"
msgstr "选择(&C)..."
-#: js/oc-dialogs.js:146
+#: js/oc-dialogs.js:151
msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "加载文件分拣模板出错: {error}"
-#: js/oc-dialogs.js:172
+#: js/oc-dialogs.js:177
msgid "Yes"
msgstr "是"
-#: js/oc-dialogs.js:182
+#: js/oc-dialogs.js:187
msgid "No"
msgstr "否"
-#: js/oc-dialogs.js:199
+#: js/oc-dialogs.js:204
msgid "Ok"
msgstr "好"
-#: js/oc-dialogs.js:219
+#: js/oc-dialogs.js:224
msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "加载消息模板出错: {error}"
-#: js/oc-dialogs.js:347
+#: js/oc-dialogs.js:352
msgid "{count} file conflict"
msgid_plural "{count} file conflicts"
-msgstr[0] ""
+msgstr[0] "{count} 个文件冲突"
-#: js/oc-dialogs.js:361
+#: js/oc-dialogs.js:366
msgid "One file conflict"
+msgstr "1个文件冲突"
+
+#: js/oc-dialogs.js:372
+msgid "New Files"
+msgstr "新文件"
+
+#: js/oc-dialogs.js:373
+msgid "Already existing files"
msgstr ""
-#: js/oc-dialogs.js:367
+#: js/oc-dialogs.js:375
msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "想要保留哪一个文件呢?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:376
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
-msgstr ""
+msgstr "如果同时选择了连个版本,复制的文件名将会添加上一个数字。"
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:384
msgid "Cancel"
msgstr "取消"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:394
msgid "Continue"
-msgstr ""
+msgstr "继续"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:441 js/oc-dialogs.js:454
msgid "(all selected)"
-msgstr ""
+msgstr "(选中全部)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:444 js/oc-dialogs.js:458
msgid "({count} selected)"
-msgstr ""
+msgstr "(选择了{count}个)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:466
msgid "Error loading file exists template"
+msgstr "加载文件存在性模板失败"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
msgstr ""
#: js/share.js:51 js/share.js:66 js/share.js:106
@@ -275,12 +290,12 @@ msgstr "已共享"
msgid "Share"
msgstr "分享"
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:734
+#: templates/installation.php:10
msgid "Error"
msgstr "错误"
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:790
msgid "Error while sharing"
msgstr "共享时出错"
@@ -292,123 +307,123 @@ msgstr "取消共享时出错"
msgid "Error while changing permissions"
msgstr "修改权限时出错"
-#: js/share.js:187
+#: js/share.js:188
msgid "Shared with you and the group {group} by {owner}"
msgstr "{owner} 共享给您及 {group} 组"
-#: js/share.js:189
+#: js/share.js:190
msgid "Shared with you by {owner}"
msgstr "{owner} 与您共享"
-#: js/share.js:213
+#: js/share.js:214
msgid "Share with user or group …"
-msgstr ""
+msgstr "分享给其他用户或组 ..."
-#: js/share.js:219
+#: js/share.js:220
msgid "Share link"
-msgstr ""
+msgstr "分享链接"
-#: js/share.js:222
+#: js/share.js:223
msgid "Password protect"
msgstr "密码保护"
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
msgid "Password"
msgstr "密码"
-#: js/share.js:229
+#: js/share.js:230
msgid "Allow Public Upload"
msgstr "允许公开上传"
-#: js/share.js:233
+#: js/share.js:234
msgid "Email link to person"
msgstr "发送链接到个人"
-#: js/share.js:234
+#: js/share.js:235
msgid "Send"
msgstr "发送"
-#: js/share.js:239
+#: js/share.js:240
msgid "Set expiration date"
msgstr "设置过期日期"
-#: js/share.js:240
+#: js/share.js:241
msgid "Expiration date"
msgstr "过期日期"
-#: js/share.js:275
+#: js/share.js:277
msgid "Share via email:"
msgstr "通过Email共享"
-#: js/share.js:278
+#: js/share.js:280
msgid "No people found"
msgstr "未找到此人"
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:385
msgid "group"
msgstr "组"
-#: js/share.js:333
+#: js/share.js:357
msgid "Resharing is not allowed"
msgstr "不允许二次共享"
-#: js/share.js:375
+#: js/share.js:401
msgid "Shared in {item} with {user}"
msgstr "在 {item} 与 {user} 共享。"
-#: js/share.js:397
+#: js/share.js:423
msgid "Unshare"
msgstr "取消共享"
-#: js/share.js:405
+#: js/share.js:431
msgid "notify by email"
-msgstr ""
+msgstr "以邮件通知"
-#: js/share.js:408
+#: js/share.js:434
msgid "can edit"
msgstr "可以修改"
-#: js/share.js:410
+#: js/share.js:436
msgid "access control"
msgstr "访问控制"
-#: js/share.js:413
+#: js/share.js:439
msgid "create"
msgstr "创建"
-#: js/share.js:416
+#: js/share.js:442
msgid "update"
msgstr "更新"
-#: js/share.js:419
+#: js/share.js:445
msgid "delete"
msgstr "删除"
-#: js/share.js:422
+#: js/share.js:448
msgid "share"
msgstr "共享"
-#: js/share.js:694
+#: js/share.js:721
msgid "Password protected"
msgstr "密码已受保护"
-#: js/share.js:707
+#: js/share.js:734
msgid "Error unsetting expiration date"
msgstr "取消设置过期日期时出错"
-#: js/share.js:719
+#: js/share.js:752
msgid "Error setting expiration date"
msgstr "设置过期日期时出错"
-#: js/share.js:734
+#: js/share.js:777
msgid "Sending ..."
msgstr "正在发送..."
-#: js/share.js:745
+#: js/share.js:788
msgid "Email sent"
msgstr "邮件已发送"
-#: js/share.js:769
+#: js/share.js:812
msgid "Warning"
msgstr "警告"
@@ -418,7 +433,7 @@ msgstr "未指定对象类型。"
#: js/tags.js:13
msgid "Enter new"
-msgstr ""
+msgstr "输入新..."
#: js/tags.js:27
msgid "Delete"
@@ -430,19 +445,19 @@ msgstr "增加"
#: js/tags.js:39
msgid "Edit tags"
-msgstr ""
+msgstr "编辑标签"
#: js/tags.js:57
msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "加载对话框模板出错: {error}"
-#: js/tags.js:261
+#: js/tags.js:264
msgid "No tags selected for deletion."
-msgstr ""
+msgstr "请选择要删除的标签。"
#: js/update.js:8
msgid "Please reload the page."
-msgstr ""
+msgstr "请重新加载页面。"
#: js/update.js:17
msgid ""
@@ -455,11 +470,17 @@ msgstr "更新不成功。请汇报将此问题汇报给 <a href=\"https://gith
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "更新成功。正在重定向至 ownCloud。"
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
#, php-format
msgid "%s password reset"
msgstr "重置 %s 的密码"
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
msgstr "使用以下链接重置您的密码:{link}"
@@ -479,8 +500,8 @@ msgstr "请求失败<br>您确定您的邮箱/用户名是正确的?"
msgid "You will receive a link to reset your password via Email."
msgstr "您将会收到包含可以重置密码链接的邮件。"
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
msgid "Username"
msgstr "用户名"
@@ -516,6 +537,18 @@ msgstr "新密码"
msgid "Reset password"
msgstr "重置密码"
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
#: strings.php:5
msgid "Personal"
msgstr "个人"
@@ -524,7 +557,7 @@ msgstr "个人"
msgid "Users"
msgstr "用户"
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
msgid "Apps"
msgstr "应用"
@@ -538,31 +571,31 @@ msgstr "帮助"
#: tags/controller.php:22
msgid "Error loading tags"
-msgstr ""
+msgstr "加载标签出错"
#: tags/controller.php:48
msgid "Tag already exists"
-msgstr ""
+msgstr "标签已存在"
#: tags/controller.php:64
msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "删除标签(s)时出错"
#: tags/controller.php:75
msgid "Error tagging"
-msgstr ""
+msgstr "添加标签时出错"
#: tags/controller.php:86
msgid "Error untagging"
-msgstr ""
+msgstr "移除标签时出错"
#: tags/controller.php:97
msgid "Error favoriting"
-msgstr ""
+msgstr "收藏时出错"
#: tags/controller.php:108
msgid "Error unfavoriting"
-msgstr ""
+msgstr "删除收藏时出错"
#: templates/403.php:12
msgid "Access forbidden"
@@ -580,16 +613,16 @@ msgid ""
"just letting you know that %s shared %s with you.\n"
"View it: %s\n"
"\n"
-msgstr ""
+msgstr "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n"
#: templates/altmail.php:4 templates/mail.php:17
#, php-format
msgid "The share will expire on %s."
-msgstr ""
+msgstr "此分享将在 %s 过期。"
#: templates/altmail.php:7 templates/mail.php:20
msgid "Cheers!"
-msgstr ""
+msgstr "干杯!"
#: templates/installation.php:25 templates/installation.php:32
#: templates/installation.php:39
@@ -634,65 +667,63 @@ msgstr "关于如何配置服务器,请参见 <a href=\"%s\" target=\"_blank\"
msgid "Create an <strong>admin account</strong>"
msgstr "创建<strong>管理员账号</strong>"
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "高级"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
-#: templates/installation.php:74
+#: templates/installation.php:77
msgid "Data folder"
msgstr "数据目录"
-#: templates/installation.php:86
+#: templates/installation.php:90
msgid "Configure the database"
msgstr "配置数据库"
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
msgid "will be used"
msgstr "将被使用"
-#: templates/installation.php:149
+#: templates/installation.php:109
msgid "Database user"
msgstr "数据库用户"
-#: templates/installation.php:156
+#: templates/installation.php:118
msgid "Database password"
msgstr "数据库密码"
-#: templates/installation.php:161
+#: templates/installation.php:123
msgid "Database name"
msgstr "数据库名"
-#: templates/installation.php:169
+#: templates/installation.php:132
msgid "Database tablespace"
msgstr "数据库表空间"
-#: templates/installation.php:176
+#: templates/installation.php:140
msgid "Database host"
msgstr "数据库主机"
-#: templates/installation.php:185
+#: templates/installation.php:150
msgid "Finish setup"
msgstr "安装完成"
-#: templates/installation.php:185
+#: templates/installation.php:150
msgid "Finishing …"
-msgstr ""
+msgstr "正在结束 ..."
#: templates/layout.user.php:40
msgid ""
"This application requires JavaScript to be enabled for correct operation. "
"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
"JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此接口。"
#: templates/layout.user.php:44
#, php-format
msgid "%s is available. Get more information on how to update."
msgstr "%s 可用。获取更多关于如何升级的信息。"
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
msgid "Log out"
msgstr "注销"
@@ -712,52 +743,52 @@ msgstr "请修改您的密码,以保护您的账户安全。"
#: templates/login.php:17
msgid "Server side authentication failed!"
-msgstr ""
+msgstr "服务端验证失败!"
#: templates/login.php:18
msgid "Please contact your administrator."
-msgstr ""
+msgstr "请联系你的管理员。"
-#: templates/login.php:44
+#: templates/login.php:46
msgid "Lost your password?"
msgstr "忘记密码?"
-#: templates/login.php:49
+#: templates/login.php:51
msgid "remember"
msgstr "记住"
-#: templates/login.php:52
+#: templates/login.php:54
msgid "Log in"
msgstr "登录"
-#: templates/login.php:58
+#: templates/login.php:60
msgid "Alternative Logins"
msgstr "其他登录方式"
#: templates/mail.php:15
#, 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>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
msgstr ""
#: templates/singleuser.user.php:3
msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "当前ownCloud实例运行在单用户模式下。"
#: templates/singleuser.user.php:4
msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "这意味着只有管理员才能在实例上操作。"
#: templates/singleuser.user.php:5 templates/update.user.php:5
msgid ""
"Contact your system administrator if this message persists or appeared "
"unexpectedly."
-msgstr ""
+msgstr "如果这个消息一直存在或不停出现,请联系你的系统管理员。"
#: templates/singleuser.user.php:7 templates/update.user.php:6
msgid "Thank you for your patience."
-msgstr ""
+msgstr "感谢让你久等了。"
#: templates/update.admin.php:3
#, php-format
@@ -767,8 +798,8 @@ msgstr "更新 ownCloud 到版本 %s,这可能需要一些时间。"
#: templates/update.user.php:3
msgid ""
"This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "当前ownCloud实例正在更新,可能需要一段时间。"
#: templates/update.user.php:4
msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr ""
+msgstr "请稍后重新加载这个页面,以继续使用ownCloud。"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 102239c828a..1078d24b82e 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,16 +3,17 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
# Mengz You <mengz.you@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-23 01:54-0400\n"
+"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,325 +21,325 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/move.php:17
+#: ajax/move.php:15
#, php-format
msgid "Could not move %s - File with this name already exists"
msgstr "无法移动 %s - 同名文件已存在"
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
#, php-format
msgid "Could not move %s"
msgstr "无法移动 %s"
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
msgid "File name cannot be empty."
msgstr "文件名不能为空。"
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:155
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
msgstr ""
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
#, php-format
msgid ""
"The name %s is already used in the folder %s. Please choose a different "
"name."
-msgstr ""
+msgstr "文件名 %s 是已经在 %s 中存在的名称。请使用其他名称。"
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
msgid "Not a valid source"
-msgstr ""
+msgstr "不是一个可用的源"
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
msgid ""
"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "服务器没有允许打开URL网址,请检查服务器配置"
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
#, php-format
msgid "Error while downloading %s to %s"
-msgstr ""
+msgstr "当下载 %s 到 %s 时出错"
-#: ajax/newfile.php:140
+#: ajax/newfile.php:146
msgid "Error when creating the file"
-msgstr ""
+msgstr "当创建文件是出错"
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
msgid "Folder name cannot be empty."
-msgstr ""
+msgstr "文件夹名称不能为空"
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
msgid "Error when creating the folder"
-msgstr ""
+msgstr "创建文件夹出错"
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:57
msgid "Unable to set upload directory."
msgstr "无法设置上传文件夹。"
-#: ajax/upload.php:27
+#: ajax/upload.php:33
msgid "Invalid Token"
msgstr "无效密匙"
-#: ajax/upload.php:64
+#: ajax/upload.php:75
msgid "No file was uploaded. Unknown error"
msgstr "没有文件被上传。未知错误"
-#: ajax/upload.php:71
+#: ajax/upload.php:82
msgid "There is no error, the file uploaded with success"
msgstr "文件上传成功,没有错误发生"
-#: ajax/upload.php:72
+#: ajax/upload.php:83
msgid ""
"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
-#: ajax/upload.php:74
+#: ajax/upload.php:85
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:75
+#: ajax/upload.php:86
msgid "The uploaded file was only partially uploaded"
msgstr "已上传文件只上传了部分(不完整)"
-#: ajax/upload.php:76
+#: ajax/upload.php:87
msgid "No file was uploaded"
msgstr "没有文件被上传"
-#: ajax/upload.php:77
+#: ajax/upload.php:88
msgid "Missing a temporary folder"
msgstr "缺少临时目录"
-#: ajax/upload.php:78
+#: ajax/upload.php:89
msgid "Failed to write to disk"
msgstr "写入磁盘失败"
-#: ajax/upload.php:96
+#: ajax/upload.php:107
msgid "Not enough storage available"
msgstr "没有足够的存储空间"
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:169
msgid "Upload failed. Could not find uploaded file"
-msgstr ""
+msgstr "上传失败。不能发现上传的文件"
-#: ajax/upload.php:172
+#: ajax/upload.php:179
+msgid "Upload failed. Could not get file info."
+msgstr "上传失败。不能获取文件信息。"
+
+#: ajax/upload.php:194
msgid "Invalid directory."
msgstr "无效文件夹。"
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
msgid "Files"
msgstr "文件"
-#: js/file-upload.js:228
+#: js/file-upload.js:254
msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "不能上传文件 {filename} ,由于它是一个目录或者为0字节"
+
+#: js/file-upload.js:266
+msgid "Total file size {size1} exceeds upload limit {size2}"
msgstr ""
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "没有足够可用空间"
+#: js/file-upload.js:276
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
-#: js/file-upload.js:306
+#: js/file-upload.js:353
msgid "Upload cancelled."
msgstr "上传已取消"
-#: js/file-upload.js:344
+#: js/file-upload.js:398
msgid "Could not get result from server."
-msgstr ""
+msgstr "不能从服务器得到结果"
-#: js/file-upload.js:436
+#: js/file-upload.js:490
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-#: js/file-upload.js:523
+#: js/file-upload.js:555
msgid "URL cannot be empty"
-msgstr ""
+msgstr "URL不能为空"
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:559
msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
+msgstr "主目录里 'Shared' 是系统预留目录名"
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:561 js/filelist.js:585
msgid "{new_name} already exists"
msgstr "{new_name} 已存在"
-#: js/file-upload.js:595
+#: js/file-upload.js:613
msgid "Could not create file"
-msgstr ""
+msgstr "不能创建文件"
-#: js/file-upload.js:611
+#: js/file-upload.js:626
msgid "Could not create folder"
-msgstr ""
+msgstr "不能创建文件夹"
-#: js/file-upload.js:661
+#: js/file-upload.js:666
msgid "Error fetching URL"
-msgstr ""
+msgstr "获取URL出错"
-#: js/fileactions.js:125
+#: js/fileactions.js:164
msgid "Share"
msgstr "分享"
-#: js/fileactions.js:137
+#: js/fileactions.js:177
msgid "Delete permanently"
msgstr "永久删除"
-#: js/fileactions.js:194
+#: js/fileactions.js:238
msgid "Rename"
msgstr "重命名"
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:102 js/files.js:552
+msgid "Error moving file"
+msgstr "移动文件错误"
+
+#: js/filelist.js:102 js/files.js:552
+msgid "Error"
+msgstr "错误"
+
+#: js/filelist.js:251 js/filelist.js:1129
msgid "Pending"
msgstr "等待"
-#: js/filelist.js:405
+#: js/filelist.js:612
msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "已将 {old_name}替换成 {new_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "撤销"
+msgstr "不能重命名文件"
-#: js/filelist.js:591
+#: js/filelist.js:775
msgid "Error deleting file."
-msgstr ""
+msgstr "删除文件出错。"
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:800 js/filelist.js:876 js/files.js:589
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] "%n 文件夹"
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:801 js/filelist.js:877 js/files.js:595
msgid "%n file"
msgid_plural "%n files"
msgstr[0] "%n个文件"
-#: js/filelist.js:617
+#: js/filelist.js:808
msgid "{dirs} and {files}"
-msgstr ""
+msgstr "{dirs} 和 {files}"
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:1037 js/filelist.js:1076
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
-msgstr[0] ""
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' 是一个无效的文件名。"
+msgstr[0] "上传 %n 个文件"
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "无效名称,'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
-#: js/files.js:93
+#: js/files.js:117
msgid "Your storage is full, files can not be updated or synced anymore!"
msgstr "您的存储空间已满,文件将无法更新或同步!"
-#: js/files.js:97
+#: js/files.js:121
msgid "Your storage is almost full ({usedSpacePercent}%)"
msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
-#: js/files.js:110
+#: js/files.js:134
msgid ""
"Encryption App is enabled but your keys are not initialized, please log-out "
"and log-in again"
-msgstr ""
+msgstr "加密应用被启用了,但是你的加密密钥没有初始化,请重新登出登录系统一次。"
-#: js/files.js:114
+#: js/files.js:138
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 ""
+msgstr "无效的私有密钥。请到您的个人配置里去更新私有密钥,来恢复对加密文件的访问。"
-#: js/files.js:118
+#: js/files.js:142
msgid ""
"Encryption was disabled but your files are still encrypted. Please go to "
"your personal settings to decrypt your files."
-msgstr ""
+msgstr "加密是被禁用的,但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。"
-#: js/files.js:349
+#: js/files.js:331
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
-#: js/files.js:558 js/files.js:596
-msgid "Error moving file"
-msgstr ""
-
-#: js/files.js:558 js/files.js:596
-msgid "Error"
-msgstr "错误"
-
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:570 templates/index.php:67
msgid "Name"
msgstr "名称"
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:571 templates/index.php:79
msgid "Size"
msgstr "大小"
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:572 templates/index.php:81
msgid "Modified"
msgstr "修改日期"
#: lib/app.php:60
msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr ""
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
-#: lib/app.php:101
+#: lib/app.php:93
#, php-format
msgid "%s could not be renamed"
msgstr "%s 不能被重命名"
-#: lib/helper.php:11 templates/index.php:16
-msgid "Upload"
-msgstr "上传"
+#: lib/helper.php:14 templates/index.php:22
+#, php-format
+msgid "Upload (max. %s)"
+msgstr ""
-#: templates/admin.php:5
+#: templates/admin.php:4
msgid "File handling"
msgstr "文件处理"
-#: templates/admin.php:7
+#: templates/admin.php:6
msgid "Maximum upload size"
msgstr "最大上传大小"
-#: templates/admin.php:10
+#: templates/admin.php:9
msgid "max. possible: "
msgstr "最大允许: "
-#: templates/admin.php:15
+#: templates/admin.php:14
msgid "Needed for multi-file and folder downloads."
msgstr "多文件和文件夹下载需要此项。"
-#: templates/admin.php:17
+#: templates/admin.php:16
msgid "Enable ZIP-download"
msgstr "启用 ZIP 下载"
-#: templates/admin.php:20
+#: templates/admin.php:19
msgid "0 is unlimited"
msgstr "0 为无限制"
-#: templates/admin.php:22
+#: templates/admin.php:21
msgid "Maximum input size for ZIP files"
msgstr "ZIP 文件的最大输入大小"
-#: templates/admin.php:26
+#: templates/admin.php:25
msgid "Save"
msgstr "保存"
@@ -348,66 +349,62 @@ msgstr "新建"
#: templates/index.php:8
msgid "New text file"
-msgstr ""
+msgstr "创建文本文件"
-#: templates/index.php:8
+#: templates/index.php:9
msgid "Text file"
msgstr "文本文件"
-#: templates/index.php:10
+#: templates/index.php:12
msgid "New folder"
msgstr "添加文件夹"
-#: templates/index.php:10
+#: templates/index.php:13
msgid "Folder"
msgstr "文件夹"
-#: templates/index.php:12
+#: templates/index.php:16
msgid "From link"
msgstr "来自链接"
-#: templates/index.php:29
+#: templates/index.php:40
msgid "Deleted files"
msgstr "已删除文件"
-#: templates/index.php:34
+#: templates/index.php:45
msgid "Cancel upload"
msgstr "取消上传"
-#: templates/index.php:40
+#: templates/index.php:51
msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "您没有权限来上传湖州哦和创建文件"
-#: templates/index.php:45
+#: templates/index.php:56
msgid "Nothing in here. Upload something!"
msgstr "这里还什么都没有。上传些东西吧!"
-#: templates/index.php:62
+#: templates/index.php:73
msgid "Download"
msgstr "下载"
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:84 templates/index.php:85
msgid "Delete"
msgstr "删除"
-#: templates/index.php:86
+#: templates/index.php:96
msgid "Upload too large"
msgstr "上传文件过大"
-#: templates/index.php:88
+#: templates/index.php:98
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
-#: templates/index.php:93
+#: templates/index.php:103
msgid "Files are being scanned, please wait."
msgstr "文件正在被扫描,请稍候。"
-#: templates/index.php:96
+#: templates/index.php:106
msgid "Current scanning"
msgstr "当前扫描"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index bd66314a7c6..ebd97ad4d8a 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 05:55+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -83,18 +83,18 @@ msgid ""
"administrator"
msgstr ""
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
msgid "Missing requirements."
msgstr ""
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
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:273
+#: hooks/hooks.php:295
msgid "Following users are not set up for encryption:"
msgstr ""
@@ -102,9 +102,9 @@ msgstr ""
msgid "Initial encryption started... This can take some time. Please wait."
msgstr ""
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "保存中"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
#: templates/invalid_private_key.php:8
msgid "Go directly to your "
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 935872a3fc6..bb2b1684eee 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-09 01:55-0400\n"
+"PO-Revision-Date: 2014-04-09 05:55+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,107 +17,120 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
msgid "Access granted"
msgstr "权限已授予。"
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
msgid "Error configuring Dropbox storage"
msgstr "配置Dropbox存储时出错"
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
msgid "Grant access"
msgstr "授权"
-#: js/dropbox.js:101
+#: js/dropbox.js:102
msgid "Please provide a valid Dropbox app key and secret."
msgstr "请提供有效的Dropbox应用key和secret"
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
msgid "Error configuring Google Drive storage"
msgstr "配置Google Drive存储时出错"
-#: lib/config.php:461
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:592
+msgid "<b>Note:</b> "
+msgstr ""
+
+#: lib/config.php:602
+msgid " and "
+msgstr ""
+
+#: lib/config.php:624
+#, php-format
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 分享挂载无法实现。请咨询系统管理员进行安装。"
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting "
+"of %s is not possible. Please ask your system administrator to install it."
+msgstr ""
-#: lib/config.php:465
+#: lib/config.php:626
+#, php-format
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 分享挂载无法实现。请咨询系统管理员进行安装。"
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of"
+" %s is not possible. Please ask your system administrator to install it."
+msgstr ""
-#: lib/config.php:468
+#: lib/config.php:628
+#, php-format
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 "
-"your system administrator to install it."
-msgstr "<b>警告:</b> PHP中未启用或未安装Curl支持。ownCloud / WebDAV 或 GoogleDrive 不能挂载。请请求您的系统管理员安装该它。"
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please"
+" ask your system administrator to install it."
+msgstr ""
-#: templates/settings.php:3
+#: templates/settings.php:2
msgid "External Storage"
msgstr "外部存储"
-#: templates/settings.php:9 templates/settings.php:28
+#: templates/settings.php:8 templates/settings.php:27
msgid "Folder name"
msgstr "目录名称"
-#: templates/settings.php:10
+#: templates/settings.php:9
msgid "External storage"
msgstr "外部存储"
-#: templates/settings.php:11
+#: templates/settings.php:10
msgid "Configuration"
msgstr "配置"
-#: templates/settings.php:12
+#: templates/settings.php:11
msgid "Options"
msgstr "选项"
-#: templates/settings.php:13
-msgid "Applicable"
-msgstr "适用的"
+#: templates/settings.php:12
+msgid "Available for"
+msgstr ""
-#: templates/settings.php:33
+#: templates/settings.php:32
msgid "Add storage"
msgstr "添加存储"
-#: templates/settings.php:90
-msgid "None set"
-msgstr "未设置"
+#: templates/settings.php:92
+msgid "No user or group"
+msgstr ""
-#: templates/settings.php:91
+#: templates/settings.php:95
msgid "All Users"
msgstr "所有用户"
-#: templates/settings.php:92
+#: templates/settings.php:97
msgid "Groups"
msgstr "组"
-#: templates/settings.php:100
+#: templates/settings.php:105
msgid "Users"
msgstr "用户"
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:118 templates/settings.php:119
+#: templates/settings.php:158 templates/settings.php:159
msgid "Delete"
msgstr "删除"
-#: templates/settings.php:129
+#: templates/settings.php:132
msgid "Enable User External Storage"
msgstr "启用用户外部存储"
-#: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "允许用户挂载自有外部存储"
+#: templates/settings.php:135
+msgid "Allow users to mount the following external storage"
+msgstr ""
-#: templates/settings.php:141
+#: templates/settings.php:150
msgid "SSL root certificates"
msgstr "SSL根证书"
-#: templates/settings.php:159
+#: templates/settings.php:168
msgid "Import Root Certificate"
msgstr "导入根证书"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 94907e444cb..09d1b89e669 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
# waterone <suiy02@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 06:12+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,9 +19,13 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "由{owner}共享"
+
#: templates/authenticate.php:4
msgid "This share is password-protected"
-msgstr ""
+msgstr "这是一个密码保护的共享"
#: templates/authenticate.php:7
msgid "The password is wrong. Try again."
@@ -54,32 +59,16 @@ msgstr "共享已禁用"
msgid "For more info, please ask the person who sent this link."
msgstr "欲知详情,请联系发给你链接的人。"
-#: templates/public.php:18
+#: templates/public.php:17
#, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s与您共享了%s文件夹"
+msgid "shared by %s"
+msgstr "由 %s 共享"
-#: templates/public.php:21
+#: templates/public.php:44
#, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s与您共享了%s文件"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "下载"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "上传"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "取消上传"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "没有预览"
+msgid "Download %s"
+msgstr ""
-#: templates/public.php:99
+#: templates/public.php:48
msgid "Direct link"
-msgstr ""
+msgstr "直接链接"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 07256e5e8c7..996e495d97f 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-16 01:55-0400\n"
+"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ajax/delete.php:42
+#: ajax/delete.php:59
#, php-format
msgid "Couldn't delete %s permanently"
msgstr "无法彻底删除文件%s"
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
#, php-format
msgid "Couldn't restore %s"
msgstr "无法恢复%s"
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:3
+msgid "Deleted files"
+msgstr "已删除文件"
+
+#: js/trash.js:33 js/trash.js:124 js/trash.js:173
msgid "Error"
msgstr "错误"
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: js/trash.js:264
+msgid "Deleted Files"
+msgstr "已删除文件"
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
msgid "restored"
msgstr "已恢复"
-#: templates/index.php:8
+#: templates/index.php:6
msgid "Nothing in here. Your trash bin is empty!"
msgstr "这里没有东西. 你的回收站是空的!"
-#: templates/index.php:22
+#: templates/index.php:19
msgid "Name"
msgstr "名称"
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:22 templates/index.php:24
msgid "Restore"
msgstr "恢复"
-#: templates/index.php:33
+#: templates/index.php:30
msgid "Deleted"
msgstr "已删除"
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:33 templates/index.php:34
msgid "Delete"
msgstr "删除"
-
-#: templates/part.breadcrumb.php:9
-msgid "Deleted Files"
-msgstr "已删除文件"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index e94009a873f..fa2d9750d70 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Hawy <hawy.hust@gmail.com>, 2014
+# Martin Liu <liuzh66@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-26 09:42+0000\n"
+"Last-Translator: Hawy <hawy.hust@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +24,22 @@ msgstr ""
msgid "Could not revert: %s"
msgstr "无法恢复: %s"
-#: js/versions.js:7
+#: js/versions.js:14
msgid "Versions"
msgstr "版本"
-#: js/versions.js:53
+#: js/versions.js:60
msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "无法恢复 {file} 到 {timestamp} 的版本。"
-#: js/versions.js:79
+#: js/versions.js:87
msgid "More versions..."
-msgstr ""
+msgstr "更多版本..."
-#: js/versions.js:116
+#: js/versions.js:125
msgid "No other versions available"
-msgstr ""
+msgstr "无其他版本可用"
-#: js/versions.js:149
+#: js/versions.js:155
msgid "Restore"
msgstr "恢复"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 8dd911abea1..81c8dfbaedb 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -4,15 +4,17 @@
#
# Translators:
# Charlie Mak <makchamhim72@gmail.com>, 2013
+# peishi fang <fangpeishi@gmail.com>, 2014
+# Martin Liu <liuzh66@gmail.com>, 2014
# modokwang <modokwang@gmail.com>, 2013
# Xuetian Weng <wengxt@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-10 01:54-0400\n"
+"PO-Revision-Date: 2014-04-09 06:10+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,41 +22,41 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: private/app.php:243
+#: private/app.php:236
#, php-format
msgid ""
"App \"%s\" can't be installed because it is not compatible with this version"
" of ownCloud."
msgstr ""
-#: private/app.php:255
+#: private/app.php:248
msgid "No app name specified"
msgstr ""
-#: private/app.php:360
+#: private/app.php:353
msgid "Help"
msgstr "帮助"
-#: private/app.php:373
+#: private/app.php:366
msgid "Personal"
msgstr "个人"
-#: private/app.php:384
+#: private/app.php:377
msgid "Settings"
msgstr "设置"
-#: private/app.php:396
+#: private/app.php:389
msgid "Users"
msgstr "用户"
-#: private/app.php:409
+#: private/app.php:402
msgid "Admin"
msgstr "管理"
-#: private/app.php:873
+#: private/app.php:875
#, php-format
msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "\"%s\" 升级失败。"
#: private/avatar.php:66
msgid "Unknown filetype"
@@ -64,105 +66,104 @@ msgstr "未知的文件类型"
msgid "Invalid image"
msgstr "无效的图像"
-#: private/defaults.php:34
+#: private/defaults.php:35
msgid "web services under your control"
msgstr "您控制的web服务"
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
-#: private/files.php:231
+#: private/files.php:232
msgid "ZIP download is turned off."
msgstr "ZIP 下载已经关闭"
-#: private/files.php:232
+#: private/files.php:233
msgid "Files need to be downloaded one by one."
msgstr "需要逐一下载文件"
-#: private/files.php:233 private/files.php:261
+#: private/files.php:234 private/files.php:262
msgid "Back to Files"
msgstr "回到文件"
-#: private/files.php:258
+#: private/files.php:259
msgid "Selected files too large to generate zip file."
msgstr "选择的文件太大,无法生成 zip 文件。"
-#: private/files.php:259
+#: private/files.php:260
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
msgstr ""
-#: private/installer.php:63
+#: private/installer.php:64
msgid "No source specified when installing app"
msgstr ""
-#: private/installer.php:70
+#: private/installer.php:71
msgid "No href specified when installing app from http"
msgstr ""
-#: private/installer.php:75
+#: private/installer.php:76
msgid "No path specified when installing app from local file"
msgstr ""
-#: private/installer.php:89
+#: private/installer.php:90
#, php-format
msgid "Archives of type %s are not supported"
msgstr ""
-#: private/installer.php:103
+#: private/installer.php:104
msgid "Failed to open archive when installing app"
msgstr ""
-#: private/installer.php:125
+#: private/installer.php:126
msgid "App does not provide an info.xml file"
msgstr "应用未提供 info.xml 文件"
-#: private/installer.php:131
+#: private/installer.php:132
msgid "App can't be installed because of not allowed code in the App"
msgstr ""
-#: private/installer.php:140
+#: private/installer.php:141
msgid ""
"App can't be installed because it is not compatible with this version of "
"ownCloud"
msgstr ""
-#: private/installer.php:146
+#: private/installer.php:147
msgid ""
"App can't be installed because it contains the <shipped>true</shipped> tag "
"which is not allowed for non shipped apps"
msgstr ""
-#: private/installer.php:159
+#: private/installer.php:160
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 ""
-#: private/installer.php:169
+#: private/installer.php:170
msgid "App directory already exists"
-msgstr ""
+msgstr "应用程序目录已存在"
-#: private/installer.php:182
+#: private/installer.php:183
#, php-format
msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "无法创建应用程序文件夹。请修正权限。%s"
-#: private/json.php:28
+#: private/json.php:29
msgid "Application is not enabled"
msgstr "应用程序未启用"
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
msgid "Authentication error"
msgstr "认证出错"
-#: private/json.php:51
+#: private/json.php:52
msgid "Token expired. Please reload page."
msgstr "Token 过期,请刷新页面。"
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
msgstr "文件"
@@ -196,23 +197,23 @@ msgid "MS SQL username and/or password not valid: %s"
msgstr "MS SQL 用户名和/或密码无效:%s"
#: 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
+#: private/setup/oci.php:114 private/setup/postgresql.php:31
+#: private/setup/postgresql.php:84
msgid "You need to enter either an existing account or the administrator."
msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
#: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL 数据库用户名和/或密码无效"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
#: private/setup/oci.php:151 private/setup/oci.php:162
#: private/setup/oci.php:169 private/setup/oci.php:178
#: private/setup/oci.php:186 private/setup/oci.php:195
-#: private/setup/oci.php:201 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
+#: private/setup/oci.php:201 private/setup/postgresql.php:103
+#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
+#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
#, php-format
msgid "DB Error: \"%s\""
msgstr "数据库错误:\"%s\""
@@ -221,30 +222,30 @@ msgstr "数据库错误:\"%s\""
#: private/setup/oci.php:122 private/setup/oci.php:145
#: private/setup/oci.php:152 private/setup/oci.php:163
#: private/setup/oci.php:179 private/setup/oci.php:187
-#: private/setup/oci.php:196 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
+#: private/setup/oci.php:196 private/setup/postgresql.php:104
+#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
+#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
#, php-format
msgid "Offending command was: \"%s\""
msgstr "冲突命令为:\"%s\""
#: private/setup/mysql.php:85
#, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
#: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
#: private/setup/mysql.php:91
#, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL 用户 '%s'@'%%' 已存在"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
#: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -259,7 +260,7 @@ msgstr "Oracle 数据库用户名和/或密码无效"
msgid "Offending command was: \"%s\", name: %s, password: %s"
msgstr "冲突命令为:\"%s\",名称:%s,密码:%s"
-#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
msgid "PostgreSQL username and/or password not valid"
msgstr "PostgreSQL 数据库用户名和/或密码无效"
@@ -271,62 +272,86 @@ msgstr "请设置一个管理员用户名。"
msgid "Set an admin password."
msgstr "请设置一个管理员密码。"
-#: private/setup.php:195
+#: private/setup.php:202
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
-#: private/setup.php:196
+#: private/setup.php:203
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指南</a>."
-#: private/tags.php:194
+#: private/share/mailnotifications.php:72
+#: private/share/mailnotifications.php:118
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s 向您分享了 »%s«"
+
+#: private/tags.php:193
#, php-format
msgid "Could not find category \"%s\""
msgstr "无法找到分类 \"%s\""
-#: private/template/functions.php:130
+#: private/template/functions.php:133
msgid "seconds ago"
msgstr "秒前"
-#: private/template/functions.php:131
+#: private/template/functions.php:134
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n 分钟前"
-#: private/template/functions.php:132
+#: private/template/functions.php:135
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n 小时前"
-#: private/template/functions.php:133
+#: private/template/functions.php:136
msgid "today"
msgstr "今天"
-#: private/template/functions.php:134
+#: private/template/functions.php:137
msgid "yesterday"
msgstr "昨天"
-#: private/template/functions.php:136
+#: private/template/functions.php:139
msgid "%n day go"
msgid_plural "%n days ago"
msgstr[0] "%n 天前"
-#: private/template/functions.php:138
+#: private/template/functions.php:141
msgid "last month"
msgstr "上月"
-#: private/template/functions.php:139
+#: private/template/functions.php:142
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n 月前"
-#: private/template/functions.php:141
+#: private/template/functions.php:144
msgid "last year"
msgstr "去年"
-#: private/template/functions.php:142
+#: private/template/functions.php:145
msgid "years ago"
msgstr "年前"
+
+#: private/user/manager.php:246
+msgid ""
+"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
+"\"0-9\", and \"_.@-\""
+msgstr ""
+
+#: private/user/manager.php:251
+msgid "A valid username must be provided"
+msgstr "必须提供合法的用户名"
+
+#: private/user/manager.php:255
+msgid "A valid password must be provided"
+msgstr "必须提供合法的密码"
+
+#: private/user/manager.php:260
+msgid "The username is already being used"
+msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 75e9691e0df..38db6ba96f8 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,18 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
+# mozillazg <opensource.mozillazg@gmail.com>, 2014
# m13253 <m13253@hotmail.com>, 2013
# waterone <suiy02@gmail.com>, 2013
# modokwang <modokwang@gmail.com>, 2013
# Xuetian Weng <wengxt@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-23 01:54-0400\n"
+"PO-Revision-Date: 2014-04-23 05:54+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +24,64 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "邮件已发送"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:149
+msgid "Encryption"
+msgstr "加密"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
#: ajax/apps/ocs.php:20
msgid "Unable to load list from App Store"
msgstr "无法从应用商店载入列表"
#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
msgid "Authentication error"
msgstr "认证出错"
#: ajax/changedisplayname.php:31
msgid "Your full name has been changed."
-msgstr ""
+msgstr "您的全名已修改。"
#: ajax/changedisplayname.php:34
msgid "Unable to change full name"
-msgstr ""
+msgstr "无法修改全名"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -47,6 +91,20 @@ msgstr "已存在该组"
msgid "Unable to add group"
msgstr "无法添加组"
+#: ajax/decryptall.php:31
+msgid "Files decrypted successfully"
+msgstr ""
+
+#: ajax/decryptall.php:33
+msgid ""
+"Couldn't decrypt your files, please check your owncloud.log or ask your "
+"administrator"
+msgstr ""
+
+#: ajax/decryptall.php:36
+msgid "Couldn't decrypt your files, check your password and try again"
+msgstr ""
+
#: ajax/lostpassword.php:12
msgid "Email saved"
msgstr "电子邮件已保存"
@@ -89,91 +147,119 @@ msgstr "无法从组%s中移除用户"
msgid "Couldn't update app."
msgstr "无法更新 app。"
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
msgid "Wrong password"
-msgstr ""
+msgstr "错误密码"
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
msgid "No user supplied"
-msgstr ""
+msgstr "没有满足的用户"
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
msgid ""
"Please provide an admin recovery password, otherwise all user data will be "
"lost"
msgstr ""
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
msgid ""
"Wrong admin recovery password. Please check the password and try again."
msgstr ""
-#: changepassword/controller.php:87
+#: changepassword/controller.php:81
msgid ""
"Back-end doesn't support password change, but the users encryption key was "
"successfully updated."
msgstr ""
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
msgid "Unable to change password"
+msgstr "不能更改密码"
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "用户文档"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
msgstr ""
-#: js/apps.js:43
+#: js/apps.js:67
msgid "Update to {appversion}"
msgstr "更新至 {appversion}"
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
msgid "Disable"
msgstr "禁用"
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
msgid "Enable"
msgstr "开启"
-#: js/apps.js:71
+#: js/apps.js:95
msgid "Please wait...."
msgstr "请稍等...."
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
msgid "Error while disabling app"
msgstr "禁用 app 时出错"
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
msgid "Error while enabling app"
msgstr "启用 app 时出错"
-#: js/apps.js:125
+#: js/apps.js:149
msgid "Updating...."
msgstr "正在更新...."
-#: js/apps.js:128
+#: js/apps.js:152
msgid "Error while updating app"
msgstr "更新 app 时出错"
-#: js/apps.js:128
+#: js/apps.js:152
msgid "Error"
msgstr "错误"
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:55
msgid "Update"
msgstr "更新"
-#: js/apps.js:132
+#: js/apps.js:156
msgid "Updated"
msgstr "已更新"
-#: js/personal.js:220
+#: js/personal.js:243
msgid "Select a profile picture"
msgstr ""
-#: js/personal.js:266
+#: js/personal.js:274
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:275
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:276
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:313
msgid "Decrypting files... Please wait, this can take some time."
msgstr "正在解密文件... 请稍等,可能需要一些时间。"
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "保存中"
-
#: js/users.js:47
msgid "deleted"
msgstr "已经删除"
@@ -186,75 +272,99 @@ msgstr "撤销"
msgid "Unable to remove user"
msgstr "无法移除用户"
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
msgid "Groups"
msgstr "组"
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
msgid "Group Admin"
msgstr "组管理员"
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
msgid "Delete"
msgstr "删除"
-#: js/users.js:284
+#: js/users.js:310
msgid "add group"
msgstr "添加组"
-#: js/users.js:451
+#: js/users.js:486
msgid "A valid username must be provided"
msgstr "必须提供合法的用户名"
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
msgid "Error creating user"
msgstr "创建用户出错"
-#: js/users.js:457
+#: js/users.js:492
msgid "A valid password must be provided"
msgstr "必须提供合法的密码"
-#: js/users.js:481
+#: js/users.js:516
msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "警告:用户 \"{user}\" 的家目录已存在"
-#: personal.php:45 personal.php:46
+#: personal.php:48 personal.php:49
msgid "__language_name__"
msgstr "简体中文"
#: templates/admin.php:8
msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "所有(灾难性问题,错误,警告,信息,调试)"
#: templates/admin.php:9
msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "信息,警告,错误和灾难性问题"
#: templates/admin.php:10
msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "警告,错误和灾难性问题"
#: templates/admin.php:11
msgid "Errors and fatal issues"
-msgstr ""
+msgstr "错误和灾难性问题"
#: templates/admin.php:12
msgid "Fatal issues only"
+msgstr "仅灾难性问题"
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "无"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "登录"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
msgstr ""
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
msgid "Security Warning"
msgstr "安全警告"
-#: templates/admin.php:25
+#: templates/admin.php:50
#, php-format
msgid ""
"You are accessing %s via HTTP. We strongly suggest you configure your server"
" to require using HTTPS instead."
msgstr ""
-#: templates/admin.php:39
+#: templates/admin.php:64
msgid ""
"Your data directory and your files are probably accessible from the "
"internet. The .htaccess file is not working. We strongly suggest that you "
@@ -263,68 +373,68 @@ msgid ""
"root."
msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器,以使数据文件夹不可被访问,或者将数据文件夹移到web服务器以外。"
-#: templates/admin.php:50
+#: templates/admin.php:75
msgid "Setup Warning"
msgstr "设置警告"
-#: templates/admin.php:53
+#: templates/admin.php:78
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
-#: templates/admin.php:54
+#: templates/admin.php:79
#, php-format
msgid "Please double check the <a href=\"%s\">installation guides</a>."
msgstr "请认真检查<a href='%s'>安装指南</a>."
-#: templates/admin.php:65
+#: templates/admin.php:90
msgid "Module 'fileinfo' missing"
msgstr "模块'文件信息'丢失"
-#: templates/admin.php:68
+#: templates/admin.php:93
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
msgstr "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果."
-#: templates/admin.php:79
+#: templates/admin.php:104
msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "您的 PHP 版本不是最新版"
-#: templates/admin.php:82
+#: templates/admin.php:107
msgid ""
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
"newer because older versions are known to be broken. It is possible that "
"this installation is not working correctly."
msgstr ""
-#: templates/admin.php:93
+#: templates/admin.php:118
msgid "Locale not working"
msgstr "本地化无法工作"
-#: templates/admin.php:98
+#: templates/admin.php:123
msgid "System locale can not be set to a one which supports UTF-8."
msgstr ""
-#: templates/admin.php:102
+#: templates/admin.php:127
msgid ""
"This means that there might be problems with certain characters in file "
"names."
msgstr ""
-#: templates/admin.php:106
+#: templates/admin.php:131
#, php-format
msgid ""
"We strongly suggest to install the required packages on your system to "
"support one of the following locales: %s."
msgstr ""
-#: templates/admin.php:118
+#: templates/admin.php:143
msgid "Internet connection not working"
msgstr "因特网连接无法工作"
-#: templates/admin.php:121
+#: templates/admin.php:146
msgid ""
"This server has no working internet connection. This means that some of the "
"features like mounting of external storage, notifications about updates or "
@@ -333,118 +443,178 @@ msgid ""
"internet connection for this server if you want to have all features."
msgstr "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作,例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
-#: templates/admin.php:135
+#: templates/admin.php:160
msgid "Cron"
msgstr "计划任务"
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
msgid "Execute one task with each page loaded"
msgstr "每个页面加载后执行一个任务"
-#: templates/admin.php:150
+#: templates/admin.php:192
msgid ""
"cron.php is registered at a webcron service to call cron.php every 15 "
"minutes over http."
msgstr ""
-#: templates/admin.php:158
+#: templates/admin.php:200
msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "使用系统 cron 服务每15分钟调用一次 cron.php 文件。"
-#: templates/admin.php:163
+#: templates/admin.php:205
msgid "Sharing"
msgstr "共享"
-#: templates/admin.php:169
+#: templates/admin.php:211
msgid "Enable Share API"
msgstr "启用共享API"
-#: templates/admin.php:170
+#: templates/admin.php:212
msgid "Allow apps to use the Share API"
msgstr "允许应用软件使用共享API"
-#: templates/admin.php:177
+#: templates/admin.php:219
msgid "Allow links"
msgstr "允许链接"
-#: templates/admin.php:178
+#: templates/admin.php:220
msgid "Allow users to share items to the public with links"
msgstr "允许用户使用连接公开共享项目"
-#: templates/admin.php:186
+#: templates/admin.php:227
msgid "Allow public uploads"
msgstr "允许公开上传"
-#: templates/admin.php:187
+#: templates/admin.php:228
msgid ""
"Allow users to enable others to upload into their publicly shared folders"
msgstr "用户可让其他人上传到他的公开共享文件夹"
-#: templates/admin.php:195
+#: templates/admin.php:235
msgid "Allow resharing"
msgstr "允许再次共享"
-#: templates/admin.php:196
+#: templates/admin.php:236
msgid "Allow users to share items shared with them again"
msgstr "允许用户将共享给他们的项目再次共享"
-#: templates/admin.php:203
+#: templates/admin.php:243
msgid "Allow users to share with anyone"
msgstr "允许用户向任何人共享"
-#: templates/admin.php:206
+#: templates/admin.php:246
msgid "Allow users to only share with users in their groups"
msgstr "允许用户只向同组用户共享"
-#: templates/admin.php:213
+#: templates/admin.php:253
msgid "Allow mail notification"
-msgstr ""
+msgstr "允许邮件通知"
-#: templates/admin.php:214
-msgid "Allow user to send mail notification for shared files"
+#: templates/admin.php:254
+msgid "Allow users to send mail notification for shared files"
msgstr ""
-#: templates/admin.php:221
+#: templates/admin.php:261
msgid "Security"
msgstr "安全"
-#: templates/admin.php:234
+#: templates/admin.php:274
msgid "Enforce HTTPS"
msgstr "强制使用 HTTPS"
-#: templates/admin.php:236
+#: templates/admin.php:276
#, php-format
msgid "Forces the clients to connect to %s via an encrypted connection."
msgstr "强制客户端通过加密连接连接到%s。"
-#: templates/admin.php:242
+#: templates/admin.php:282
#, php-format
msgid ""
"Please connect to your %s via HTTPS to enable or disable the SSL "
"enforcement."
msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "服务器地址"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "端口"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "凭证"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
msgid "Log"
msgstr "日志"
-#: templates/admin.php:255
+#: templates/admin.php:377
msgid "Log level"
msgstr "日志级别"
-#: templates/admin.php:287
+#: templates/admin.php:409
msgid "More"
msgstr "更多"
-#: templates/admin.php:288
+#: templates/admin.php:410
msgid "Less"
msgstr "更少"
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:171
msgid "Version"
msgstr "版本"
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:174
msgid ""
"Developed by the <a href=\"http://ownCloud.org/contact\" "
"target=\"_blank\">ownCloud community</a>, the <a "
@@ -454,30 +624,34 @@ msgid ""
"License\">AGPL</abbr></a>."
msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发, <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</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:13
+#: templates/apps.php:14
msgid "Add your App"
msgstr "添加应用"
-#: templates/apps.php:28
+#: templates/apps.php:31
msgid "More Apps"
msgstr "更多应用"
-#: templates/apps.php:33
+#: templates/apps.php:38
msgid "Select an App"
msgstr "选择一个应用"
-#: templates/apps.php:39
+#: templates/apps.php:43
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:49
msgid "See application page at apps.owncloud.com"
msgstr "查看在 app.owncloud.com 的应用程序页面"
-#: templates/apps.php:41
+#: templates/apps.php:51
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:53
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "用户文档"
-
#: templates/help.php:6
msgid "Administrator Documentation"
msgstr "管理员文档"
@@ -511,15 +685,15 @@ msgstr "再次显示首次运行向导"
msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
msgstr "你已使用 <strong>%s</strong>,有效空间 <strong>%s</strong>"
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:38 templates/users.php:21 templates/users.php:87
msgid "Password"
msgstr "密码"
-#: templates/personal.php:40
+#: templates/personal.php:39
msgid "Your password was changed"
msgstr "密码已修改"
-#: templates/personal.php:41
+#: templates/personal.php:40
msgid "Unable to change your password"
msgstr "无法修改密码"
@@ -527,67 +701,69 @@ msgstr "无法修改密码"
msgid "Current password"
msgstr "当前密码"
-#: templates/personal.php:44
+#: templates/personal.php:45
msgid "New password"
msgstr "新密码"
-#: templates/personal.php:46
+#: templates/personal.php:49
msgid "Change password"
msgstr "修改密码"
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:61 templates/users.php:86
msgid "Full Name"
-msgstr ""
+msgstr "全名"
-#: templates/personal.php:73
+#: templates/personal.php:76
msgid "Email"
msgstr "电子邮件"
-#: templates/personal.php:75
+#: templates/personal.php:78
msgid "Your email address"
msgstr "您的电子邮件"
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "填写电子邮件地址以启用密码恢复功能"
+#: templates/personal.php:81
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
-#: templates/personal.php:86
+#: templates/personal.php:89
msgid "Profile picture"
msgstr "联系人图片"
-#: templates/personal.php:91
+#: templates/personal.php:94
msgid "Upload new"
-msgstr ""
+msgstr "上传新的"
-#: templates/personal.php:93
+#: templates/personal.php:96
msgid "Select new from Files"
-msgstr ""
+msgstr "从文件中选择一个新的"
-#: templates/personal.php:94
+#: templates/personal.php:97
msgid "Remove image"
-msgstr ""
+msgstr "移除图片"
-#: templates/personal.php:95
+#: templates/personal.php:98
msgid "Either png or jpg. Ideally square but you will be able to crop it."
msgstr ""
-#: templates/personal.php:97
+#: templates/personal.php:100
msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "您的头像由您的原始账户所提供。"
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:104
+msgid "Cancel"
+msgstr "取消"
-#: templates/personal.php:102
+#: templates/personal.php:105
msgid "Choose as profile image"
msgstr ""
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:111 templates/personal.php:112
msgid "Language"
msgstr "语言"
-#: templates/personal.php:130
+#: templates/personal.php:131
msgid "Help translate"
msgstr "帮助翻译"
@@ -600,74 +776,70 @@ msgstr "WebDAV"
msgid ""
"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
"WebDAV</a>"
-msgstr ""
-
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "加密"
+msgstr "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>"
-#: templates/personal.php:152
+#: templates/personal.php:151
msgid "The encryption app is no longer enabled, please decrypt all your files"
msgstr ""
-#: templates/personal.php:158
+#: templates/personal.php:157
msgid "Log-in password"
msgstr "登录密码"
-#: templates/personal.php:163
+#: templates/personal.php:162
msgid "Decrypt all Files"
msgstr "解密所有文件"
-#: templates/users.php:21
+#: templates/users.php:19
msgid "Login Name"
msgstr "登录名称"
-#: templates/users.php:30
+#: templates/users.php:28
msgid "Create"
msgstr "创建"
-#: templates/users.php:36
+#: templates/users.php:34
msgid "Admin Recovery Password"
msgstr "管理恢复密码"
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
msgid ""
"Enter the recovery password in order to recover the users files during "
"password change"
msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
-#: templates/users.php:42
+#: templates/users.php:40
msgid "Default Storage"
msgstr "默认存储"
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")"
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
msgid "Unlimited"
msgstr "无限"
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
msgid "Other"
msgstr "其它"
-#: templates/users.php:87
+#: templates/users.php:85
msgid "Username"
msgstr "用户名"
-#: templates/users.php:94
+#: templates/users.php:92
msgid "Storage"
msgstr "存储"
-#: templates/users.php:108
+#: templates/users.php:106
msgid "change full name"
-msgstr ""
+msgstr "更改全名"
-#: templates/users.php:112
+#: templates/users.php:110
msgid "set new password"
msgstr "设置新密码"
-#: templates/users.php:143
+#: templates/users.php:141
msgid "Default"
msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 593b32a2372..882b10118b7 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
# modokwang <modokwang@gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-04-16 01:55-0400\n"
+"PO-Revision-Date: 2014-04-16 05:41+0000\n"
+"Last-Translator: I Robot\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +88,43 @@ msgstr "成功"
msgid "Error"
msgstr "错误"
-#: js/settings.js:837
+#: js/settings.js:838
msgid "Configuration OK"
msgstr ""
-#: js/settings.js:846
+#: js/settings.js:847
msgid "Configuration incorrect"
msgstr ""
-#: js/settings.js:855
+#: js/settings.js:856
msgid "Configuration incomplete"
msgstr ""
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
msgid "Select groups"
msgstr "选择分组"
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
msgid "Select object classes"
msgstr ""
-#: js/settings.js:878
+#: js/settings.js:879
msgid "Select attributes"
msgstr ""
-#: js/settings.js:905
+#: js/settings.js:906
msgid "Connection test succeeded"
msgstr "连接测试成功"
-#: js/settings.js:912
+#: js/settings.js:913
msgid "Connection test failed"
msgstr "连接测试失败"
-#: js/settings.js:921
+#: js/settings.js:922
msgid "Do you really want to delete the current Server Configuration?"
msgstr "您真的想要删除当前服务器配置吗?"
-#: js/settings.js:922
+#: js/settings.js:923
msgid "Confirm Deletion"
msgstr "确认删除"
@@ -139,11 +140,11 @@ msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:951
+#: lib/wizard.php:983
msgid "Could not find the desired feature"
msgstr ""
@@ -161,7 +162,7 @@ msgstr "帮助"
#: templates/part.wizard-groupfilter.php:4
#, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
msgstr ""
#: templates/part.wizard-groupfilter.php:8
@@ -197,7 +198,7 @@ msgid "groups found"
msgstr ""
#: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
msgstr ""
#: templates/part.wizard-loginfilter.php:8
@@ -265,7 +266,7 @@ msgstr "您可以在高级选项卡里为用户和组指定Base DN"
#: templates/part.wizard-userfilter.php:4
#, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
msgstr ""
#: templates/part.wizard-userfilter.php:31
@@ -284,7 +285,7 @@ msgstr "返回"
#: templates/part.wizardcontrols.php:8
msgid "Continue"
-msgstr ""
+msgstr "继续"
#: templates/settings.php:11
msgid ""
@@ -331,11 +332,11 @@ msgstr "禁用主服务器"
#: templates/settings.php:25
msgid "Only connect to the replica server."
-msgstr ""
+msgstr "只能连接到复制服务器"
#: templates/settings.php:26
-msgid "Case insensitve LDAP server (Windows)"
-msgstr "大小写敏感LDAP服务器(Windows)"
+msgid "Case insensitive LDAP server (Windows)"
+msgstr ""
#: templates/settings.php:27
msgid "Turn off SSL certificate validation."
@@ -408,41 +409,62 @@ msgstr "群组搜索属性"
msgid "Group-Member association"
msgstr "组成员关联"
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
#: templates/settings.php:40
+msgid "Paging chunksize"
+msgstr ""
+
+#: templates/settings.php:40
+msgid ""
+"Chunksize used for paged LDAP searches that may return bulky results like "
+"user or group enumeration. (Setting it 0 disables paged LDAP searches in "
+"those situations.)"
+msgstr ""
+
+#: templates/settings.php:42
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:42
+#: templates/settings.php:44
msgid "Quota Field"
msgstr "配额字段"
-#: templates/settings.php:43
+#: templates/settings.php:45
msgid "Quota Default"
msgstr "默认配额"
-#: templates/settings.php:43
+#: templates/settings.php:45
msgid "in bytes"
msgstr "字节数"
-#: templates/settings.php:44
+#: templates/settings.php:46
msgid "Email Field"
msgstr "电邮字段"
-#: templates/settings.php:45
+#: templates/settings.php:47
msgid "User Home Folder Naming Rule"
msgstr "用户主目录命名规则"
-#: templates/settings.php:45
+#: templates/settings.php:47
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
-#: templates/settings.php:51
+#: templates/settings.php:53
msgid "Internal Username"
msgstr "内部用户名"
-#: templates/settings.php:52
+#: templates/settings.php:54
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 "
@@ -458,15 +480,15 @@ msgid ""
"effect only on newly mapped (added) LDAP users."
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:55
msgid "Internal Username Attribute:"
msgstr "内部用户名属性:"
-#: templates/settings.php:54
+#: templates/settings.php:56
msgid "Override UUID detection"
msgstr "超越UUID检测"
-#: templates/settings.php:55
+#: templates/settings.php:57
msgid ""
"By default, the UUID attribute is automatically detected. The UUID attribute"
" is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -477,19 +499,19 @@ msgid ""
"Changes will have effect only on newly mapped (added) LDAP users and groups."
msgstr ""
-#: templates/settings.php:56
+#: templates/settings.php:58
msgid "UUID Attribute for Users:"
msgstr ""
-#: templates/settings.php:57
+#: templates/settings.php:59
msgid "UUID Attribute for Groups:"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:60
msgid "Username-LDAP User Mapping"
msgstr "用户名-LDAP用户映射"
-#: templates/settings.php:59
+#: templates/settings.php:61
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. "
@@ -503,10 +525,10 @@ msgid ""
"experimental stage."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:62
msgid "Clear Username-LDAP User Mapping"
msgstr "清除用户-LDAP用户映射"
-#: templates/settings.php:60
+#: templates/settings.php:62
msgid "Clear Groupname-LDAP Group Mapping"
msgstr "清除组用户-LDAP级映射"