From a0397557fc17777eb1126a7f20fc108365749f47 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 17 May 2014 07:38:17 +0200
Subject: [PATCH 1/2] ChangeLog entry

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index beebfdd5ee..b88b6650ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,10 @@ phpMyAdmin - ChangeLog
 - bug #4411 Protect Binary Columns: many problems
 - bug #4395 BLOB link transformation is broken
 - bug       Respect ['ShowCreateDb'] in the navi panel
+- bug #4392 Cannot see databases in nav panel on databases grouping when disabled database expansion
 
 4.2.1.0 (2014-05-13)
-- bug #4380 Cannot display table structure with enums containing special characters 
+- bug #4380 Cannot display table structure with enums containing special characters
 - bug #4381 Cannot remove the last remembered sorted column
 - bug       Correctly fetch length of user and host fields in MySQL tables
 - bug #4364 examples/signon.php does not support the SessionSavePath directive

From a0140e7aae1f3c2ad409a4462f45df91f9f56de2 Mon Sep 17 00:00:00 2001
From: Sorawee Porncharoenwase <nullzero.free@gmail.com>
Date: Sat, 17 May 2014 07:11:54 +0200
Subject: [PATCH 2/2] Translated using Weblate (Thai)

Currently translated at 38.6% (1069 of 2768)
---
 po/th.po | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/th.po b/po/th.po
index 5669107c0e..6749c2e1c2 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.0-beta1\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-04-24 14:50-0400\n"
-"PO-Revision-Date: 2014-03-27 15:15+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Thai <https://l10n.cihar.com/projects/phpmyadmin/master/th/>\n"
+"PO-Revision-Date: 2014-05-17 07:11+0200\n"
+"Last-Translator: Sorawee Porncharoenwase <nullzero.free@gmail.com>\n"
+"Language-Team: Thai <https://l10n.cihar.com/projects/phpmyadmin/4-2/th/>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 1.9-dev\n"
+"X-Generator: Weblate 1.9\n"
 
 #: changelog.php:36 license.php:28
 #, php-format
@@ -675,13 +675,15 @@ msgstr "ที่คั่นหน้า %s ได้ถูกสร้าง
 #: import.php:577
 #, php-format
 msgid "Import has been successfully finished, %d queries executed."
-msgstr "นำเข้าได้สำเร็จ %d ได้ถูกนำเดินการแล้ว"
+msgstr "นำเข้าสำเร็จเรียบร้อย การสอบถาม %d รายการได้ถูกดำเนินการแล้ว"
 
 #: import.php:598
 msgid ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
-msgstr "หมดเวลาการนำเข้าสริปแล้ว กรุณานำเข้าไฟล์สริปใหม่"
+msgstr ""
+"หมดเวลาการนำเข้าแล้ว หากคุณต้องการดำเนินการต่อให้เรียบร้อย "
+"กรุณานำเข้าไฟล์เดิมอีกรอบ"
 
 #: import.php:602
 msgid ""