diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
| commit | 16a774a8a61756df2d8fb813bfbaed98b42e3e65 (patch) | |
| tree | 3a48d311e74ccbf4017330cef8af00003b0ddb34 /lib/plugins/acl/lang/zh | |
| parent | 662a7b3fcc22d8327026bc1ef161a096683f1580 (diff) | |
| parent | a5a71ecfcc1ed6bfca1995b39cd0abe4b8dd9eeb (diff) | |
| download | rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.gz rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'lib/plugins/acl/lang/zh')
| -rw-r--r-- | lib/plugins/acl/lang/zh/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 581d08539..986fa769a 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author caii <zhoucaiqi@gmail.com> * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> + * @author lainme993@gmail.com */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; |