fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 19:42:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fuxml/no-xml-lang

Browse source 
Conflicts:
	modules/comment/lang/lang.xml
	modules/document/lang/lang.xml
	modules/member/lang/lang.xml
This commit is contained in:
Kijin Sung 2016-01-31 16:13:03 +09:00
commit 4797e858b8
46 changed files with 1230 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/lang/en.php
View file

@ -261,6 +261,8 @@ $lang->cmd_show_super_admin_member = 'Super Admin';
$lang->cmd_show_site_admin_member = 'Site Admin';
$lang->approval = 'Approval';
$lang->denied = 'Denied';
$lang->refused_reason = 'Reason for account refusing';
$lang->about_refused_reason = 'Describe the reason why you refuse this account. Something you write in this field would be displayed when this user signs in.';
$lang->use_group_image_mark = 'Use group image mark';
$lang->usable_group_image_mark_list = ' Usable list of group image mark';
$lang->add_group_image_mark = 'Add group image mark';

2
modules/member/lang/ko.php
View file

@ -270,6 +270,8 @@ $lang->cmd_show_super_admin_member = '최고 관리자';
$lang->cmd_show_site_admin_member = '사이트 관리자';
$lang->approval = '승인';
$lang->denied = '거부';
$lang->refused_reason = '계정 거부 사유';
$lang->about_refused_reason = '계정이 정지된 이유를 적어주세요. 이 항목에 기록된 내용은 해당 회원에게 로그인 후 화면을 통해 안내됩니다.';
$lang->use_group_image_mark = '그룹 이미지 마크 사용';
$lang->usable_group_image_mark_list = '사용가능한 그룹 이미지 마크 목록';
$lang->add_group_image_mark = '그룹 이미지 마크 추가';