From e0a63ce104e5f5e7d372eeac7720e6ab2ea73d1f Mon Sep 17 00:00:00 2001
From: Roohan Kazi <roohan_cena@yahoo.co.in>
Date: Tue, 27 Jan 2015 03:32:21 +0100
Subject: [PATCH 1/2] Translated using Weblate (Hindi)

Currently translated at 42.6% (1272 of 2980 strings)

[CI skip]
---
 po/hi.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/hi.po b/po/hi.po
index 29f44707c0..6ac178536f 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.3.5-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-01-01 08:24-0500\n"
-"PO-Revision-Date: 2014-12-11 18:37+0200\n"
-"Last-Translator: Kushagra Pandey <kushagra4296@gmail.com>\n"
-"Language-Team: Hindi <https://hosted.weblate.org/projects/phpmyadmin/4-3/hi/"
-">\n"
+"PO-Revision-Date: 2015-01-27 03:32+0200\n"
+"Last-Translator: Roohan Kazi <roohan_cena@yahoo.co.in>\n"
+"Language-Team: Hindi <https://hosted.weblate.org/projects/phpmyadmin/4-3/hi/>"
+"\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,8 +21,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
-"%s ये फ़ाइल  में उपलब्ध नहीं है, कृपया अधिक जानकारी के लिए www.phpmyadmin.net वेबसाईट "
-"पर जाएँ।"
+"%s फ़ाइल सिस्टम  में उपलब्ध नहीं है, कृपया अधिक जानकारी के लिए "
+"www.phpmyadmin.net वेबसाईट पर जाएँ।"
 
 #: db_central_columns.php:85
 msgid "The central list of columns for the current database is empty."

From a48ca709f50748741b978e6aea03ee8a21961a46 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 27 Jan 2015 15:39:15 +0530
Subject: [PATCH 2/2] bug #4736 Changing display options breaks query
 highlighting

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog | 1 +
 js/sql.js | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5a3ee5443f..293749d8de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables
 - bug #4729 Display original field when using "Relational display column" option and display column is empty
 - bug #4734 Default values for binary fields do not support binary values
+- bug #4736 Changing display options breaks query highlighting
 
 4.3.8.0 (2015-01-24)
 - bug       Undefined constant PMA_DRIZZLE
diff --git a/js/sql.js b/js/sql.js
index 377e3b7587..abc3400220 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -421,11 +421,15 @@ AJAX.registerOnload('sql.js', function () {
 
         $form = $(this);
 
+        var $msgbox = PMA_ajaxShowMessage();
         $.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function (data) {
-            $("#sqlqueryresults")
+            PMA_ajaxRemoveMessage($msgbox);
+            var $sqlqueryresults = $("#sqlqueryresults");
+            $sqlqueryresults
              .html(data.message)
              .trigger('makegrid');
             PMA_init_slider();
+            PMA_highlightSQL($sqlqueryresults);
         }); // end $.post()
     }); //end displayOptionsForm handler