diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
| commit | afb5de955e00490be5762247e817b20722091f37 (patch) | |
| tree | 035b826eacc5a21244c383075138731eaafeaebc /settings/l10n/zh_CN.php | |
| parent | 130c9cad030ca777e23ef70b76822553ea1c6411 (diff) | |
| parent | 31cc9aa80d4284e13dc95d2ef1428bed78c22d65 (diff) | |
| download | nextcloud-server-afb5de955e00490be5762247e817b20722091f37.tar.gz nextcloud-server-afb5de955e00490be5762247e817b20722091f37.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
Diffstat (limited to 'settings/l10n/zh_CN.php')
| -rw-r--r-- | settings/l10n/zh_CN.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 00e51d211c4..407177d2ac4 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -5,12 +5,11 @@ "Could not enable app. " => "无法开启App", "Email saved" => "电子邮件已保存", "Invalid email" => "无效的电子邮件", -"OpenID Changed" => "OpenID 已修改", -"Invalid request" => "非法请求", "Unable to delete group" => "无法删除组", "Authentication error" => "认证错误", "Unable to delete user" => "无法删除用户", "Language changed" => "语言已修改", +"Invalid request" => "非法请求", "Admins can't remove themself from the admin group" => "管理员不能将自己移出管理组。", "Unable to add user to group %s" => "无法把用户添加到组 %s", "Unable to remove user from group %s" => "无法从组%s中移除用户", @@ -53,7 +52,11 @@ "Name" => "名称", "Groups" => "组", "Create" => "创建", +"Default Storage" => "默认存储", +"Unlimited" => "无限", "Other" => "其它", "Group Admin" => "组管理员", +"Storage" => "存储", +"Default" => "默认", "Delete" => "删除" ); |