From 5c1fd9e1804acef917117dd91d7d85ff8f9a12c0 Mon Sep 17 00:00:00 2001
From: Domen <mitenem@outlook.com>
Date: Wed, 18 Mar 2015 23:25:18 +0100
Subject: [PATCH 1/3] Translated using Weblate (Slovenian)

Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
---
 po/sl.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/sl.po b/po/sl.po
index 308ef303a6..3b73db8d7d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-03-06 08:15-0500\n"
-"PO-Revision-Date: 2015-03-09 22:59+0200\n"
+"PO-Revision-Date: 2015-03-18 23:25+0200\n"
 "Last-Translator: Domen <mitenem@outlook.com>\n"
 "Language-Team: Slovenian "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-4/sl/>\n"
@@ -11807,7 +11807,7 @@ msgstr "Zahteva prisotnost veljavnega certifikata X509 s to zadevo."
 
 #: libraries/server_privileges.lib.php:818
 msgid "Requires a valid X509 cetrificate."
-msgstr ""
+msgstr "Zahteva veljaven certifikat X509."
 
 #: libraries/server_privileges.lib.php:867
 msgid "Resource limits"

From 15b8c778c09f7485a351098d46ec60a4fa570a0c Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 19 Mar 2015 08:56:22 +0530
Subject: [PATCH 2/3] Use standard font size

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/navigation/NavigationTree.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 4c774dedee..9f45dc592a 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -843,7 +843,7 @@ class PMA_NavigationTree
                 $retval .= urlencode($parents[0]->real_name);
                 $retval .= "</span>";
                 if (empty($listContent)) {
-                    $retval .= "<div style='margin:0.75em;font-size:1.2em'>";
+                    $retval .= "<div style='margin:0.75em'>";
                     $retval .= __('No tables found in database.');
                     $retval .= "</div>";
                 }
@@ -1206,7 +1206,7 @@ class PMA_NavigationTree
         $retval .= '</select></form>';
         $retval .= '</div></div>';
         $retval .= '<div id="pma_navigation_tree_content">';
-        $retval .= '<div style="margin:0.75em;font-size:1.2em">';
+        $retval .= '<div style="margin:0.75em">';
         $retval .= __('Please select a database.');
         $retval .= '</div>';
         $retval .= '</div>';

From e8ced3949d0ec0d06c78b2bcefb49a455ecbee8b Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 19 Mar 2015 10:16:04 +0530
Subject: [PATCH 3/3] bug #4812 Issues with index dialog while creating a table

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/functions.js               | 3 ++-
 js/indexes.js                 | 1 +
 libraries/tbl_indexes.lib.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 7f3dcb28d4..c37b5175a0 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -368,7 +368,7 @@ function PMA_addDatepicker($this_element, type, options)
             }, 0);
         },
         onSelect: function() {
-            $this_element.data('datepicker').inline = true;                               
+            $this_element.data('datepicker').inline = true;
         },
         onClose: function (dateText, dp_inst) {
             // The value is no more from the date picker
@@ -3493,6 +3493,7 @@ function showIndexEditDialog($outer)
             );
         }
     });
+    $('div.add_fields').removeClass('hide');
     // focus index size input on column picked
     $outer.find('table#index_columns select').change(function () {
         if ($(this).find("option:selected").val() === '') {
diff --git a/js/indexes.js b/js/indexes.js
index 009b940d13..1e997a5edc 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -344,6 +344,7 @@ function PMA_showAddIndexDialog(source_array, array_index, target_columns, col_i
                 open: function () {
                     checkIndexName("index_frm");
                     PMA_showHints($div);
+                    PMA_init_slider();
                     $('#index_columns td').each(function () {
                         $(this).css("width", $(this).width() + 'px');
                     });
diff --git a/libraries/tbl_indexes.lib.php b/libraries/tbl_indexes.lib.php
index 5724b10617..2265a8814a 100644
--- a/libraries/tbl_indexes.lib.php
+++ b/libraries/tbl_indexes.lib.php
@@ -460,7 +460,7 @@ function PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields)
     $html .= '<div class="add_more">';
     $btn_value = sprintf(__('Add %s column(s) to index'), 1);
     $html .= '<div class="slider"></div>';
-    $html .= '<div class="add_fields">';
+    $html .= '<div class="add_fields hide">';
     $html .= '<input type="submit" id="add_fields" value="' . $btn_value . '" />';
     $html .= '</div>';
     $html .= '</div>';