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

@ -91,3 +91,15 @@ $lang->default_message_verbs['move'] = 'moves';
$lang->default_message_verbs['copy'] = 'copies';
$lang->default_message_verbs['delete'] = 'deletes';
$lang->default_message_verbs['trash'] = 'deletes';
$lang->improper_document_declare = 'Report an improper document';
$lang->declaring_user = 'Reporter';
$lang->improper_document_declare_reason = 'Reason';
$lang->improper_document_reasons['advertisement'] = 'Advertisements that do not fit the topics or themes.';
$lang->improper_document_reasons['theme'] = 'Posts that do not fit the topics or themes.';
$lang->improper_document_reasons['bad_word'] = 'Too much bad words.';
$lang->improper_document_reasons['violence'] = 'Violence.';
$lang->improper_document_reasons['racism'] = 'Racism.';
$lang->improper_document_reasons['pornography'] = 'Pornography.';
$lang->improper_document_reasons['privacy'] = 'Privacy issue.';
$lang->improper_document_reasons['others'] = 'Others (Write your own)';
$lang->about_improper_document_declare = 'Write here why you report this article as an improper document.';