merge sandbox to trunk for 1.4.4.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions

View file

@ -95,6 +95,6 @@
'trash_ipaddress' => '削除者のIPアドレス',
);
$lang->success_trashed = "Successfully moved to trashcan";
$lang->msg_not_selected_document = '선택된 문서가 없습니다.';
$lang->success_trashed = "ごみ箱に移動させました。";
$lang->msg_not_selected_document = '選択された書き込みがありません。';
?>