From 2809c4fb5bf1e2256e9dcd42623501228b21d96e Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Fri, 13 Feb 2015 10:06:52 +0100 Subject: [PATCH 1/5] Translated using Weblate (Interlingua) Currently translated at 64.5% (1922 of 2979 strings) [CI skip] --- po/ia.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ia.po b/po/ia.po index a26cdfca40..9f6ae1fc1f 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-02-11 23:12+0200\n" +"PO-Revision-Date: 2015-02-13 10:06+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -13096,7 +13096,7 @@ msgstr "" #: libraries/structure.lib.php:1634 msgid "Relation view" -msgstr "" +msgstr "Vista relational" #: libraries/structure.lib.php:1646 msgid "Propose table structure" From 373f532e12c94f323d420f19d2217f978c85b358 Mon Sep 17 00:00:00 2001 From: Vytautas Motuzas Date: Sun, 15 Feb 2015 18:57:46 +0100 Subject: [PATCH 2/5] Translated using Weblate (Lithuanian) Currently translated at 49.6% (1482 of 2982 strings) [CI skip] --- po/lt.po | 74 ++++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/po/lt.po b/po/lt.po index c31de37980..54f78878ad 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2014-03-28 11:03+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Lithuanian \n" +"PO-Revision-Date: 2015-02-15 18:57+0200\n" +"Last-Translator: Vytautas Motuzas \n" +"Language-Team: Lithuanian " +"\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.9-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"(n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.2-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -36,10 +36,10 @@ msgid "Click to sort." msgstr "Spustelėkite, kad surūšiuoti" #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1$s - %2$s." -msgstr "Rodomi įrašai" +msgstr "Rodomos eilutės %1$s - %2$s." #: db_create.php:61 #, php-format @@ -54,10 +54,9 @@ msgstr "Duomenų bazės komentaras:" #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:990 #: libraries/tbl_columns_definition_form.lib.php:73 #: libraries/tbl_printview.lib.php:581 -#, fuzzy #| msgid "Table comments" msgid "Table comments:" -msgstr "Lentelės komentarai" +msgstr "Lentelės komentarai:" #: db_datadict.php:103 libraries/Index.class.php:569 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1292 @@ -249,19 +248,19 @@ msgid "The database name is empty!" msgstr "Nenurodytas duomenų bazės vardas!" #: db_operations.php:139 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been renamed to %2$s." msgid "Database %1$s has been renamed to %2$s." -msgstr "Duomenų bazė %1$s pervadinta į %2$s" +msgstr "Duomenų bazė %1$s pervadinta į %2$s." #: db_operations.php:145 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been copied to %2$s." msgid "Database %1$s has been copied to %2$s." -msgstr "Duomenų bazė %1$s buvo nukopijuota į %2$s" +msgstr "Duomenų bazė %1$s buvo nukopijuota į %2$s." #: db_operations.php:266 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." @@ -302,24 +301,21 @@ msgstr "šiuo metu naudojama" #: db_printview.php:120 libraries/plugins/export/ExportSql.class.php:1144 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:995 -#, fuzzy #| msgid "Creation" msgid "Creation:" -msgstr "Sukurta" +msgstr "Kūrimas:" #: db_printview.php:127 libraries/plugins/export/ExportSql.class.php:1157 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1000 -#, fuzzy #| msgid "Last update" msgid "Last update:" -msgstr "Paskutinis atnaujinimas" +msgstr "Paskutinis atnaujinimas:" #: db_printview.php:134 libraries/plugins/export/ExportSql.class.php:1170 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005 -#, fuzzy #| msgid "Last check" msgid "Last check:" -msgstr "Paskutinis patikrinimas" +msgstr "Paskutinis patikrinimas:" #: db_printview.php:146 libraries/structure.lib.php:169 #, php-format @@ -330,10 +326,9 @@ msgstr[1] "%s lentelės" msgstr[2] "%s lentelių" #: db_qbe.php:103 -#, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to choose at least one column to display!" -msgstr "Pasirinkite bent vieną stulpelį išvedimui" +msgstr "Pasirinkite bent vieną stulpelį išvedimui!" #: db_qbe.php:124 #, php-format @@ -490,22 +485,20 @@ msgstr "Naudoti OpenStreetMaps kaip pagrindinį sluoksnį" #. l10n: Spatial Reference System Identifier #: gis_data_editor.php:168 -#, fuzzy #| msgid "SRID" msgid "SRID:" -msgstr "SRID" +msgstr "SRID:" #: gis_data_editor.php:191 -#, fuzzy, php-format +#, php-format #| msgid "Geometry" msgid "Geometry %d:" -msgstr "Geometrija" +msgstr "Geometrija %d:" #: gis_data_editor.php:213 -#, fuzzy #| msgid "Point" msgid "Point:" -msgstr "Taškas" +msgstr "Taškas:" #: gis_data_editor.php:214 gis_data_editor.php:241 gis_data_editor.php:297 #: gis_data_editor.php:370 js/messages.php:378 @@ -535,16 +528,15 @@ msgid "Linestring %d:" msgstr "Atkarpų seka" #: gis_data_editor.php:272 gis_data_editor.php:349 -#, fuzzy #| msgid "Outer Ring" msgid "Outer ring:" -msgstr "Išorinis žiedas" +msgstr "Išorinis žiedas:" #: gis_data_editor.php:274 gis_data_editor.php:351 -#, fuzzy, php-format +#, php-format #| msgid "Inner Ring" msgid "Inner ring %d:" -msgstr "Vidinis žiedas" +msgstr "Vidinis žiedas %d:" #: gis_data_editor.php:311 msgid "Add a linestring" @@ -555,10 +547,10 @@ msgid "Add an inner ring" msgstr "Sukurti vidinį žiedą" #: gis_data_editor.php:333 -#, fuzzy, php-format +#, php-format #| msgid "Polygon" msgid "Polygon %d:" -msgstr "Daugiakampis" +msgstr "Daugiakampis %d:" #: gis_data_editor.php:397 msgid "Add a polygon" @@ -616,14 +608,13 @@ msgid "" msgstr "" #: import.php:54 -#, fuzzy #| msgid "Access denied!" msgid "Succeeded" -msgstr "Priėjimas uždraustas!" +msgstr "Pavyko" #: import.php:58 js/messages.php:438 msgid "Failed" -msgstr "" +msgstr "Nepavyko" #: import.php:62 #, fuzzy @@ -828,10 +819,9 @@ msgid "Show PHP information" msgstr "Rodyti PHP informaciją" #: index.php:372 -#, fuzzy #| msgid "Version information" msgid "Version information:" -msgstr "Versija" +msgstr "Versijos informacija:" #: index.php:381 libraries/Util.class.php:429 libraries/Util.class.php:491 #: libraries/config/FormDisplay.tpl.php:148 @@ -8739,7 +8729,7 @@ msgstr "Kalba" #: libraries/engines/bdb.lib.php:28 msgid "Version information" -msgstr "Versija" +msgstr "Versijos informacija" #: libraries/engines/innodb.lib.php:28 msgid "Data home directory" From c599893330369f65ce6686530a847e18e79c4123 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Sun, 15 Feb 2015 20:32:15 +0100 Subject: [PATCH 3/5] Translated using Weblate (Slovak) Currently translated at 83.9% (2501 of 2979 strings) [CI skip] --- po/sk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sk.po b/po/sk.po index 7f47d1d5a8..c56be53bfb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-02-10 21:22+0200\n" +"PO-Revision-Date: 2015-02-15 20:32+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -4952,7 +4952,7 @@ msgstr "" #: libraries/config/ServerConfigChecks.class.php:205 msgid "You allow for connecting to the server without a password." -msgstr "" +msgstr "Dovoľujete pripojiť sa k serveru bez hesla." #: libraries/config/ServerConfigChecks.class.php:343 msgid "Key is too short, it should have at least 8 characters." @@ -6546,7 +6546,7 @@ msgstr "Pamätať si triedenie tabuľky" #: libraries/config/messages.inc.php:524 msgid "Default sort order for tables with a primary key." -msgstr "" +msgstr "Prednastavený spôsob triedenia pre tabuľky s primárnym kľúčom." #: libraries/config/messages.inc.php:525 #| msgid "Default sorting order" From 1d73964695f4ea292ce5a33d42544f682973e684 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 16 Feb 2015 09:20:29 +0530 Subject: [PATCH 4/5] bug #4763 Database export with more than 512 tables fails Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/export.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index dc2e32c268..67f9d5ab58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug Remove extra column heading in view structure page - bug Add missing confirmation when deleting central columns - bug Undefined index DisableIS +- bug #4763 Database export with more than 512 tables fails 4.3.9.0 (2015-02-05) - bug #4728 Incorrect headings in routine editor diff --git a/js/export.js b/js/export.js index c34059a2d7..c468d664eb 100644 --- a/js/export.js +++ b/js/export.js @@ -304,8 +304,15 @@ function createAliasModal(event) { }; dlgButtons[PMA_messages.strSaveAndClose] = function() { $(this).dialog("close"); + // do not fillup form submission with empty values + $.each($(this).find('input[type="text"]'), function (i, e) { + if ($(e).val().trim().length == 0) { + $(e).prop('disabled', true); + } + }); $('#alias_modal').parent().appendTo($('form[name="dump"]')); }; + $('#alias_modal input[type="text"]').prop('disabled', false); $('#alias_modal').dialog({ width: Math.min($(window).width() - 100, 700), modal: true, From 0aac18fcda1f107cc6ae891ce267a4ba39704eb7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 16 Feb 2015 09:28:06 +0530 Subject: [PATCH 5/5] Missed file from commit 1d73964695f4ea292ce5a33d42544f682973e684 Signed-off-by: Madhura Jayaratne --- libraries/display_export.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 4efe0c5b21..d7f5ed828b 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -803,7 +803,7 @@ function PMA_getHtmlForAliasModalDialog($db = '', $table = '') } $db_input_html .= ''; + . 'id="' . $id_attr . '" value="' . $val . '" disabled="disabled"/>'; $db_html .= ''; $table_html .= ''; $table_html .= '