diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-08-11 12:20:20 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-08-11 12:20:20 +0200 |
| commit | d84c2f1cc767bc428b84a5590e4c1c8a9c53fb36 (patch) | |
| tree | e1a2ad265f9dc7fd9cd77beac672d70767917b8b /inc/lang/zh/lang.php | |
| parent | 95905cbe48caa3de7d6d809a8f0d0cffc9df4720 (diff) | |
| parent | f73480e9843c2c7609d25f9bb340210e01ea5344 (diff) | |
| download | rpg-d84c2f1cc767bc428b84a5590e4c1c8a9c53fb36.tar.gz rpg-d84c2f1cc767bc428b84a5590e4c1c8a9c53fb36.tar.bz2 | |
Merge branch 'master' into extension_manager
* master: (33 commits)
translation update
translation update
translation update
translation update
translation update
changed style of `<file>` slightly to help tell it apart from `<code>`
translation update
translation update
translation update
translation update
translation update
translation update
translation update
removed now unused interwiki icons
removed old, possibly never used interwiki definitions
FS#2806 - fix auth capability listing in html_debug()
translation update
change 'debug' setting to 'security' (rather than 'danger')
convert from iso-8859-1 if not utf8
add 'danger' alert to authpgsql config settings
...
Diffstat (limited to 'inc/lang/zh/lang.php')
| -rw-r--r-- | inc/lang/zh/lang.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index f404010ba..591108010 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -1,8 +1,8 @@ <?php + /** - * Chinese(Simplified) language file - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author ZDYX <zhangduyixiong@gmail.com> * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton <guxd@163.com> @@ -15,6 +15,7 @@ * @author caii, patent agent in China <zhoucaiqi@gmail.com> * @author lainme993@gmail.com * @author Shuo-Ting Jian <shoting@gmail.com> + * @author Rachel <rzhang0802@gmail.com> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; |