merge sandbox to trunk for 1.4.4

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7723 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-09-28 07:24:47 +00:00
parent 200d63636c
commit b8299c8a65
683 changed files with 70982 additions and 69716 deletions

View file

@ -1,7 +1,7 @@
<?php
/**
* @file modules/file/lang/en.lang.php
* @author zero <zero@nzeo.com>
* @author NHN (developers@xpressengine.com)
* @brief Attachment module's basic language pack
**/
@ -23,7 +23,7 @@
$lang->about_allow_outlink = 'You can shut external links according to referers. (except media files like *.wmv, *.mp3)';
$lang->about_allow_outlink_format = 'These formats will always be allowed. Please use comma(,) for multiple input.<br />eg)hwp,doc,zip,pdf';
$lang->about_allow_outlink_site = 'These websites will alyways be allowed. Please use new line for multiple input.<br />ex)http://www.zeroboard.com';
$lang->about_allow_outlink_site = 'These websites will alyways be allowed. Please use new line for multiple input.<br />ex)http://xpressengine.com/';
$lang->about_allowed_filesize = 'You can assign file size limit for each file. (Exclude administrators)';
$lang->about_allowed_attach_size = 'You can assign file size limit for each document. (Exclude administrators)';
$lang->about_allowed_filetypes = 'Only allowed extentsions can be attached. To allow an extension, use "*.[extention]". To allow multiple extensions, use ";" between each extension.<br />ex) *.* or *.jpg;*.gif;<br />(Exclude Administrators)';