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,31 +1,31 @@
<?php
/**
* @file modules/comment/lang/en.lang.php
* @author zero <zero@nzeo.com>
* @brief comment module's basic language pack
**/
$lang->cmd_comment_do = 'I want to';
$lang->comment_list = 'Comments List';
$lang->cmd_delete_checked_comment = 'Delete selected item';
$lang->comment_count = 'Number of Comments';
$lang->about_comment_count = 'Display the comments as much as user inputs the number and it will be moved to the List if the comments are over its number.';
$lang->msg_cart_is_null = 'Please select an article to delete';
$lang->msg_checked_comment_is_deleted = '%d comment(s) is(are) successfully deleted.';
$lang->search_target_list = array(
'content' => 'Content',
'user_id' => 'ID',
'user_name' => 'Name',
'nick_name' => 'Nickname',
'member_srl' => 'Member Serial',
'email_address' => 'Email',
'homepage' => 'Homepage',
'regdate' => 'Date',
'last_update' => 'Last update',
'ipaddress' => 'IP Address',
);
?>
<?php
/**
* @file modules/comment/lang/en.lang.php
* @author NHN (developers@xpressengine.com)
* @brief comment module's basic language pack
**/
$lang->cmd_comment_do = 'I want to';
$lang->comment_list = 'Comments List';
$lang->cmd_delete_checked_comment = 'Delete selected item';
$lang->comment_count = 'Number of Comments';
$lang->about_comment_count = 'Display the comments as much as user inputs the number and it will be moved to the List if the comments are over its number.';
$lang->msg_cart_is_null = 'Please select an article to delete';
$lang->msg_checked_comment_is_deleted = '%d comment(s) is(are) successfully deleted.';
$lang->search_target_list = array(
'content' => 'Content',
'user_id' => 'ID',
'user_name' => 'Name',
'nick_name' => 'Nickname',
'member_srl' => 'Member Serial',
'email_address' => 'Email',
'homepage' => 'Homepage',
'regdate' => 'Date',
'last_update' => 'Last update',
'ipaddress' => 'IP Address',
);
?>