From 720565ef22ad0009b5f4b72fc9d2c0ed854effb4 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 31 Mar 2015 19:38:09 +0530
Subject: [PATCH 1/3] Select local file import option in subsequent submissions

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/display_import.lib.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index f804c6e2e2..45b923eca8 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -233,7 +233,13 @@ function PMA_getHtmlForImportOptionsFile($max_upload_size, $import_list)
         $html .= '            </li>';
         $html .= '            <li>';
         $html .= '               <input type="radio" name="file_location" '
-            . 'id="radio_local_import_file" />';
+            . 'id="radio_local_import_file"';
+        if (! empty($GLOBALS['timeout_passed'])
+           && ! empty($GLOBALS['local_import_file'])
+        ) {
+            $html .= ' checked="checked"';
+        }
+        $html .= ' />';
         $html .= PMA_Util::getSelectUploadFileBlock($import_list, $cfg['UploadDir']);
         $html .= '            </li>';
         $html .= '            </ul>';

From 95a13009379147bfda6078b8d5b7cc9d67d5c712 Mon Sep 17 00:00:00 2001
From: dingo thirteen <dingo13@gmail.com>
Date: Tue, 31 Mar 2015 17:39:43 +0200
Subject: [PATCH 2/3] Translated using Weblate (Dutch)

Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
---
 po/nl.po | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index e07ccdd18b..67d3ec2595 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,14 +4,14 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-03-30 08:55-0400\n"
-"PO-Revision-Date: 2015-03-16 17:37+0200\n"
+"PO-Revision-Date: 2015-03-31 17:39+0200\n"
 "Last-Translator: dingo thirteen <dingo13@gmail.com>\n"
-"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/4-4/nl/"
-">\n"
+"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/4-4/nl/>"
+"\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.3-dev\n"
 
@@ -685,7 +685,7 @@ msgid "Import has been successfully finished, %d queries executed."
 msgstr "Het importeren is geslaagd, %d query's uitgevoerd."
 
 #: import.php:665
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "Script timeout passed, if you want to finish import, please resubmit same "
 #| "file and import will resume."
@@ -693,8 +693,8 @@ msgid ""
 "Script timeout passed, if you want to finish import, please %sresubmit the "
 "same file%s and import will resume."
 msgstr ""
-"De maximale uitvoertijd is verstreken, als u het importeren wilt afmaken "
-"kunt u het bestand opnieuw invoeren."
+"De maximale uitvoertijd is verstreken, als u het importeren wilt afmaken, %"
+"resubmit dezelfde file%s opnieuw en de import zal hervat worden."
 
 #: import.php:675
 msgid ""
@@ -1697,10 +1697,9 @@ msgid "Processing Request"
 msgstr "Bezig met verwerken"
 
 #: js/messages.php:261
-#, fuzzy
 #| msgid "Request Aborted!!"
 msgid "Request Failed!!"
-msgstr "Aanvraag afgebroken!"
+msgstr "Aanvraag gefaald!!"
 
 #: js/messages.php:262
 msgid "Error in Processing Request"

From c5796e912f3a43c091706b9592649cf79e4b80a5 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 1 Apr 2015 11:58:00 +0530
Subject: [PATCH 3/3] bug #4825 Datepicker missing when changing number of rows
 on Insert page

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

diff --git a/ChangeLog b/ChangeLog
index b18d5de60e..7d3e049d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - bug #4805 Inline edit broken when using functions in query
 - bug #4821 Timed-out import fails to restart when file represented
 - bug #4754 pMA DB not detected properly
+- bug #4825 Datepicker missing when changing number of rows on Insert page
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 891632d337..6928d4f658 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -638,9 +638,9 @@ AJAX.registerOnload('tbl_change.js', function () {
                 curr_rows--;
             }
         }
+        // Add all the required datepickers back
+        addDateTimePicker();
     });
-    // Add all the required datepickers back
-    addDateTimePicker();
 
     /**
      * @var $function_option_dialog object holds dialog for selected function options.