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,25 +1,25 @@
<?php
/**
* @file modules/counter/lang/en.lang.php
* @author zero <zero@nzeo.com>
* @brief English Language Pack (Only basic contents are listed)
**/
$lang->counter = "Counter";
$lang->cmd_select_date = 'Select Date';
$lang->cmd_select_counter_type = array(
'hour' => 'By Hour',
'day' => 'By Day',
'month' => 'By Month',
'year' => 'By Year',
);
$lang->total_counter = 'Total Status';
$lang->selected_day_counter = 'Status of Selected Day';
$lang->unique_visitor = 'Visitors';
$lang->pageview = 'Pageview';
$lang->today = 'today';
$lang->yesterday = 'yesterday';
?>
<?php
/**
* @file modules/counter/lang/en.lang.php
* @author NHN (developers@xpressengine.com)
* @brief English Language Pack (Only basic contents are listed)
**/
$lang->counter = "Counter";
$lang->cmd_select_date = 'Select Date';
$lang->cmd_select_counter_type = array(
'hour' => 'By Hour',
'day' => 'By Day',
'month' => 'By Month',
'year' => 'By Year',
);
$lang->total_counter = 'Total Status';
$lang->selected_day_counter = 'Status of Selected Day';
$lang->unique_visitor = 'Visitors';
$lang->pageview = 'Pageview';
$lang->today = 'today';
$lang->yesterday = 'yesterday';
?>