Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/ko.po
This commit is contained in:
Michal Čihař 2013-05-09 09:40:10 +02:00
commit 5e6c50e26f

View File

@ -3,11 +3,10 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-05-09 08:26+0200\n"
"PO-Revision-Date: 2013-05-08 15:44+0200\n"
"Last-Translator: Yungu Kim <crimsonpi@gmail.com>\n"
"Language-Team: Korean <http://l10n.cihar.com/projects/phpmyadmin/master/ko/"
">\n"
"POT-Creation-Date: 2013-05-07 15:39+0200\n"
"PO-Revision-Date: 2013-05-09 03:47+0200\n"
"Last-Translator: han goo Kang <kgcrom@hotmail.com>\n"
"Language-Team: Korean <http://l10n.cihar.com/projects/phpmyadmin/master/ko/>\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -2214,7 +2213,7 @@ msgstr "규칙 '%s'를 변환하는데 실패했습니다."
#, php-format
msgid ""
"Invalid rule declaration on line %1$s, expected line %2$s of previous rule"
msgstr ""
msgstr "이전 규칙의 %2$s 줄이 예상되었으나 규칙 %1$s이 잘못되었습니다"
#: libraries/Advisor.class.php:412
#, php-format