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,28 +1,28 @@
<?php
/**
* @file modules/trackback/lang/en.lang.php
* @author zero <zero@nzeo.com>
* @brief trackback module / basic language pack
**/
$lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)';
$lang->cmd_delete_checked_trackback = 'Delete selected trackback(s)';
$lang->msg_cart_is_null = 'Please select a trackback to be deleted.';
$lang->msg_checked_trackback_is_deleted = '%d trackback(s) deleted.';
$lang->send_trackback_url = 'Destination URL';
$lang->msg_trackback_url_is_invalid = 'Destination URL is invalid';
$lang->msg_trackback_send_success = 'Sent successfully';
$lang->search_target_list = array(
'url' => 'Target URL',
'blog_name' => 'Target Site Name',
'title' => 'Title',
'excerpt' => 'Excerpt',
'regdate' => 'Posted Date',
'ipaddress' => 'IP Address',
);
$lang->enable_trackback = "Use Trackback";
$lang->about_enable_trackback = "When the check is disabled, all trackback collection in the site will be stopped";
?>
<?php
/**
* @file modules/trackback/lang/en.lang.php
* @author NHN (developers@xpressengine.com)
* @brief trackback module / basic language pack
**/
$lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)';
$lang->cmd_delete_checked_trackback = 'Delete selected trackback(s)';
$lang->msg_cart_is_null = 'Please select a trackback to be deleted.';
$lang->msg_checked_trackback_is_deleted = '%d trackback(s) deleted.';
$lang->send_trackback_url = 'Destination URL';
$lang->msg_trackback_url_is_invalid = 'Destination URL is invalid';
$lang->msg_trackback_send_success = 'Sent successfully';
$lang->search_target_list = array(
'url' => 'Target URL',
'blog_name' => 'Target Site Name',
'title' => 'Title',
'excerpt' => 'Excerpt',
'regdate' => 'Posted Date',
'ipaddress' => 'IP Address',
);
$lang->enable_trackback = "Use Trackback";
$lang->about_enable_trackback = "When the check is disabled, all trackback collection in the site will be stopped";
?>