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 common/lang/zh-CN.lang.php
* @author zero (zero@nzeo.com)
* @author NHN (developers@xpressengine.com)
* @brief 简体中文语言包
**/
@ -310,9 +310,9 @@
$lang->filter->isnull = '请输入%s';
$lang->filter->outofrange = '请确认%s字数';
$lang->filter->equalto = '%s值有误。';
$lang->filter->invalid_email = '%s格式有误。zbxe@zeroboard.com)';
$lang->filter->invalid_email = '%s格式有误。developers@xpressengine.com)';
$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s只能用英文数字和 _首个字符必须是英文字母。";
$lang->filter->invalid_homepage = '%s格式有误。 http://www.zeroboard.com)';
$lang->filter->invalid_homepage = '%s格式有误。 http://xpressengine.com/)';
$lang->filter->invalid_korean = '%s只能输入中文';
$lang->filter->invalid_korean_number = '%s只能输入中文或数字';
$lang->filter->invalid_alpha = '%s只能输入英文字母';