The branch, master has been updated via 6205d419b68d57105d985a4a5335498337f6ccf4 (commit) via a59328b127104e01e2dc8b5b59abd7303339f4ea (commit) via 36d805e9856bf8874a49a6fb96c543f0e14e955a (commit) via 019ccabb4c97600ec3aa1478b5eb15198d8b98d0 (commit) via 38d284892600f3e9aeb3a2317384c5ae700d74df (commit) via eadd61cb9350ea5ddc1044a66b868596897d6b04 (commit) via 8e52e22dbfae7defd4f58b49df40205f44111d9c (commit) via aa0556f7a6691838a06c7ac1df789630ca2e1cce (commit) via 2307f8bdbe3e8f418701f3098fbde5f163635d3a (commit) via 68854c5e184788a913d7d7ed117e9786a83ea876 (commit) via 2aa0e45516eef5f6f13621b2f1db735423a57b91 (commit) via c5fa365c7b6bae516f879dd3fda3c95782f73fed (commit) via 24fa8b285ba58a40eed8a81c7182a20bf4513531 (commit) via d94a99e70df946c4e77edeb7a362f200704b3222 (commit) via 8436579216de4d2bbb93ba843a289b98c950e004 (commit) via 15989c7b9973d4b4ea7c31203f3e80f861328372 (commit) via 7d6994cd027d990216a7dcef5bb0b23f1af167dd (commit) via 51f58d695eaac2772c9b9e9703759d9ff24ab87c (commit) via d1761a5d0e1e73facfbb6281d5ed2e4cc5785446 (commit) via 4c27ec1c2234cca2bcc9976e8d0a258900816d84 (commit) via e9ec5e0dffcc6c4d150442ebdd9ade135f232219 (commit) via c8189c750d4ea5cfe9f0e07aba3dc0e4304d24e0 (commit) via 9d69c0fc481a7047de4c03072177084a9a0fae07 (commit) via 3ef304ab7b27ab8552d4dcf2b5acdfe9976481ee (commit) via 8f9242e275b524d4a3bb91ff1db43c70beb724c6 (commit) via 3fd23b7bc5aad07a98b7595e396ba2c274ae76eb (commit) via 7f13979dae649dd5733efe58393c2a275365f8e3 (commit) via 3869a4110ec1e7b76d98cf3415d66ee37a598fac (commit) via 23a2e3d68519efd1afc1c5b5d8de7bd0eb591cba (commit) via 906e752d8ade3a82ede80a5fa62061c1d683c1b7 (commit) via 25a8c7739980e2ffea7a248c9fe39239dd12b850 (commit) via f29eabeeee432de532ddc00292346719c4c69433 (commit) via 3dcb3b85939f4a68f2ac5d587d7d79e0e714bea6 (commit) via b7023025d889cc0a7506c96117582bc92343cf64 (commit) via 22b0d6bcc2ec6ef166b422b1475b93aaf4ea1888 (commit) via 6e3098c3de96d4f2d4394e18991e16867c9b4009 (commit) via 747ffbe637a4bd5bd3d3f505ae2295b3b2cebba6 (commit) via 89d81dc017ddc27862c594e0aebd0f28025fad99 (commit) from 297d7ff5dab79fccb72cc7abe9b0b40701f25c2e (commit)
- Log ----------------------------------------------------------------- commit 6205d419b68d57105d985a4a5335498337f6ccf4 Merge: 297d7ff5dab79fccb72cc7abe9b0b40701f25c2e a59328b127104e01e2dc8b5b59abd7303339f4ea Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 14:30:14 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit a59328b127104e01e2dc8b5b59abd7303339f4ea Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:17:02 2011 +0200
Translation update done using Pootle.
commit 36d805e9856bf8874a49a6fb96c543f0e14e955a Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:16:51 2011 +0200
Translation update done using Pootle.
commit 019ccabb4c97600ec3aa1478b5eb15198d8b98d0 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:16:20 2011 +0200
Translation update done using Pootle.
commit 38d284892600f3e9aeb3a2317384c5ae700d74df Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:16:11 2011 +0200
Translation update done using Pootle.
commit eadd61cb9350ea5ddc1044a66b868596897d6b04 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:15:13 2011 +0200
Translation update done using Pootle.
commit 8e52e22dbfae7defd4f58b49df40205f44111d9c Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:14:56 2011 +0200
Translation update done using Pootle.
commit aa0556f7a6691838a06c7ac1df789630ca2e1cce Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:14:31 2011 +0200
Translation update done using Pootle.
commit 2307f8bdbe3e8f418701f3098fbde5f163635d3a Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:13:42 2011 +0200
Translation update done using Pootle.
commit 68854c5e184788a913d7d7ed117e9786a83ea876 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:13:36 2011 +0200
Translation update done using Pootle.
commit 2aa0e45516eef5f6f13621b2f1db735423a57b91 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:13:14 2011 +0200
Translation update done using Pootle.
commit c5fa365c7b6bae516f879dd3fda3c95782f73fed Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:12:44 2011 +0200
Translation update done using Pootle.
commit 24fa8b285ba58a40eed8a81c7182a20bf4513531 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:12:32 2011 +0200
Translation update done using Pootle.
commit d94a99e70df946c4e77edeb7a362f200704b3222 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:12:22 2011 +0200
Translation update done using Pootle.
commit 8436579216de4d2bbb93ba843a289b98c950e004 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:12:13 2011 +0200
Translation update done using Pootle.
commit 15989c7b9973d4b4ea7c31203f3e80f861328372 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:12:04 2011 +0200
Translation update done using Pootle.
commit 7d6994cd027d990216a7dcef5bb0b23f1af167dd Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:11:01 2011 +0200
Translation update done using Pootle.
commit 51f58d695eaac2772c9b9e9703759d9ff24ab87c Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:10:22 2011 +0200
Translation update done using Pootle.
commit d1761a5d0e1e73facfbb6281d5ed2e4cc5785446 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:10:03 2011 +0200
Translation update done using Pootle.
commit 4c27ec1c2234cca2bcc9976e8d0a258900816d84 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:09:55 2011 +0200
Translation update done using Pootle.
commit e9ec5e0dffcc6c4d150442ebdd9ade135f232219 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:09:46 2011 +0200
Translation update done using Pootle.
commit c8189c750d4ea5cfe9f0e07aba3dc0e4304d24e0 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:09:36 2011 +0200
Translation update done using Pootle.
commit 9d69c0fc481a7047de4c03072177084a9a0fae07 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:09:25 2011 +0200
Translation update done using Pootle.
commit 3ef304ab7b27ab8552d4dcf2b5acdfe9976481ee Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:08:19 2011 +0200
Translation update done using Pootle.
commit 8f9242e275b524d4a3bb91ff1db43c70beb724c6 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:08:14 2011 +0200
Translation update done using Pootle.
commit 3fd23b7bc5aad07a98b7595e396ba2c274ae76eb Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:07:49 2011 +0200
Translation update done using Pootle.
commit 7f13979dae649dd5733efe58393c2a275365f8e3 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:07:39 2011 +0200
Translation update done using Pootle.
commit 3869a4110ec1e7b76d98cf3415d66ee37a598fac Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:07:31 2011 +0200
Translation update done using Pootle.
commit 23a2e3d68519efd1afc1c5b5d8de7bd0eb591cba Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:06:50 2011 +0200
Translation update done using Pootle.
commit 906e752d8ade3a82ede80a5fa62061c1d683c1b7 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:06:02 2011 +0200
Translation update done using Pootle.
commit 25a8c7739980e2ffea7a248c9fe39239dd12b850 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:05:16 2011 +0200
Translation update done using Pootle.
commit f29eabeeee432de532ddc00292346719c4c69433 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:03:34 2011 +0200
Translation update done using Pootle.
commit 3dcb3b85939f4a68f2ac5d587d7d79e0e714bea6 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:01:36 2011 +0200
Translation update done using Pootle.
commit b7023025d889cc0a7506c96117582bc92343cf64 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 14:01:13 2011 +0200
Translation update done using Pootle.
commit 22b0d6bcc2ec6ef166b422b1475b93aaf4ea1888 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 13:59:44 2011 +0200
Translation update done using Pootle.
commit 6e3098c3de96d4f2d4394e18991e16867c9b4009 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 13:58:55 2011 +0200
Translation update done using Pootle.
commit 747ffbe637a4bd5bd3d3f505ae2295b3b2cebba6 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 13:58:39 2011 +0200
Translation update done using Pootle.
commit 89d81dc017ddc27862c594e0aebd0f28025fad99 Author: Chung-Ook Lee hantip@gmail.com Date: Fri Aug 5 13:57:57 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ko.po | 83 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/po/ko.po b/po/ko.po index 7e96d85..ca53ded 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-05 13:56+0200\n" +"PO-Revision-Date: 2011-08-05 14:17+0200\n" "Last-Translator: Chung-Ook Lee hantip@gmail.com\n" "Language-Team: korean ko@li.org\n" "Language: ko\n" @@ -9971,26 +9971,26 @@ msgid "Query analyzer" msgstr "질의 종류"
#: server_status.php:1587 -#, fuzzy, php-format +#, php-format #| msgid "Second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "초" +msgstr[0] "%d 초"
#: server_status.php:1589 -#, fuzzy, php-format +#, php-format #| msgid "Minute" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "분" +msgstr[0] "%d 분"
#: server_synchronize.php:92 msgid "Could not connect to the source" -msgstr "" +msgstr "소스에 접속할 수 없음"
#: server_synchronize.php:95 msgid "Could not connect to the target" -msgstr "" +msgstr "타겟에 접속할 수 없음"
#: server_synchronize.php:120 server_synchronize.php:123 tbl_create.php:50 #: tbl_get_field.php:19 @@ -10016,47 +10016,47 @@ msgstr ""
#: server_synchronize.php:399 server_synchronize.php:825 msgid "Data Difference" -msgstr "" +msgstr "차이나는 데이터"
#: server_synchronize.php:404 server_synchronize.php:830 msgid "Add column(s)" -msgstr "" +msgstr "컬럼 추가"
#: server_synchronize.php:405 server_synchronize.php:831 msgid "Remove column(s)" -msgstr "" +msgstr "컬럼 제거"
#: server_synchronize.php:406 server_synchronize.php:832 msgid "Alter column(s)" -msgstr "" +msgstr "컬럼 뒤에"
#: server_synchronize.php:407 server_synchronize.php:833 msgid "Remove index(s)" -msgstr "" +msgstr "인덱스 제거"
#: server_synchronize.php:408 server_synchronize.php:834 msgid "Apply index(s)" -msgstr "" +msgstr "인덱스 적용"
#: server_synchronize.php:409 server_synchronize.php:835 msgid "Update row(s)" -msgstr "" +msgstr "행 업데이트"
#: server_synchronize.php:410 server_synchronize.php:836 msgid "Insert row(s)" -msgstr "" +msgstr "행 삽입"
#: server_synchronize.php:420 server_synchronize.php:847 msgid "Would you like to delete all the previous rows from target tables?" -msgstr "" +msgstr "대상 테이블에서 이전 행들을 모두 삭제하시겠습니까?"
#: server_synchronize.php:423 server_synchronize.php:851 msgid "Apply Selected Changes" -msgstr "" +msgstr "선택한 변경내용 적용"
#: server_synchronize.php:425 server_synchronize.php:853 msgid "Synchronize Databases" -msgstr "" +msgstr "데이터베이스 동기화"
#: server_synchronize.php:438 msgid "Selected target tables have been synchronized with source tables." @@ -10113,7 +10113,7 @@ msgstr ""
#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:226 msgid "Download" -msgstr "" +msgstr "다운로드"
#: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" @@ -10169,49 +10169,47 @@ msgstr ""
#: setup/frames/index.inc.php:157 msgid "New server" -msgstr "" +msgstr "새 서버"
#: setup/frames/index.inc.php:186 msgid "Default language" -msgstr "" +msgstr "기본 언어"
#: setup/frames/index.inc.php:196 msgid "let the user choose" -msgstr "" +msgstr "사용자 선택"
#: setup/frames/index.inc.php:207 msgid "- none -" -msgstr "" +msgstr "-없음-"
#: setup/frames/index.inc.php:210 msgid "Default server" -msgstr "" +msgstr "기본 서버"
#: setup/frames/index.inc.php:220 msgid "End of line" -msgstr "" +msgstr "줄 끝"
#: setup/frames/index.inc.php:225 msgid "Display" -msgstr "" +msgstr "보기"
#: setup/frames/index.inc.php:229 -#, fuzzy msgid "Load" -msgstr "Local" +msgstr "로드"
#: setup/frames/index.inc.php:240 -#, fuzzy msgid "phpMyAdmin homepage" -msgstr "phpMyAdmin 설명서" +msgstr "phpMyAdmin 홈페이지"
#: setup/frames/index.inc.php:241 msgid "Donate" -msgstr "" +msgstr "기부"
#: setup/frames/servers.inc.php:28 msgid "Edit server" -msgstr "" +msgstr "서버 수정"
#: setup/frames/servers.inc.php:37 #, fuzzy @@ -10220,7 +10218,7 @@ msgstr "새 사용자 추가"
#: setup/lib/form_processing.lib.php:42 msgid "Warning" -msgstr "" +msgstr "경고"
#: setup/lib/form_processing.lib.php:43 msgid "Submitted form contains errors" @@ -10235,9 +10233,8 @@ msgid "Ignore errors" msgstr ""
#: setup/lib/form_processing.lib.php:49 -#, fuzzy msgid "Show form" -msgstr "색깔 보기" +msgstr "폼 보기"
#: setup/lib/index.lib.php:122 msgid "" @@ -10301,7 +10298,7 @@ msgstr "" #: setup/lib/index.lib.php:280 #, php-format msgid "This %soption%s should be enabled if your web server supports it." -msgstr "" +msgstr "웹 서버가 지원한다면 이 %s 옵션 %s 허용"
#: setup/lib/index.lib.php:282 #, php-format @@ -10367,23 +10364,23 @@ msgstr ""
#: setup/lib/index.lib.php:323 msgid "You should use SSL connections if your web server supports it." -msgstr "" +msgstr "웹 서버가 지원한다면 SSL 연결 사용"
#: setup/lib/index.lib.php:336 msgid "You should use mysqli for performance reasons." -msgstr "" +msgstr "효율적 이유로 mysqli 사용"
#: setup/lib/index.lib.php:367 msgid "You allow for connecting to the server without a password." -msgstr "" +msgstr "암호 없이 서버 접속 허용"
#: setup/lib/index.lib.php:389 msgid "Key is too short, it should have at least 8 characters." -msgstr "" +msgstr "키가 너무 짧다. 8글자 이상 사용"
#: setup/lib/index.lib.php:396 msgid "Key should contain letters, numbers [em]and[/em] special characters." -msgstr "" +msgstr "키는 문자, 숫자 [em]그리고[/em] 특수문자 포함"
#: sql.php:95 tbl_change.php:257 tbl_select.php:28 tbl_select.php:29 #: tbl_select.php:32 tbl_select.php:35 @@ -10402,11 +10399,11 @@ msgstr ""
#: sql.php:678 msgid "Showing as PHP code" -msgstr "" +msgstr "PHP 코드 보기"
#: sql.php:681 tbl_replace.php:343 msgid "Showing SQL query" -msgstr "" +msgstr "SQL 쿼리 보기"
#: sql.php:683 #, fuzzy
hooks/post-receive