Merge remote-tracking branch 'origin/master'

2012-01-27 14:15:04 +01:00 · 2012-01-27 14:15:04 +01:00 · 0aecbea9df
commit 0aecbea9df
parent 4bd24a9b97 e64d33bba3
2 changed files with 1 additions and 2 deletions
--- a/po/ko.po
+++ b/po/ko.po
@ -1371,7 +1371,7 @@ msgstr "EB"
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "%d table(s)"
-msgstr "%s개 테이블 "
+msgstr "%d개 테이블 "

 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:135
--- a/test/classes/PMA_File_test.php
+++ b/test/classes/PMA_File_test.php
@ -1,4 +1,3 @@
-
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**