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

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

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';