From 23116557f2f93dbb94c7914fbc6bd0bb98302ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Sat, 19 Mar 2016 07:52:50 +0100 Subject: [PATCH 1/2] Translated using Weblate (Azerbaijani) Currently translated at 52.4% (1685 of 3211 strings) [CI skip] --- po/az.po | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/po/az.po b/po/az.po index 29bbeb07d4..d299f9f6ff 100644 --- a/po/az.po +++ b/po/az.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2015-05-21 01:04+0200\n" +"PO-Revision-Date: 2016-03-19 07:52+0000\n" "Last-Translator: Sevdimali İsa \n" -"Language-Team: Azerbaijani \n" +"Language-Team: Azerbaijani " +"\n" "Language: az\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.3-dev\n" +"X-Generator: Weblate 2.5\n" #: changelog.php:37 license.php:33 #, php-format @@ -284,10 +284,9 @@ msgstr "Məlumat" #: db_export.php:70 libraries/DbSearch.php:442 #: libraries/display_export.lib.php:42 libraries/replication_gui.lib.php:377 -#, fuzzy #| msgid "Select All" msgid "Select all" -msgstr "Hamısını Seç" +msgstr "Hamısını seç" #: db_operations.php:52 tbl_create.php:21 msgid "The database name is empty!" @@ -393,7 +392,7 @@ msgstr "\"%s\" sütunu üçün verilən" #: gis_data_editor.php:145 #: templates/table/gis_visualization/gis_visualization.phtml:38 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Əsas qat olaraq OpenStreetMaps istifadə et" #. l10n: Spatial Reference System Identifier #: gis_data_editor.php:167 @@ -17563,10 +17562,6 @@ msgstr "concurrent_insert 0-a konfiqurasiya edilib" #~ msgid "None" #~ msgstr "Heç biri" -#~ msgctxt "" -#~ msgid "None" -#~ msgstr "Heç biri" - #~ msgid "Grant all privileges on wildcard name (username_%)" #~ msgstr "\"%s\" bazası üçün selahiyyetleri gözden keçir." From d2ad23972b3cbcf1cb1a31c308522e51eb68b16d Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 21 Mar 2016 17:56:47 +0530 Subject: [PATCH 2/2] Fix #12105 : Multi-server drag-drop-import always fails Signed-off-by: Deven Bansod --- ChangeLog | 1 + js/common.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index d8ebf81ea0..2d143a0f28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog - issue #12074 Fixed possible invalid SQL export - issue #12026 Fixed parsing of UNION SELECT with brackets - issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT +- issue #12105 Multi-server drap-and-drop import always fails 4.5.5.1 (2016-02-29) - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser. diff --git a/js/common.js b/js/common.js index 0639914738..83733bf3eb 100644 --- a/js/common.js +++ b/js/common.js @@ -409,6 +409,8 @@ PMA_DROP_IMPORT = { */ _drop: function (event) { var dbname = PMA_commonParams.get('db'); + var server = PMA_commonParams.get('server'); + //if no database is selected -- no if (dbname !== '') { var files = event.originalEvent.dataTransfer.files; @@ -449,6 +451,7 @@ PMA_DROP_IMPORT = { fd.append('import_file', files[i]); fd.append('noplugin', Math.random().toString(36).substring(2, 12)); fd.append('db', dbname); + fd.append('server', server); fd.append('token', PMA_commonParams.get('token')); fd.append('import_type', 'database'); // todo: method to find the value below