diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
| commit | d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526 (patch) | |
| tree | 7c90009354601ab34473b4d6d376e4b73c45e3f7 /inc/lang/zh/lang.php | |
| parent | 84a355b61e53b5d8969c030679612a7b456777e9 (diff) | |
| parent | 3240c7a0b3414f926ee76b2c4fff0a95ab33e916 (diff) | |
| download | rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.gz rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
inc/lang/bg/lang.php
Diffstat (limited to 'inc/lang/zh/lang.php')
| -rw-r--r-- | inc/lang/zh/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php index 52dda5986..ea677ac2e 100644 --- a/inc/lang/zh/lang.php +++ b/inc/lang/zh/lang.php @@ -5,7 +5,7 @@ * @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 + * @author George Sheraton <guxd@163.com> * @author Simon zhan <simonzhan@21cn.com> * @author mr.jinyi@gmail.com * @author ben <ben@livetom.com> @@ -52,6 +52,7 @@ $lang['btn_draft'] = '编辑草稿'; $lang['btn_recover'] = '恢复草稿'; $lang['btn_draftdel'] = '删除草稿'; $lang['btn_revert'] = '恢复'; +$lang['btn_register'] = '注册'; $lang['loggedinas'] = '登录为'; $lang['user'] = '用户名'; $lang['pass'] = '密码'; @@ -61,7 +62,6 @@ $lang['passchk'] = '请再输一次'; $lang['remember'] = '记住我'; $lang['fullname'] = '全名'; $lang['email'] = 'E-Mail'; -$lang['register'] = '注册'; $lang['profile'] = '用户信息'; $lang['badlogin'] = '对不起，用户名或密码错误。'; $lang['minoredit'] = '细微修改'; |