From 569318ecf87caaec3f7f6946e414370914ea9eb1 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Mon, 9 Mar 2015 15:46:38 +0100 Subject: [PATCH 1/4] Translated using Weblate (Interlingua) Currently translated at 68.7% (2085 of 3032 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 c32d0ebbad..d4d3849b4f 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,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-08 19:44+0200\n" +"PO-Revision-Date: 2015-03-09 15:46+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -4851,7 +4851,7 @@ msgstr "Selige un columna." #: libraries/central_columns.lib.php:852 libraries/central_columns.lib.php:964 msgid "auto_increment" -msgstr "auto_increment" +msgstr "auto_incremento" #: libraries/central_columns.lib.php:930 msgid "Add new column" From ee76dda54191a4f0bf2c0a303f527e229f8d4ac8 Mon Sep 17 00:00:00 2001 From: Jozef Pistej Date: Mon, 9 Mar 2015 21:15:26 +0100 Subject: [PATCH 2/4] Translated using Weblate (Slovak) Currently translated at 83.1% (2520 of 3032 strings) [CI skip] --- po/sk.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/sk.po b/po/sk.po index 6935ee71f5..d74877e22e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,16 +4,16 @@ 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-02-15 20:32+0200\n" -"Last-Translator: Martin Lacina \n" -"Language-Team: Slovak \n" +"PO-Revision-Date: 2015-03-09 21:15+0200\n" +"Last-Translator: Jozef Pistej \n" +"Language-Team: Slovak " +"\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.2-dev\n" +"X-Generator: Weblate 2.3-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -782,7 +782,6 @@ msgid "PHP extension:" msgstr "Rozšírenie PHP:" #: index.php:345 -#, fuzzy #| msgid "PHP Version:" msgid "PHP version:" msgstr "Verzia PHP:" @@ -4750,10 +4749,9 @@ msgid "Length/Values" msgstr "Dĺžka/Nastaviť*" #: libraries/central_columns.lib.php:670 -#, fuzzy #| msgid "Attributes" msgid "Attribute" -msgstr "Atribúty" +msgstr "Atribút" #: libraries/central_columns.lib.php:674 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:974 From 223eac981fc800c9f561510a5a0869b80dd3a063 Mon Sep 17 00:00:00 2001 From: Domen Date: Mon, 9 Mar 2015 22:59:17 +0100 Subject: [PATCH 3/4] Translated using Weblate (Slovenian) Currently translated at 99.9% (3031 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 5e27aa14a8..308ef303a6 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-07 00:33+0200\n" +"PO-Revision-Date: 2015-03-09 22:59+0200\n" "Last-Translator: Domen \n" "Language-Team: Slovenian " "\n" @@ -4821,7 +4821,7 @@ msgstr "Dodaj nov stolpec" #: libraries/central_columns.lib.php:966 msgid "on update CURRENT_TIMESTAMP" -msgstr "on update CURRENT_TIMESTAMP" +msgstr "ob posodobitvi CURRENT_TIMESTAMP" #: libraries/common.inc.php:579 msgid "Failed to read configuration file!" From 102cd3c273bec5256dfe1503cf2203841446f9c8 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Tue, 10 Mar 2015 07:29:17 +0530 Subject: [PATCH 4/4] BUG #4791. Zoom search: JavaScript error Signed-off-by: Madhura Jayaratne --- js/tbl_zoom_plot_jqplot.js | 7 ++++++- tbl_zoom_select.php | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js index 2f44ebe1a9..36bfbaeb18 100644 --- a/js/tbl_zoom_plot_jqplot.js +++ b/js/tbl_zoom_plot_jqplot.js @@ -142,7 +142,12 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () { // Get query result - var searchedData = jQuery.parseJSON($('#querydata').html()); + var searchedData; + try { + searchedData = jQuery.parseJSON($('#querydata').html()); + } catch (err) { + searchedData = null; + } /** ** Input form submit on field change diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 881ebeff41..6b6096a15c 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -30,6 +30,7 @@ $scripts->addFile('jqplot/plugins/jqplot.cursor.js'); $scripts->addFile('canvg/canvg.js'); $scripts->addFile('jquery/jquery-ui-timepicker-addon.js'); $scripts->addFile('tbl_zoom_plot_jqplot.js'); +$scripts->addFile('tbl_change.js'); $table_search = new PMA_TableSearch($db, $table, "zoom");