From ee85be10838cd09f835f49ae46b6da21e747ed36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= <sevdimaliisayev@mail.ru>
Date: Tue, 1 Jul 2014 01:40:49 +0200
Subject: [PATCH 1/8] Translated using Weblate (Azerbaijani)

Currently translated at 41.2% (1143 of 2770)
---
 po/az.po | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/po/az.po b/po/az.po
index a0b45a15c3..5609e00eb1 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-06-10 12:45-0400\n"
-"PO-Revision-Date: 2014-06-28 02:22+0200\n"
+"PO-Revision-Date: 2014-07-01 01:40+0200\n"
 "Last-Translator: Sevdimali İsa <sevdimaliisayev@mail.ru>\n"
 "Language-Team: Azerbaijani "
 "<https://l10n.cihar.com/projects/phpmyadmin/4-2/az/>\n"
@@ -13275,21 +13275,22 @@ msgid ""
 "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 "
 "even more so."
 msgstr ""
+"İnkişaf etmiş performansa sahib MySQL 5.1 və ya daha çox MySQL 5.5-ə "
+"yüksəltməlisiniz."
 
 #: libraries/advisory_rules.txt:105 libraries/advisory_rules.txt:112
 #: libraries/advisory_rules.txt:119
-#, fuzzy, php-format
+#, php-format
 msgid "Current version: %s"
-msgstr "Server versiyası"
+msgstr "Cari versiya: %s"
 
 #: libraries/advisory_rules.txt:107 libraries/advisory_rules.txt:114
-#, fuzzy
 msgid "Minor Version"
-msgstr "PHP Versiyası"
+msgstr "İkinci Versiya"
 
 #: libraries/advisory_rules.txt:110
 msgid "Version less than 5.1.30 (the first GA release of 5.1)."
-msgstr ""
+msgstr "Versiya, 5.1.30-dan az(5.1-in ilk GA buraxılışı)."
 
 #: libraries/advisory_rules.txt:111
 msgid ""
@@ -13299,11 +13300,11 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:117
 msgid "Version less than 5.5.8 (the first GA release of 5.5)."
-msgstr ""
+msgstr "Versiya, 5.5.8-dən az(5.5-in ilk GA buraxılışı)."
 
 #: libraries/advisory_rules.txt:118
 msgid "You should upgrade, to a stable version of MySQL 5.5"
-msgstr ""
+msgstr "MySQL 5.5-in stabil versiyasına yüksəltməlisiniz"
 
 #: libraries/advisory_rules.txt:121 libraries/advisory_rules.txt:128
 #: libraries/advisory_rules.txt:135
@@ -13325,7 +13326,7 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:126
 msgid "'source' found in version_comment"
-msgstr ""
+msgstr "'source', version_comment içində tapıldı"
 
 #: libraries/advisory_rules.txt:131 libraries/advisory_rules.txt:138
 msgid "The MySQL manual only is accurate for official MySQL binaries."
@@ -13333,15 +13334,15 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:132
 msgid "Percona documentation is at http://www.percona.com/docs/wiki/"
-msgstr ""
+msgstr "Percona təlimatları http://www.percona.com/docs/wiki/ adresində"
 
 #: libraries/advisory_rules.txt:133
 msgid "'percona' found in version_comment"
-msgstr ""
+msgstr "'percona' version_comment içində tapıldı"
 
 #: libraries/advisory_rules.txt:139
 msgid "Drizzle documentation is at http://docs.drizzle.org/"
-msgstr ""
+msgstr "Drizzle təlimatı http://docs.drizzle.org/ adresində"
 
 #: libraries/advisory_rules.txt:140
 #, php-format
@@ -13349,10 +13350,9 @@ msgid "Version string (%s) matches Drizzle versioning scheme"
 msgstr ""
 
 #: libraries/advisory_rules.txt:142
-#, fuzzy
 #| msgid "MySQL charset"
 msgid "MySQL Architecture"
-msgstr "MySQL charset"
+msgstr "MySQL arxitekturası"
 
 #: libraries/advisory_rules.txt:145
 msgid "MySQL is not compiled as a 64-bit package."
@@ -13368,17 +13368,15 @@ msgstr ""
 #: libraries/advisory_rules.txt:147
 #, php-format
 msgid "Available memory on this host: %s"
-msgstr ""
+msgstr "Hostdakı istifadə oluna bilən yaddaş: %s"
 
 #: libraries/advisory_rules.txt:153
-#, fuzzy
 msgid "Query cache disabled"
-msgstr "Sorğu tipi"
+msgstr "Sorğu keşi deaktiv edildi"
 
 #: libraries/advisory_rules.txt:156
-#, fuzzy
 msgid "The query cache is not enabled."
-msgstr "Sorğu tipi"
+msgstr "Sorğu keşi aktiv edilə bilmədi."
 
 #: libraries/advisory_rules.txt:157
 msgid ""
@@ -13391,11 +13389,11 @@ msgstr ""
 #: libraries/advisory_rules.txt:158
 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'"
 msgstr ""
+"query_cache_size 0-a tənzimlənib və ya query_cache_type 'OFF'-a tənzimlənib"
 
 #: libraries/advisory_rules.txt:160
-#, fuzzy
 msgid "Query caching method"
-msgstr "Sorğu tipi"
+msgstr "Sorğu keş metodu"
 
 #: libraries/advisory_rules.txt:163
 #, fuzzy

From 2819506bb098c7f1a15157152758b5fc34bf55a4 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Tue, 1 Jul 2014 23:32:05 +0530
Subject: [PATCH 2/8] Have single-sort url besides multi-sort for each column
 and make single-sort default on click

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 libraries/DisplayResults.class.php | 80 +++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 30 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index b495104f77..7780e451c3 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1867,7 +1867,7 @@ class PMA_DisplayResults
 
         // Generates the orderby clause part of the query which is part
         // of URL
-        list($sort_order, $order_img) = $this->_makeUrl(
+        list($single_sort_order, $multi_sort_order, $order_img) = $this->_getSingleAndMultiSortUrls(
             $sort_expression, $sort_expression_nodirection, $sort_tbl,
             $name_to_use_in_sort, $sort_direction, $fields_meta, $column_index
         );
@@ -1877,24 +1877,34 @@ class PMA_DisplayResults
             . 'LOCK IN SHARE MODE))@is',
             $unsorted_sql_query, $regs3
         )) {
-            $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2];
+            $single_sorted_sql_query = $regs3[1] . $single_sort_order . $regs3[2];
+            $multi_sorted_sql_query = $regs3[1] . $multi_sort_order . $regs3[2];
         } else {
-            $sorted_sql_query = $unsorted_sql_query . $sort_order;
+            $single_sorted_sql_query = $unsorted_sql_query . $single_sort_order;
+            $multi_sorted_sql_query = $unsorted_sql_query . $multi_sort_order;
         }
 
-        $_url_params = array(
+        $_single_url_params = array(
             'db'                => $this->__get('db'),
             'table'             => $this->__get('table'),
-            'sql_query'         => $sorted_sql_query,
+            'sql_query'         => $single_sorted_sql_query,
             'session_max_rows'  => $session_max_rows
         );
-        $order_url  = 'sql.php' . PMA_URL_getCommon($_url_params);
+
+        $_multi_url_params = array(
+            'db'                => $this->__get('db'),
+            'table'             => $this->__get('table'),
+            'sql_query'         => $multi_sorted_sql_query,
+            'session_max_rows'  => $session_max_rows
+        );
+        $single_order_url  = 'sql.php' . PMA_URL_getCommon($_single_url_params);
+        $multi_order_url = 'sql.php' . PMA_URL_getCommon($_multi_url_params);
 
         // Displays the sorting URL
         // enable sort order swapping for image
         $order_link = $this->_getSortOrderLink(
             $order_img, $column_index, $direction,
-            $fields_meta, $order_url
+            $fields_meta, $single_order_url, $multi_order_url
         );
 
         $sorted_header_html .= $this->_getDraggableClassForSortableColumns(
@@ -1919,13 +1929,13 @@ class PMA_DisplayResults
      * @param array   $fields_meta                 set of field properties
      * @param integer $column_index                The index number to current column
      *
-     * @return  array   2 element array - $order_link, $sorted_header_html
+     * @return  array   3 element array - $single_sort_order, $sort_order, $order_img
      *
      * @access  private
      *
      * @see     _getOrderLinkAndSortedHeaderHtml()
      */
-    private function _makeUrl(
+    private function _getSingleAndMultiSortUrls(
         $sort_expression, $sort_expression_nodirection, $sort_tbl,
         $name_to_use_in_sort, $sort_direction, $fields_meta, $column_index
     ) {
@@ -1993,17 +2003,36 @@ class PMA_DisplayResults
             // For a special case where the code generates two dots between
             // column name and table name.
             $sort_order = preg_replace("/\.\./", ".", $sort_order);
-            // Incase the current column name is in the order by clause
-            // We need to generate the arrow button and related html
+            // Incase this is the current column save $single_sort_order
+            if ($current_name == $name_to_use_in_sort) {
+                if (strpos($current_name, '(') !== false) {
+                    $single_sort_order = "\n" . 'ORDER BY ' . $current_name . ' ';
+                } else {
+                    $single_sort_order = "\n" . 'ORDER BY ' . $sort_tbl
+                        . PMA_Util::backquote(
+                            $current_name
+                        ) . ' ';
+                }
+                if ($is_in_sort) {
+                    list($single_sort_order, $order_img) = $this->_getSortingUrlParams(
+                        $sort_direction, $single_sort_order, $column_index, $index
+                    );
+                } else {
+                    $single_sort_order .= strtoupper($sort_direction[$index]);
+                }
+            }
             if ($current_name == $name_to_use_in_sort && $is_in_sort) {
+                // We need to generate the arrow button and related html
                 list($sort_order, $order_img) = $this->_getSortingUrlParams(
                     $sort_direction, $sort_order, $column_index, $index
                 );
+                $order_img .= " <small>" . ($index + 1) . "</small>";
             } else {
                 $sort_order .= strtoupper($sort_direction[$index]);
             }
             // Separate columns by a comma
             $sort_order .= ", ";
+
             unset($name_to_use_in_sort);
         }
         // remove the comma from the last column name in the newly
@@ -2012,7 +2041,7 @@ class PMA_DisplayResults
         if (empty($order_img)) {
             $order_img = '';
         }
-        return array($sort_order, $order_img);
+        return array($single_sort_order, $sort_order, $order_img);
     }
 
     /**
@@ -2098,49 +2127,37 @@ class PMA_DisplayResults
      * @param integer $column_index   the index of the column
      * @param integer $index          the index of sort direction array.
      *
-     * @return  array                 2 element array - $sort_order, $order_img
+     * @return  array                       2 element array - $sort_order, $order_img
      *
      * @access  private
      *
-     * @see     _makeUrl()
+     * @see     _getSingleAndMultiSortUrls()
      */
     private function _getSortingUrlParams(
         $sort_direction, $sort_order, $column_index, $index
     ) {
-
-        $index2 = $index + 1;
         if (strtoupper(trim($sort_direction[$index])) ==  self::DESCENDING_SORT_DIR) {
-
-            $sort_number = "<small>" . $index2 . "</small>";
             $sort_order .= ' ASC';
             $order_img   = ' ' . PMA_Util::getImage(
                 's_desc.png', __('Descending'),
                 array('class' => "soimg$column_index", 'title' => '')
             );
-
             $order_img  .= ' ' . PMA_Util::getImage(
                 's_asc.png', __('Ascending'),
                 array('class' => "soimg$column_index hide", 'title' => '')
-            ) . $sort_number;
-
+            );
         } else {
-
-            $sort_number = "<small>" . $index2 . "</small>";
             $sort_order .= ' DESC';
             $order_img   = ' ' . PMA_Util::getImage(
                 's_asc.png', __('Ascending'),
                 array('class' => "soimg$column_index", 'title' => '')
             );
-
             $order_img  .=  ' ' . PMA_Util::getImage(
                 's_desc.png', __('Descending'),
                 array('class' => "soimg$column_index hide", 'title' => '')
-            ) . $sort_number;
-
+            );
         }
-
         return array($sort_order, $order_img);
-
     } // end of the '_getSortingUrlParams()' function
 
 
@@ -2152,6 +2169,7 @@ class PMA_DisplayResults
      * @param string  $direction   the display direction
      * @param array   $fields_meta set of field properties
      * @param string  $order_url   the url for sort
+     * @param string  $multi_order_url   the url for sort
      *
      * @return  string                      the sort order link
      *
@@ -2160,7 +2178,7 @@ class PMA_DisplayResults
      * @see     _getTableHeaders()
      */
     private function _getSortOrderLink(
-        $order_img, $col_index, $direction, $fields_meta, $order_url
+        $order_img, $col_index, $direction, $fields_meta, $order_url, $multi_order_url
     ) {
 
         $order_link_params = array();
@@ -2195,9 +2213,11 @@ class PMA_DisplayResults
                 "<br />\n"
             )
             : htmlspecialchars($fields_meta->name);
+        $inner_link_content = $order_link_content . $order_img
+            . '<input type="hidden" value="' .  $multi_order_url . '" />';
 
         return PMA_Util::linkOrButton(
-            $order_url, $order_link_content . $order_img,
+            $order_url, $inner_link_content,
             $order_link_params, false, true
         );
 

From b756cc66de07aa5a6c6fff8a08687dd3d969eb2c Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Wed, 2 Jul 2014 00:37:14 +0530
Subject: [PATCH 3/8] update js for add/remove modify columns in multi sort

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 js/makegrid.js                               | 27 ++++++++++----------
 js/messages.php                              |  4 +--
 js/{columndelete.js => multi_column_sort.js} | 26 +++++++++++--------
 sql.php                                      |  2 +-
 4 files changed, 31 insertions(+), 28 deletions(-)
 rename js/{columndelete.js => multi_column_sort.js} (79%)

diff --git a/js/makegrid.js b/js/makegrid.js
index 14da4fae5c..369521f407 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -430,25 +430,24 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 if ($(t).find('th.marker').length > 0) {
                     g.showMarkHint = true;
                 }
-
-                if (g.showReorderHint && g.reorderHint) {
-                    text += g.reorderHint;
-                }
                 if (g.showSortHint && g.sortHint) {
                     text += text.length > 0 ? '<br />' : '';
-                    text += g.sortHint;
+                    text += '- ' + g.sortHint;
                 }
-                 if (g.showRemColHint && g.strRemColHint) {
+                 if (g.showMultiSortHint && g.strMultiSortHint) {
                     text += text.length > 0 ? '<br />' : '';
-                    text += g.strRemColHint;
+                    text += '- ' + g.strMultiSortHint;
                 }
-                if (g.showMarkHint && g.markHint &&
-                    !g.showSortHint      // we do not show mark hint, when sort hint is shown
+                if (g.showMarkHint && g.markHint
+                    && !g.showSortHint // we do not show mark hint, when sort hint is shown
+                    && g.showReorderHint && g.reorderHint
                 ) {
                     text += text.length > 0 ? '<br />' : '';
-                    text += g.markHint;
+                    text += '- ' + g.reorderHint;
                     text += text.length > 0 ? '<br />' : '';
-                    text += g.copyHint;
+                    text += '- ' + g.markHint;
+                    text += text.length > 0 ? '<br />' : '';
+                    text += '- ' + g.copyHint;
                 }
             }
             return text;
@@ -1803,7 +1802,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
     // assign the hints
     g.sortHint = PMA_messages.strSortHint;
-    g.strRemColHint = PMA_messages.strRemColHint;
+    g.strMultiSortHint = PMA_messages.strMultiSortHint;
     g.markHint = PMA_messages.strColMarkHint;
     g.copyHint = PMA_messages.strColNameCopyHint;
 
@@ -1857,14 +1856,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     $(t).find('th.draggable a')
         .mouseenter(function (e) {
             g.showSortHint = true;
-            g.showRemColHint = true;
+            g.showMultiSortHint = true;
             $(t).find("th.draggable").tooltip("option", {
                 content: g.updateHint()
             });
         })
         .mouseleave(function (e) {
             g.showSortHint = false;
-            g.showRemColHint = false;
+            g.showMultiSortHint = false;
             $(t).find("th.draggable").tooltip("option", {
                 content: g.updateHint()
             });
diff --git a/js/messages.php b/js/messages.php
index 673630fe68..67711471ce 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -341,8 +341,8 @@ $js_messages['strObjectsCreated'] = __('%d object(s) created.');
 $js_messages['strCellEditHint'] = __('Press escape to cancel editing.');
 $js_messages['strSaveCellWarning'] = __('You have edited some data and they have not been saved. Are you sure you want to leave this page before saving the data?');
 $js_messages['strColOrderHint'] = __('Drag to reorder.');
-$js_messages['strSortHint'] = __('Click to sort.');
-$js_messages['strRemColHint'] = __('Hold shift and click to remove column from ORDER BY clause.');
+$js_messages['strSortHint'] = __('Click to sort results by this column.');
+$js_messages['strMultiSortHint'] = __('Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.<br />- Control+CLick to remove column from ORDER BY clause');
 $js_messages['strColMarkHint'] = __('Click to mark/unmark.');
 $js_messages['strColNameCopyHint'] = __('Double-click to copy column name.');
 $js_messages['strColVisibHint'] = __(
diff --git a/js/columndelete.js b/js/multi_column_sort.js
similarity index 79%
rename from js/columndelete.js
rename to js/multi_column_sort.js
index 4dead77444..cb5bece3ca 100644
--- a/js/columndelete.js
+++ b/js/multi_column_sort.js
@@ -17,7 +17,7 @@ function captureURL(url)
     URL['head'] = url.substr(0, url.indexOf('ORDER+BY') + 9);
     URL['tail'] = url.substr(url.indexOf("&session_max_rows"), url.length); 
     return URL;       
-} 
+}
 
 /**
  * This function is for navigating to the generated URL
@@ -26,8 +26,8 @@ function captureURL(url)
  * @param object   parent HTMLDom Object
  */
 
-function redirect(target, parent)
-{     
+function removeColumnFromMultiSort(target, parent)
+{
     var URL = captureURL(target);
     var begin = target.indexOf('ORDER+BY') + 8;
     var end = target.indexOf('&session_max_rows');
@@ -43,7 +43,7 @@ function redirect(target, parent)
     columns.splice(index-1, 1); 
     // If all the columns have been removed dont submit a query with nothing
     // After order by clause.
-    if (columns.length == 0){ 
+    if (columns.length == 0){
         var head = URL['head'];
         head = head.slice(0,head.indexOf('ORDER+BY')); 
         URL['head'] = head;
@@ -52,16 +52,20 @@ function redirect(target, parent)
         URL['tail'] += '&discard_remembered_sort=1';
     }
     var middle_part = columns.join('%2C+');  
-    url = URL['head'] + middle_part + URL['tail'];  
-    window.location.replace(url);
+    url = URL['head'] + middle_part + URL['tail'];
+    return url;
 }
 
-
-AJAX.registerOnload('keyhandler.js', function () { 
-    $("th.draggable.column_heading.pointer.marker  a").live('click', function (event) { 
-        if (event.shiftKey) {
+AJAX.registerOnload('keyhandler.js', function () {
+    $("th.draggable.column_heading.pointer.marker  a").live('click', function (event) {
+        var url = $(this).parent().find('input').val();
+        if (event.ctrlKey) {
             event.preventDefault();
-            redirect($(this).attr("href"), $(this).parent()); 
+            url = removeColumnFromMultiSort(url, $(this).parent());
+            window.location.replace(url);
+        } else if (event.shiftKey) {
+            event.preventDefault();
+            window.location.replace(url);
         }
     });  
 });
diff --git a/sql.php b/sql.php
index 07a8ca770d..a740f30c33 100644
--- a/sql.php
+++ b/sql.php
@@ -27,7 +27,7 @@ $scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('tbl_change.js');
 $scripts->addFile('indexes.js');
 $scripts->addFile('gis_data_editor.js');
-$scripts->addFile('columndelete.js');
+$scripts->addFile('multi_column_sort.js');
 
 /**
  * Set ajax_reload in the response if it was already set

From 18973db3c934737ac76ea9bd36bf167404f1b5a2 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Wed, 2 Jul 2014 11:45:21 +0530
Subject: [PATCH 4/8] Changelog for 4482

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index fe3c3c412e..06782bc6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.2.6.0 (not yet released)
 - bug #4471 Undefined index warning with referenced column.
 - bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is back
+- bug #4482 Multi Column sorting (improved user experience)
 
 4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons

From a61bc86d2be39ff04d354372eeb01df30f84761d Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Wed, 2 Jul 2014 13:10:15 +0530
Subject: [PATCH 5/8] Remove window.location.replace

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 js/multi_column_sort.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js
index cb5bece3ca..c7380c80f3 100644
--- a/js/multi_column_sort.js
+++ b/js/multi_column_sort.js
@@ -57,15 +57,15 @@ function removeColumnFromMultiSort(target, parent)
 }
 
 AJAX.registerOnload('keyhandler.js', function () {
-    $("th.draggable.column_heading.pointer.marker  a").live('click', function (event) {
+    $("th.draggable.column_heading.pointer.marker  a").on('click', function (event) {
         var url = $(this).parent().find('input').val();
         if (event.ctrlKey) {
             event.preventDefault();
             url = removeColumnFromMultiSort(url, $(this).parent());
-            window.location.replace(url);
+            $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
         } else if (event.shiftKey) {
             event.preventDefault();
-            window.location.replace(url);
+            $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
         }
     });  
 });

From 06f7a7b8a4eba66a00bba512f48268a399392b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= <kristjanrats@gmail.com>
Date: Wed, 2 Jul 2014 09:43:39 +0200
Subject: [PATCH 6/8] Translated using Weblate (Estonian)

Currently translated at 100.0% (2770 of 2770)
---
 po/et.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/et.po b/po/et.po
index 713b13635f..6a73508a0c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-06-10 12:45-0400\n"
-"PO-Revision-Date: 2014-06-23 07:10+0200\n"
+"PO-Revision-Date: 2014-07-02 09:43+0200\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
 "Language-Team: Estonian <https://l10n.cihar.com/projects/phpmyadmin/4-2/et/>"
 "\n"
@@ -925,7 +925,7 @@ msgstr "Kustuta jälgimise andmed"
 
 #: js/messages.php:42
 msgid "Dropping Primary Key/Index"
-msgstr "Primaarvõtme/Indeksi kustutamine"
+msgstr "Primaarvõtme/indeksi kustutamine"
 
 #: js/messages.php:43
 msgid "This operation could take a long time. Proceed anyway?"
@@ -3628,12 +3628,12 @@ msgstr "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE alias"
 #: libraries/Types.class.php:344 libraries/Types.class.php:790
 #, php-format
 msgid "A date, supported range is %1$s to %2$s"
-msgstr "Kuupäev, sobiv ulatus on %1$s kuni %2$s"
+msgstr "Kuupäev, sobiv vahemik on %1$s kuni %2$s"
 
 #: libraries/Types.class.php:346 libraries/Types.class.php:792
 #, php-format
 msgid "A date and time combination, supported range is %1$s to %2$s"
-msgstr "Kuupäeva ja aja kombinatsioon, sobiv ulatus on %1$s kuni %2$s"
+msgstr "Kuupäeva ja aja kombinatsioon, sobiv vahemik on %1$s kuni %2$s"
 
 #: libraries/Types.class.php:348
 msgid ""
@@ -3647,7 +3647,7 @@ msgstr ""
 #: libraries/Types.class.php:350 libraries/Types.class.php:796
 #, php-format
 msgid "A time, range is %1$s to %2$s"
-msgstr "Aeg, ulatus on %1$s kuni %2$s"
+msgstr "Aeg, vahemik on %1$s kuni %2$s"
 
 #: libraries/Types.class.php:352
 msgid ""

From b0507aab93412f57f57a2eb17a462a03fdbe6d25 Mon Sep 17 00:00:00 2001
From: Lakshmanan M <send2lakshman@gmail.com>
Date: Wed, 2 Jul 2014 07:56:42 +0200
Subject: [PATCH 7/8] Translated using Weblate (Tamil)

Currently translated at 31.0% (860 of 2770)
---
 po/ta.po | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/po/ta.po b/po/ta.po
index b7eb4a248c..03789e8844 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-06-10 12:45-0400\n"
-"PO-Revision-Date: 2014-06-09 20:38+0200\n"
-"Last-Translator: கணேஷ் குமார் <GANESHTHEONE@gmail.com>\n"
+"PO-Revision-Date: 2014-07-02 07:56+0200\n"
+"Last-Translator: Lakshmanan M <send2lakshman@gmail.com>\n"
 "Language-Team: Tamil <https://l10n.cihar.com/projects/phpmyadmin/4-2/ta/>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 1.10-dev\n"
 
@@ -830,12 +830,18 @@ msgstr ""
 "பிரிக்கவியலாது அதனால் எதிர்பாரா முடிவுகள் கிடைக்கலாம்."
 
 #: index.php:471
+#, fuzzy
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
 "cookie validity configured in phpMyAdmin, because of this, your login will "
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
+"உங்கள் PHP அளவுரு "
+"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-"
+"maxlifetime@_blank]session.gc_maxlifetime[/a] , கால் தேக்கரண்டி உப்பு "
+"கட்டமைக்கப்பட்ட குக்கீ செல்லுபடியாகும் விட குறைவாக உள்ளது, ஏனெனில் இந்த, "
+"உங்கள் உள்நுழைவு விரைவில் உதாரணமாக, கட்டமைக்கப்பட்ட விட காலாவதியாகிவிடும்."
 
 #: index.php:483
 msgid ""

From c2797570d171ccfe8bfdab5873c8306815441c01 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Wed, 2 Jul 2014 14:00:32 +0530
Subject: [PATCH 8/8] Fix js error on multisort

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 js/multi_column_sort.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/multi_column_sort.js b/js/multi_column_sort.js
index c7380c80f3..51ea76b34e 100644
--- a/js/multi_column_sort.js
+++ b/js/multi_column_sort.js
@@ -62,9 +62,11 @@ AJAX.registerOnload('keyhandler.js', function () {
         if (event.ctrlKey) {
             event.preventDefault();
             url = removeColumnFromMultiSort(url, $(this).parent());
+            AJAX.source = $(this);
             $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
         } else if (event.shiftKey) {
             event.preventDefault();
+            AJAX.source = $(this);
             $.get(url, {'ajax_request' : true, 'ajax_page_request' : true}, AJAX.responseHandler);
         }
     });