diff options
author | Andreas Gohr <andi@splitbrain.org> | 2011-09-21 19:39:22 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2011-09-21 19:39:22 +0200 |
commit | c6bab40722735490d4687c8ade8081f389913249 (patch) | |
tree | 61090c1dfeafe80fd11a5035f6be38a68c2d62ed /lib/plugins/plugin/lang/zh | |
parent | 32bb4dd2402ee999e6bc7be7e6fa1dd5c58049b1 (diff) | |
parent | bc314c5832351325feac48564dae39a93321d99a (diff) | |
download | rpg-c6bab40722735490d4687c8ade8081f389913249.tar.gz rpg-c6bab40722735490d4687c8ade8081f389913249.tar.bz2 |
Merge remote-tracking branch 'origin/master'
Conflicts:
lib/tpl/default/mediamanager.css
Diffstat (limited to 'lib/plugins/plugin/lang/zh')
-rw-r--r-- | lib/plugins/plugin/lang/zh/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 6fc1f4d7d..f8e0b5568 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/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['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; |