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,7 +1,7 @@
<?php
/**
* @file modules/editor/lang/en.lang.php
* @author zero <zero@nzeo.com>
* @author NHN (developers@xpressengine.com)
* @brief WYSIWYG Editor module's basic language pack
**/
@ -225,6 +225,6 @@
$lang->edit->confirm_submit_without_saving = 'There is paragraphs that were not saved.\\nProceed anyway?';
$lang->edit->image_align = '이미지 정렬';
$lang->edit->attached_files = '첨부 파일';
$lang->edit->image_align = 'Image Alignment';
$lang->edit->attached_files = 'Attachments';
?>