From a01f3b959abd9720ec1b33624cbd31bee4838c2b Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 10 Oct 2013 17:03:01 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 plugins/acl/localization/zh_CN.inc |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 55bd7dc..68d2944 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -15,7 +15,6 @@
 
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
-
 $labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
 $labels['username'] = '用户:';
@@ -62,18 +61,10 @@
 $labels['shortacldelete'] = '删除';
 $labels['longacll'] = '该文件夹在列表上可见且可被订阅';
 $labels['longaclr'] = '该文件夹可被打开阅读';
-$labels['longacls'] = 'Messages Seen flag can be changed';
-$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = '消息可写或可被复制至文件夹中';
-$labels['longaclp'] = 'Messages can be posted to this folder';
-$labels['longaclc'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longaclk'] = 'Folders can be created (or renamed) directly under this folder';
-$labels['longacld'] = 'Messages Delete flag can be changed';
-$labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = '消息可被清除';
 $labels['longaclx'] = '该文件夹可被删除或重命名';
 $labels['longacla'] = '文件夹访问权限可被修改';
-$labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = '该文件夹可被打开阅读';
 $labels['longaclwrite'] = '消息可被标记,撰写或复制至文件夹中';
 $labels['longacldelete'] = '信息可被删除';
@@ -82,7 +73,6 @@
 $messages['updatesuccess'] = '成功修改访问权限';
 $messages['deletesuccess'] = '成功删除访问权限';
 $messages['createsuccess'] = '成功添加访问权限';
-$messages['updateerror'] = '无法更新访问权限';
 $messages['deleteerror'] = '无法删除访问权限';
 $messages['createerror'] = '无法添加访问权限';
 $messages['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';

--
Gitblit v1.9.1