From 9126f2cc2d3fd437398f2a30038940bf028bae77 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 26 Jun 2012 07:31:37 -0400 Subject: [PATCH 1/8] 3.5.2-rc1 --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 9ffbd7b6fd..883633e09e 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.2-dev - Documentation + phpMyAdmin 3.5.2-rc1 - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index a0d52e010f..d5ac5fba3b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.2-dev +Version 3.5.2-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index e17886121b..25b34c6d25 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.2-dev'); + $this->set('PMA_VERSION', '3.5.2-rc1'); /** * @deprecated */ From a5b8039bbaf60406f6396cf7962bbe9057092c13 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sat, 30 Jun 2012 16:05:33 +0200 Subject: [PATCH 2/8] - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore --- ChangeLog | 1 + js/sql.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cc62eb36ad..6e6369bb52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - bug #3534121 [config] duplicate line in config.sample.inc.php - bug #3534311 [interface] Grid editing incorrectly parses ENUM/SET values - bug #3510196 [core] More clever URL rewriting with ForceSSL +- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore 3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/js/sql.js b/js/sql.js index 630b47f7fa..4c36ea6bd1 100644 --- a/js/sql.js +++ b/js/sql.js @@ -305,7 +305,7 @@ $(document).ready(function() { $.post($form.attr('action'), $form.serialize(), function(data) { $("#sqlqueryresults") - .html(data) + .html(data.sql_query ? data.sql_query : data) .trigger('makegrid'); PMA_init_slider(); From c401df21e8255cc1d7b1f60fdfa8c3474b3e418a Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sun, 1 Jul 2012 15:29:47 +0200 Subject: [PATCH 3/8] - bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done --- ChangeLog | 1 + js/db_operations.js | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e6369bb52..7669867212 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - bug #3534311 [interface] Grid editing incorrectly parses ENUM/SET values - bug #3510196 [core] More clever URL rewriting with ForceSSL - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore +- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done 3.5.1.0 (2012-05-03) - bug #3510784 [edit] Limit clause ignored when sort order is remembered diff --git a/js/db_operations.js b/js/db_operations.js index 9cc55810fd..4a886b88e2 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -47,7 +47,7 @@ $(document).ready(function() { button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); } $form.PMA_confirm(question, $form.attr('action'), function(url) { - PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']); + PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases'], false); $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) { if(data.success == true) { @@ -88,7 +88,7 @@ $(document).ready(function() { $("#copy_db_form.ajax").live('submit', function(event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); + PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase'], false); var $form = $(this); @@ -99,7 +99,7 @@ $(document).ready(function() { $('.success').fadeOut(); $('.error').fadeOut(); if(data.success == true) { - $('#floating_menubar').after(data.message); + PMA_ajaxShowMessage(data.message); if( $("#checkbox_switch").is(":checked")) { window.parent.db = data.newname; window.parent.refreshMain(); @@ -112,10 +112,8 @@ $(document).ready(function() { } } else { - $('#floating_menubar').after(data.error); + PMA_ajaxShowMessage(data.error, false); } - - PMA_ajaxRemoveMessage($msgbox); }) // end $.get }) // end copy database From 7b57ed650f7e43c6dc982a9de80048b6db91d802 Mon Sep 17 00:00:00 2001 From: aitzol berasategi Date: Sun, 1 Jul 2012 15:39:55 +0200 Subject: [PATCH 4/8] Translated using Weblate. --- po/eu.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/eu.po b/po/eu.po index ec3c151937..d8e18c22bc 100644 --- a/po/eu.po +++ b/po/eu.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-05-02 12:41+0200\n" -"Last-Translator: Marc Delisle \n" +"PO-Revision-Date: 2012-07-01 12:06+0200\n" +"Last-Translator: aitzol berasategi \n" "Language-Team: basque \n" "Language: eu\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 0.10\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -82,9 +82,8 @@ msgstr "Joan" #: browse_foreigners.php:186 browse_foreigners.php:190 #: libraries/Index.class.php:461 tbl_tracking.php:365 -#, fuzzy msgid "Keyname" -msgstr "Giltzaren izena" +msgstr "Giltza-izena" #: browse_foreigners.php:187 browse_foreigners.php:189 #: server_collations.php:39 server_collations.php:51 server_engines.php:42 @@ -103,8 +102,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"%s fitxategia ez dago eskuragarri sisteman, joan www.phpmyadmin.net " -"informazio gehiagorako" +"%s fitxategia ez dago eskuragarri sisteman, informazio gehiagorako ikusi " +"www.phpmyadmin.net" #: db_create.php:74 #, php-format From 37e78d92ea1c9dcb6fe028c5ed6a7ce0d4ec2633 Mon Sep 17 00:00:00 2001 From: ProUser Date: Sun, 1 Jul 2012 18:04:14 +0200 Subject: [PATCH 5/8] Translated using Weblate. --- po/sv.po | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/po/sv.po b/po/sv.po index 33b2eb04b5..3752dac5c8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-06-26 19:16+0200\n" +"PO-Revision-Date: 2012-07-01 18:04+0200\n" "Last-Translator: ProUser \n" "Language-Team: swedish \n" "Language: sv\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -7895,7 +7895,6 @@ msgstr "" "tomma strängen." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -7919,16 +7918,15 @@ msgid "" "option, if set to 1, will prevent wrapping and ensure that the output " "appears all on one line (Default 1)." msgstr "" -"ENDAST LINUX: Startar en extern applikation och skickar fältdata till den " -"via standard-indata. Returnerar applikationens standard-utdata. Standard är " -"Tidy, för att snygga till HTML-kod. Av säkerhetsskäl måste du manuellt " -"redigera filen libraries/transformations/text_plain__external.inc.php lista " -"de verktyg du vill göra tillgängliga. Det första alternativet är då numret " -"för det program du vill använda och det andra alternativet är parametrarna " -"för programmet.. Den tredje parametern, om angivet till 1, kommer att " -"konvertera utgång med htmlspecialchars () (standard 1). Den fjärde " -"parametern, om angivet till 1, kommer att förhindra inslagning och se till " -"att utskriften kommer på en enda rad (standard 1)." +"ENDAST LINUX: Startar en extern applikation och sänder kolumndata via " +"standard in. Returnerar standard ut från applikationen. Standard är Tidy, " +"för att pretty-print HTML-kod. Av säkerhetsskäl måste du manuellt redigera " +"filen libraries/plugins/transformationer/Text_Plain_External.class.php och " +"lista de verktyg du vill göra tillgängliga. Den första optionen är antalet " +"program du vill använda och den andra optionen är parametrarna för " +"programmet. Den tredje optionen, om den är 1, kommer omvandla utdata via " +"htmlspecialchars() (Default 1). Den fjärde optionen, om 1, kommer förhindra " +"radbrytning och se till att utskriften sker på en rad (Default 1). " #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" From fd04c77cf3a653c305a2d66eb70df832e77a904e Mon Sep 17 00:00:00 2001 From: "J. M" Date: Sun, 1 Jul 2012 18:22:05 +0200 Subject: [PATCH 6/8] Translated using Weblate. --- po/de.po | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 4a5f539483..442c9ede20 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-06-24 16:15+0200\n" +"PO-Revision-Date: 2012-07-01 18:22+0200\n" "Last-Translator: J. M. \n" "Language-Team: none\n" "Language: de\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -551,13 +551,13 @@ msgstr[0] "Insgesamt %s Treffer" msgstr[1] "Insgesamt %s Treffer" #: db_search.php:296 -#, fuzzy, php-format +#, php-format #| msgid "%1$s match inside table %2$s" #| msgid_plural "%1$s matches inside table %2$s" msgid "%1$s match in %2$s" msgid_plural "%1$s matches in %2$s" -msgstr[0] "%1$s Treffer in der Tabelle %2$s" -msgstr[1] "%1$s Treffer in der Tabelle %2$s" +msgstr[0] "%1$s Treffer in %2$s" +msgstr[1] "%1$s Treffer in %2$s" #: db_search.php:311 libraries/Menu.class.php:246 #: libraries/common.lib.php:3311 libraries/common.lib.php:3533 @@ -7382,7 +7382,7 @@ msgstr "Benutzung von Blowfish des mcrypt-Pakets fehlgeschlagen!" #: libraries/plugins/auth/AuthenticationCookie.class.php:81 msgid "Your session has expired. Please login again." -msgstr "" +msgstr "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an." #: libraries/plugins/auth/AuthenticationCookie.class.php:170 msgid "Log in" @@ -8003,7 +8003,6 @@ msgstr "" "zu setzen." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -8030,15 +8029,15 @@ msgstr "" "NUR FÜR LINUX: Startet ein externes Programm und verwendet die Daten der " "Spalte für die Standardeingabe. Gibt die Standardausgabe der Anwendung " "zurück. Die Voreinstellung wurde für Tidy optimiert, um HTML code optisch zu " -"formatieren. Aus Sicherheitsgründen müssen Sie die Datei libraries/" -"transformations/text_plain__external.inc.php von Hand bearbeiten, um weitere " -"Programme verfügbar zu machen. Die erste Option ist die Nummer des dort " -"hinterlegten Programmes und die zweite Option legt die Parameter für das " -"externe Programm fest. Die dritte Option bestimmt, falls auf 1 gesetzt, dass " -"die Ausgabe mit htmlspecialchars() formatiert wird (Standard: 1). Die vierte " -"Option bestimmt, falls auf 1 gesetzt, ob ein NOWRAP-Parameter der " -"Tabellenzelle hinzugefügt wird, um einen automatischen Umbruch der " -"Standardausgabe zu verhindern (Standard: 1)." +"formatieren. Aus Sicherheitsgründen müssen Sie die Datei " +"libraries/plugins/transformations/Text_Plain_External.class.php von Hand " +"bearbeiten, um weitere Programme verfügbar zu machen. Die erste Option ist " +"die Nummer des dort hinterlegten Programmes und die zweite Option legt die " +"Parameter für das externe Programm fest. Die dritte Option bestimmt, falls " +"auf 1 gesetzt, dass die Ausgabe mit htmlspecialchars() formatiert wird " +"(Standard: 1). Die vierte Option bestimmt, falls auf 1 gesetzt, ob ein " +"NOWRAP-Parameter der Tabellenzelle hinzugefügt wird, um einen automatischen " +"Umbruch der Standardausgabe zu verhindern (Standard: 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" From 1065739b1a8597d557a6da932e5535eba6ff5d0b Mon Sep 17 00:00:00 2001 From: aitzol berasategi Date: Sun, 1 Jul 2012 19:49:19 +0200 Subject: [PATCH 7/8] Translated using Weblate. --- po/eu.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/eu.po b/po/eu.po index d8e18c22bc..5b475b0651 100644 --- a/po/eu.po +++ b/po/eu.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-07-01 12:06+0200\n" +"PO-Revision-Date: 2012-07-01 18:47+0200\n" "Last-Translator: aitzol berasategi \n" "Language-Team: basque \n" "Language: eu\n" @@ -29,15 +29,14 @@ msgid "Page number:" msgstr "Orri zenbakia:" #: browse_foreigners.php:94 -#, fuzzy msgid "" "The target browser window could not be updated. Maybe you have closed the " "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"The target browser window could not be updated. Maybe you have closed the " -"parent window, or your browser's security settings are configured to block " -"cross-window updates." +"Helburuko lehioa ezin da eguneratu. Baliteke jatorrizko leihoa itxita " +"edukitzea edo zure nabigatzailearen segurtasun ezarpenak zeharkako lehioen " +"eguneratzea blokeatzeko konfiguraturik egotea." #: browse_foreigners.php:168 libraries/Menu.class.php:259 #: libraries/Menu.class.php:353 libraries/common.lib.php:3309 @@ -287,10 +286,10 @@ msgid "Database %1$s has been renamed to %2$s" msgstr "%s datu-basea %s-(e)ra berrizendatua izan da" #: db_operations.php:330 -#, fuzzy, php-format +#, php-format #| msgid "Database %s has been copied to %s" msgid "Database %1$s has been copied to %2$s" -msgstr "%s datu-basea hona kopiatua izan da: %s." +msgstr "%1$s datu-basea %2$s(e)ra kopiatua izan da." #: db_operations.php:461 msgid "Rename database to" From bffb66c910da05e85b5a24c5dfaba9f0f36cec9d Mon Sep 17 00:00:00 2001 From: ProUser Date: Sun, 1 Jul 2012 19:49:21 +0200 Subject: [PATCH 8/8] Translated using Weblate. --- po/sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sv.po b/po/sv.po index 3752dac5c8..5fd18201fd 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7926,7 +7926,7 @@ msgstr "" "program du vill använda och den andra optionen är parametrarna för " "programmet. Den tredje optionen, om den är 1, kommer omvandla utdata via " "htmlspecialchars() (Default 1). Den fjärde optionen, om 1, kommer förhindra " -"radbrytning och se till att utskriften sker på en rad (Default 1). " +"radbrytning och se till att utskriften sker på en rad (Default 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid ""