From ba58615b2eb219aabc956be4b47ef8d5b58f138a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 6 Sep 2015 13:46:15 +0200 Subject: [PATCH 1/5] Translated using Weblate (French) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] --- po/fr.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7d635d1e0a..3eabf80063 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-01 13:17+0200\n" +"PO-Revision-Date: 2015-09-06 13:46+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -15042,10 +15042,9 @@ msgid "Operator" msgstr "Opérateur" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "Déplacer des colonnes" +msgstr "Montrer/cacher les colonnes" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" From 05726349f0a123ca62b2a599960445c26b63d29b Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 6 Sep 2015 16:43:25 +0200 Subject: [PATCH 2/5] Translated using Weblate (Turkish) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] --- po/tr.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index b49b85e353..3788cb6116 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-01 06:19+0200\n" +"PO-Revision-Date: 2015-09-06 16:43+0200\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14906,10 +14906,9 @@ msgid "Operator" msgstr "İşletici" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "Sütunları taşı" +msgstr "Sütunları göster/gizle" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" From 8dd2fb0fb856ebe35d5392456cbfae5a15f122b0 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 6 Sep 2015 19:39:40 +0200 Subject: [PATCH 3/5] Translated using Weblate (Slovenian) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] --- po/sl.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/sl.po b/po/sl.po index e71d182073..96e3383762 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-01 00:14+0200\n" +"PO-Revision-Date: 2015-09-06 19:39+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" "X-Generator: Weblate 2.4-dev\n" #: changelog.php:37 license.php:30 @@ -14887,10 +14887,9 @@ msgid "Operator" msgstr "Operator" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "Premakni stolpce" +msgstr "Pokaži/skrij stolpce" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" From 8fa0368ef2f4e9eeb2a985373e9ce97e43a3c1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Mon, 7 Sep 2015 10:15:05 +0200 Subject: [PATCH 4/5] Translated using Weblate (Estonian) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] --- po/et.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/et.po b/po/et.po index d52509680d..0a5e7b0b5b 100644 --- a/po/et.po +++ b/po/et.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-01 16:27+0200\n" +"PO-Revision-Date: 2015-09-07 10:15+0200\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14764,10 +14764,9 @@ msgid "Operator" msgstr "Operaator" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "Liiguta veergusid" +msgstr "Kuva/peida veerud" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" From 4607c709ac3d5bbef3b10252b80fec949d6bade5 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Mon, 7 Sep 2015 19:50:02 +0300 Subject: [PATCH 5/5] Fixes #11465. Signed-off-by: Dan Ungureanu --- libraries/plugins/import/ImportSql.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php index cd0943331e..3b080f1797 100644 --- a/libraries/plugins/import/ImportSql.class.php +++ b/libraries/plugins/import/ImportSql.class.php @@ -162,10 +162,11 @@ class ImportSql extends ImportPlugin } // Extracting remaining statements. - while ((!$error) && (!$timeout_passed) - && ($statement = $bq->extract(true)) - ) { - PMA_importRunQuery($statement, $statement, false, $sql_data); + while ((!$error) && (!$timeout_passed) && (!empty($bq->query))) { + $statement = $bq->extract(true); + if (!empty($statement)) { + PMA_importRunQuery($statement, $statement, false, $sql_data); + } } // Finishing.