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

@ -35,3 +35,15 @@ $lang->cmd_unpublish = 'Unpublish';
$lang->select_module = 'Select Module';
$lang->page = 'Page';
$lang->msg_not_selected_comment = 'There are no selected comment.';
$lang->improper_comment_declare = 'Report an improper comment';
$lang->declaring_user = 'Reporter';
$lang->improper_comment_declare_reason = 'Reason';
$lang->improper_comment_reasons['advertisement'] = 'Advertisements that do not fit the topics or themes.';
$lang->improper_comment_reasons['theme'] = 'Comments that do not fit the topics or themes.';
$lang->improper_comment_reasons['bad_word'] = 'Too much bad words.';
$lang->improper_comment_reasons['violence'] = 'Violence.';
$lang->improper_comment_reasons['racism'] = 'Racism.';
$lang->improper_comment_reasons['pornography'] = 'Pornography.';
$lang->improper_comment_reasons['privacy'] = 'Privacy issue.';
$lang->improper_comment_reasons['others'] = 'Others (Write your own)';
$lang->about_improper_comment_declare = 'Write here why you report this comment as an improper thing.';