diff --git a/po/ko.po b/po/ko.po index fbcb5d605d..e8dca25a8d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,10 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-01-10 13:45+0100\n" -"PO-Revision-Date: 2013-01-03 22:27+0200\n" -"Last-Translator: Nabu Marduk \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2013-01-11 11:36+0200\n" +"Last-Translator: Dong-bum Kim \n" +"Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -732,10 +731,9 @@ msgid "More settings" msgstr "" #: index.php:227 -#, fuzzy #| msgid "Databases" msgid "Database server" -msgstr "데이터베이스 " +msgstr "데이터베이스 서버" #: index.php:230 libraries/Menu.class.php:150 #: libraries/ServerStatusData.class.php:341 libraries/common.inc.php:653 @@ -813,10 +811,9 @@ msgid "Get support" msgstr "" #: index.php:363 -#, fuzzy #| msgid "No change" msgid "List of changes" -msgstr "변화 없음" +msgstr "변경 목록" #: index.php:386 msgid "" @@ -1870,6 +1867,8 @@ msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." msgstr "" +"이 테이블에는 유일 속성을 가진 컬럼이 없습니다. 저장 시에 격자창 편집, 체크박스, 편집, 복사, 삭제 등의 기능이 정상적으로 동작하지 " +"않을 수 있습니다." #: js/messages.php:350 msgid "You can also edit most values
by double-clicking directly on them." @@ -2711,7 +2710,7 @@ msgstr "HTML 폼에 지정된 MAX_FILE_SIZE 값보다 더 큰 파일이 업로 #: libraries/File.class.php:285 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "파일업로드가 완전하지 않게 실행되었습니다." #: libraries/File.class.php:288 msgid "Missing a temporary folder." @@ -3010,11 +3009,11 @@ msgstr "질의 종류" #: libraries/ServerStatusData.class.php:186 msgid "Threads" -msgstr "" +msgstr "쓰레드" #: libraries/ServerStatusData.class.php:188 msgid "Temporary data" -msgstr "" +msgstr "임시 데이터" #: libraries/ServerStatusData.class.php:189 #, fuzzy @@ -3155,7 +3154,7 @@ msgstr "테이블 %s을(를) %s(으)로 이름을 변경하였습니다." #: libraries/Table.class.php:1373 msgid "Could not save table UI preferences" -msgstr "테이블 UI 환경 설정을 저장할 수 없습니다." +msgstr "테이블 UI 설정을 저장할 수 없습니다." #: libraries/Table.class.php:1397 #, php-format @@ -4092,7 +4091,7 @@ msgstr "" #: libraries/config/messages.inc.php:33 msgid "Minimum size for input field" -msgstr "" +msgstr "입력 필드의 최소 크기" #: libraries/config/messages.inc.php:34 msgid "" @@ -4102,7 +4101,7 @@ msgstr "" #: libraries/config/messages.inc.php:35 msgid "Maximum size for input field" -msgstr "" +msgstr "입력 필드의 최대 크기" #: libraries/config/messages.inc.php:36 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -4122,7 +4121,7 @@ msgstr "" #: libraries/config/messages.inc.php:40 msgid "Check config file permissions" -msgstr "" +msgstr "설정 파일에 대한 권한을 확인해주세요." #: libraries/config/messages.inc.php:41 msgid "" @@ -4137,7 +4136,7 @@ msgstr "" #: libraries/config/messages.inc.php:43 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:176 msgid "Configuration file" -msgstr "" +msgstr "설정 파일" #: libraries/config/messages.inc.php:44 msgid "" @@ -4202,7 +4201,7 @@ msgstr "" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "서버들을 목록으로 표시" #: libraries/config/messages.inc.php:60 msgid "" @@ -4216,7 +4215,7 @@ msgstr "다중테이블 유지보수기능 해제" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "팝업창으로 SQL 쿼리 편집" #: libraries/config/messages.inc.php:63 msgid "Edit in window" @@ -4238,7 +4237,7 @@ msgstr "" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "최대 실행 시간" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" @@ -10422,7 +10421,7 @@ msgstr "쓰레드 %s 를 죽였습니다." #, php-format msgid "" "phpMyAdmin was unable to kill thread %s. It probably has already been closed." -msgstr "" +msgstr "phpMyAdmin이 쓰레드 %s를 종료하는데 실패했습니다. 이미 해당 쓰레드가 종료되었을 것입니다." #: server_status.php:70 #, php-format diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index 948add1f9e..657836056c 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -44,7 +44,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase $GLOBALS['lang'] = 'en'; $GLOBALS['server'] = 0; $GLOBALS['text_dir'] = 'ltr'; - require_once 'libraries/Response.class.php'; + include_once 'libraries/Response.class.php'; } /** @@ -78,8 +78,8 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase /** * Test for setting display mode * - * @param string $the_disp_mode the synthetic value for display_mode (see a - * few lines above for explanations) + * @param string $the_disp_mode the synthetic value for display_mode (see + * a few lines above for explanations) * @param integer $the_total the total number of rows returned by the SQL * query without any programmatically appended * LIMIT clause @@ -554,11 +554,11 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase } /** - * Provide data for testGetOperationLinksForVerticleTableCase1 + * Provide data for testGetOperationLinksForVerticleTable * * @return array parameters and output */ - public function dataProviderForTestGetOperationLinksForVerticleTableCase1() + public function dataProviderForTestGetOperationLinksForVerticleTable() { return array( array( @@ -566,146 +566,37 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase ' ' - ) - ); - } - - /** - * Test for _getOperationLinksForVerticleTable - case 1 - * - * @param string $operation edit/copy/delete - * @param string $output output of _getOperationLinksForVerticleTable - * - * @return void - * - * @dataProvider dataProviderForTestGetOperationLinksForVerticleTableCase1 - */ - public function testGetOperationLinksForVerticleTableCase1( - $operation, $output - ) { - $vertical_display = array( - 'row_delete' => array(), - 'textbtn' => '\n \n \n', - 'edit' => array(), - 'copy' => array( - '\nCopy Copy\n\nCopy Copy\n array( - '\n\n\nCopy Copy\n\nCopy Copy\n -' - ) - ); - } - - /** - * Test for _getOperationLinksForVerticleTable - case 2 - * - * @param string $operation edit/copy/delete - * @param string $output output of _getOperationLinksForVerticleTable - * - * @return void - * - * @dataProvider dataProviderForTestGetOperationLinksForVerticleTableCase2 - */ - public function testGetOperationLinksForVerticleTableCase2( - $operation, $output - ) { - $vertical_display = array( - 'row_delete' => array(), - 'textbtn' => '\n \n \n', - 'edit' => array(), - 'copy' => array( - '\nCopy Copy\n\nCopy Copy\n\nCOPY1COPY2\n" ), - 'delete' => array( - '\n\n\n\n\nDELETE1DELETE2\n" + ), ); } /** - * Test for _getOperationLinksForVerticleTable - case 3 + * Test for _getOperationLinksForVerticleTable * * @param string $operation edit/copy/delete * @param string $output output of _getOperationLinksForVerticleTable * * @return void * - * @dataProvider dataProviderForTestGetOperationLinksForVerticleTableCase3 + * @dataProvider dataProviderForTestGetOperationLinksForVerticleTable */ - public function testGetOperationLinksForVerticleTableCase3( + public function testGetOperationLinksForVerticleTable( $operation, $output ) { $vertical_display = array( 'row_delete' => array(), 'textbtn' => '\n \n \n', 'edit' => array(), - 'copy' => array( - '\nCopy Copy\n\nCopy Copy\n array( - '\n\n Delete Delete
DELETE FROM `data`.`new` WHERE `new`.`id` = 1
' - ) - ); - } - - /** - * Test for _getCheckboxAndLinks - case 1 - * - * @param string $position the position of the checkbox and links - * @param string $del_url delete url - * @param array $is_display array with explicit indexes for all the - * display elements - * @param string $row_no row number - * @param string $where_clause where clause - * @param string $where_clause_html url encoded where clause - * @param array $condition_array array of conditions in the where clause - * @param string $del_query delete query - * @param string $id_suffix suffix for the id - * @param string $edit_url edit url - * @param string $copy_url copy url - * @param string $class css classes for the td elements - * @param string $edit_str text for the edit link - * @param string $copy_str text for the copy link - * @param string $del_str text for the delete link - * @param string $js_conf text for the JS confirmation - * @param string $output output of _getCheckboxAndLinks - * - * @return void - * - * @dataProvider dataProviderForGetCheckboxAndLinksCase1 - */ - public function testGetCheckboxAndLinksCase1( - $position, $del_url, $is_display, $row_no, $where_clause, - $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, - $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output - ) { - $this->assertEquals( - $output, - $this->_callPrivateFunction( - '_getCheckboxAndLinks', - array( - $position, $del_url, $is_display, $row_no, $where_clause, - $where_clause_html, $condition_array, $del_query, - $id_suffix, $edit_url, $copy_url, $class, $edit_str, - $copy_str, $del_str, $js_conf - ) - ) - ); - } - - /** - * Data provider for testGetCheckboxAndLinksCase2 - * - * @return array parameters and output - */ - public function dataProviderForGetCheckboxAndLinksCase2() - { - return array( + ), array( PMA_DisplayResults::POSITION_RIGHT, 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8', @@ -1220,63 +1024,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase Edit Edit ' - ) - ); - } - - /** - * Test for _getCheckboxAndLinks - case 2 - * - * @param string $position the position of the checkbox and links - * @param string $del_url delete url - * @param array $is_display array with explicit indexes for all the - * display elements - * @param string $row_no row number - * @param string $where_clause where clause - * @param string $where_clause_html url encoded where clause - * @param array $condition_array array of conditions in the where clause - * @param string $del_query delete query - * @param string $id_suffix suffix for the id - * @param string $edit_url edit url - * @param string $copy_url copy url - * @param string $class css classes for the td elements - * @param string $edit_str text for the edit link - * @param string $copy_str text for the copy link - * @param string $del_str text for the delete link - * @param string $js_conf text for the JS confirmation - * @param string $output output of _getCheckboxAndLinks - * - * @return void - * - * @dataProvider dataProviderForGetCheckboxAndLinksCase2 - */ - public function testGetCheckboxAndLinksCase2( - $position, $del_url, $is_display, $row_no, $where_clause, - $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, - $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output - ) { - $this->assertEquals( - $output, - $this->_callPrivateFunction( - '_getCheckboxAndLinks', - array( - $position, $del_url, $is_display, $row_no, $where_clause, - $where_clause_html, $condition_array, $del_query, - $id_suffix, $edit_url, $copy_url, $class, $edit_str, - $copy_str, $del_str, $js_conf - ) - ) - ); - } - - /** - * Data provider for testGetCheckboxAndLinksCase3 - * - * @return array parameters and output - */ - public function dataProviderForGetCheckboxAndLinksCase3() - { - return array( + ), array( PMA_DisplayResults::POSITION_NONE, 'sql.php?db=data&table=new&sql_query=DELETE+FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&message_to_show=The+row+has+been+deleted&goto=sql.php%3Fdb%3Ddata%26table%3Dnew%26sql_query%3DSELECT%2B%252A%2BFROM%2B%2560new%2560%26message_to_show%3DThe%2Brow%2Bhas%2Bbeen%2Bdeleted%26goto%3Dtbl_structure.php%26token%3Dae4c6d18375f446dfa068420c1f6a4e8&token=ae4c6d18375f446dfa068420c1f6a4e8', @@ -1306,12 +1054,12 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase 'Delete Delete', 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', ' ' - ) + ), ); } /** - * Test for _getCheckboxAndLinks - case 3 + * Test for _getCheckboxAndLinks * * @param string $position the position of the checkbox and links * @param string $del_url delete url @@ -1334,9 +1082,9 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase * * @return void * - * @dataProvider dataProviderForGetCheckboxAndLinksCase3 + * @dataProvider dataProviderForGetCheckboxAndLinks */ - public function testGetCheckboxAndLinksCase3( + public function testGetCheckboxAndLinks( $position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $condition_array, $del_query, $id_suffix, $edit_url, $copy_url, $class, $edit_str, $copy_str, $del_str, $js_conf, $output