1 files changed, 43 insertions, 4 deletions
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 3da1b9ca685..097c26252c8 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,14 +1,17 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s 向您分享了 »%s«",
+"Couldn't send mail to following users: %s " => "发送失败，用户如下: %s ",
 "Turned on maintenance mode" => "启用维护模式",
 "Turned off maintenance mode" => "关闭维护模式",
 "Updated database" => "数据库已更新",
 "Updating filecache, this may take really long..." => "正在更新文件缓存，这可能需要较长时间...",
 "Updated filecache" => "文件缓存已更新",
 "... %d%% done ..." => "...已完成 %d%% ...",
+"No image or file provided" => "没有提供图片或文件",
 "Unknown filetype" => "未知的文件类型",
 "Invalid image" => "无效的图像",
+"No temporary profile picture available, try again" => "没有临时概览页图片可用，请重试",
+"No crop data provided" => "没有提供相应数据",
 "Sunday" => "星期日",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -41,11 +44,20 @@ $TRANSLATIONS = array(
 "last year" => "去年",
 "years ago" => "年前",
 "Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
 "Yes" => "是",
 "No" => "否",
 "Ok" => "好",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Error loading message template: {error}" => "加载消息模板出错: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
+"One file conflict" => "1个文件冲突",
+"Which files do you want to keep?" => "想要保留哪一个文件呢？",
+"If you select both versions, the copied file will have a number added to its name." => "如果同时选择了连个版本，复制的文件名将会添加上一个数字。",
 "Cancel" => "取消",
+"Continue" => "继续",
+"(all selected)" => "(选中全部)",
+"({count} selected)" => "(选择了{count}个)",
+"Error loading file exists template" => "加载文件存在性模板失败",
 "Shared" => "已共享",
 "Share" => "分享",
 "Error" => "错误",
@@ -54,6 +66,8 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "修改权限时出错",
 "Shared with you and the group {group} by {owner}" => "{owner} 共享给您及 {group} 组",
 "Shared with you by {owner}" => "{owner} 与您共享",
+"Share with user or group …" => "分享给其他用户或组 ...",
+"Share link" => "分享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
 "Allow Public Upload" => "允许公开上传",
@@ -67,6 +81,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "不允许二次共享",
 "Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
 "Unshare" => "取消共享",
+"notify by email" => "以邮件通知",
 "can edit" => "可以修改",
 "access control" => "访问控制",
 "create" => "创建",
@@ -80,8 +95,13 @@ $TRANSLATIONS = array(
 "Email sent" => "邮件已发送",
 "Warning" => "警告",
 "The object type is not specified." => "未指定对象类型。",
+"Enter new" => "输入新...",
 "Delete" => "删除",
 "Add" => "增加",
+"Edit tags" => "编辑标签",
+"Error loading dialog template: {error}" => "加载对话框模板出错: {error}",
+"No tags selected for deletion." => "请选择要删除的标签。",
+"Please reload the page." => "请重新加载页面。",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
 "%s password reset" => "重置 %s 的密码",
@@ -102,8 +122,18 @@ $TRANSLATIONS = array(
 "Apps" => "应用",
 "Admin" => "管理",
 "Help" => "帮助",
+"Error loading tags" => "加载标签出错",
+"Tag already exists" => "标签已存在",
+"Error deleting tag(s)" => "删除标签(s)时出错",
+"Error tagging" => "添加标签时出错",
+"Error untagging" => "移除标签时出错",
+"Error favoriting" => "收藏时出错",
+"Error unfavoriting" => "删除收藏时出错",
 "Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
+"The share will expire on %s." => "此分享将在 %s 过期。",
+"Cheers!" => "干杯！",
 "Security Warning" => "安全警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
@@ -112,7 +142,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
-"Advanced" => "高级",
 "Data folder" => "数据目录",
 "Configure the database" => "配置数据库",
 "will be used" => "将被使用",
@@ -122,15 +151,25 @@ $TRANSLATIONS = array(
 "Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
+"Finishing …" => "正在结束 ...",
+"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." => "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此接口。",
 "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您没有最近修改您的密码，您的帐户可能会受到影响！",
 "Please change your password to secure your account again." => "请修改您的密码，以保护您的账户安全。",
+"Server side authentication failed!" => "服务端验证失败！",
+"Please contact your administrator." => "请联系你的管理员。",
 "Lost your password?" => "忘记密码？",
 "remember" => "记住",
 "Log in" => "登录",
 "Alternative Logins" => "其他登录方式",
-"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。"
+"This ownCloud instance is currently in single user mode." => "当前ownCloud实例运行在单用户模式下。",
+"This means only administrators can use the instance." => "这意味着只有管理员才能在实例上操作。",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
+"Thank you for your patience." => "感谢让你久等了。",
+"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。",
+"This ownCloud instance is currently being updated, which may take a while." => "当前ownCloud实例正在更新，可能需要一段时间。",
+"Please reload this page after a short time to continue using ownCloud." => "请稍后重新加载这个页面，以继续使用ownCloud。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";