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/jp.lang.php
* @author zero <zero@nzeo.com> 翻訳RisaPapa、ミニミ
* @brief 日本語言語パッケージ(基本的な内容のみ)
**/
$lang->counter = 'カウンター';
$lang->cmd_select_date = '日付選択';
$lang->cmd_select_counter_type = array(
'hour' => '時間帯別',
'day' => '日別',
'month' => '月別',
'year' => '年度別',
);
$lang->total_counter = 'トータル';
$lang->selected_day_counter = '選択日の情報';
$lang->unique_visitor = '訪問者';
$lang->pageview = 'ページビュー';
$lang->today = '今日';
$lang->yesterday = '昨日';
?>
<?php
/**
* @file modules/counter/lang/jp.lang.php
* @author NHN (developers@xpressengine.com) 翻訳RisaPapa、ミニミ
* @brief 日本語言語パッケージ(基本的な内容のみ)
**/
$lang->counter = 'カウンター';
$lang->cmd_select_date = '日付選択';
$lang->cmd_select_counter_type = array(
'hour' => '時間帯別',
'day' => '日別',
'month' => '月別',
'year' => '年度別',
);
$lang->total_counter = 'トータル';
$lang->selected_day_counter = '選択日の情報';
$lang->unique_visitor = '訪問者';
$lang->pageview = 'ページビュー';
$lang->today = '今日';
$lang->yesterday = '昨日';
?>