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 |   85 ++++++++++++++++++++++++------------------
 1 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 3cde07a..68d2944 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -2,67 +2,80 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: WeiHua.Deng <mcp2000@gmail.com>                               |
- +-----------------------------------------------------------------------+
-*/
 
-$labels = array();
-$labels['sharing'] = '共享中';
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+$labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
-$labels['username'] = '用户名:';
+$labels['username'] = '用户:';
 $labels['advanced'] = '高级模式';
-$labels['newuser'] = '添加条目';
+$labels['newuser'] = '新增条目';
+$labels['actions'] = '权限设置...';
 $labels['anyone'] = '所有用户(任何人)';
 $labels['anonymous'] = '来宾(匿名)';
 $labels['identifier'] = '标识符';
 $labels['acll'] = '查找';
-$labels['shortacll'] = '查找';
 $labels['aclr'] = '读取消息';
 $labels['acls'] = '保存已读状态';
+$labels['aclw'] = '写入标志';
 $labels['acli'] = '插入(复制至)';
 $labels['aclp'] = '发送';
-$labels['shortaclp'] = '发送';
 $labels['aclc'] = '创建子文件夹';
 $labels['aclk'] = '创建子文件夹';
 $labels['acld'] = '删除消息';
 $labels['aclt'] = '删除消息';
+$labels['acle'] = '清除';
 $labels['aclx'] = '删除文件夹';
 $labels['acla'] = '管理';
-$labels['shortacla'] = '管理';
-$labels['aclother'] = '其他';
-$labels['shortaclother'] = '其他';
-$labels['aclwrite'] = '撰写';
-$labels['shortaclw'] = '撰写';
-$labels['shortaclwrite'] = '撰写';
+$labels['aclfull'] = '全部控制';
+$labels['aclother'] = '其它';
+$labels['aclread'] = '读取';
+$labels['aclwrite'] = '写入';
 $labels['acldelete'] = '删除';
-$labels['shortacld'] = '删除';
-$labels['shortaclt'] = '删除';
-$labels['shortacldelete'] = '删除';
-$labels['shortacls'] = '保留';
+$labels['shortacll'] = '查找';
+$labels['shortaclr'] = '读取';
+$labels['shortacls'] = '保存';
+$labels['shortaclw'] = '写入';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '发送';
 $labels['shortaclc'] = '新建';
 $labels['shortaclk'] = '新建';
+$labels['shortacld'] = '删除';
+$labels['shortaclt'] = '删除';
+$labels['shortacle'] = '清除';
 $labels['shortaclx'] = '删除文件夹';
+$labels['shortacla'] = '管理';
+$labels['shortaclother'] = '其他';
+$labels['shortaclread'] = '读取';
+$labels['shortaclwrite'] = '写入';
+$labels['shortacldelete'] = '删除';
 $labels['longacll'] = '该文件夹在列表上可见且可被订阅';
 $labels['longaclr'] = '该文件夹可被打开阅读';
+$labels['longacli'] = '消息可写或可被复制至文件夹中';
+$labels['longacle'] = '消息可被清除';
+$labels['longaclx'] = '该文件夹可被删除或重命名';
+$labels['longacla'] = '文件夹访问权限可被修改';
 $labels['longaclread'] = '该文件夹可被打开阅读';
-$labels['longaclx'] = '该文件夹可悲删除或重命名';
-$labels['deleting'] = '删除访问权限中…';
-$labels['saving'] = '保存访问权限中…';
-$labels['updatesuccess'] = '成功修改访问权限';
-$labels['deletesuccess'] = '成功删除访问权限';
-$labels['createsuccess'] = '成功添加访问权限';
-$labels['updateerror'] = '无法更新访问权限';
-$labels['deleteerror'] = '无法删除访问权限';
-$labels['createerror'] = '无法添加访问权限';
-$labels['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
-$labels['norights'] = '没有已指定的权限!';
-$labels['nouser'] = '没有已指定的用户名!';
-
+$labels['longaclwrite'] = '消息可被标记,撰写或复制至文件夹中';
+$labels['longacldelete'] = '信息可被删除';
+$messages['deleting'] = '删除访问权限中…';
+$messages['saving'] = '保存访问权限中…';
+$messages['updatesuccess'] = '成功修改访问权限';
+$messages['deletesuccess'] = '成功删除访问权限';
+$messages['createsuccess'] = '成功添加访问权限';
+$messages['deleteerror'] = '无法删除访问权限';
+$messages['createerror'] = '无法添加访问权限';
+$messages['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
+$messages['norights'] = '没有已指定的权限!';
+$messages['nouser'] = '没有已指定的用户名!';
+?>

--
Gitblit v1.9.1