From 139858465bdc0c63b2d89286b03e0ec99a384224 Mon Sep 17 00:00:00 2001 From: Alexandre Palma Date: Mon, 19 Jun 2017 12:55:45 +0000 Subject: [PATCH 1/2] Translated using Weblate (Portuguese) Currently translated at 53.1% (1702 of 3204 strings) [CI skip] --- po/pt.po | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/po/pt.po b/po/pt.po index 49509aba3b..136da6a148 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-06-13 17:05+0200\n" -"PO-Revision-Date: 2017-01-19 21:38+0000\n" -"Last-Translator: Flavio Coelho \n" -"Language-Team: Portuguese \n" +"PO-Revision-Date: 2017-06-19 12:55+0000\n" +"Last-Translator: Alexandre Palma \n" +"Language-Team: Portuguese " +"\n" "Language: pt\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.11-dev\n" +"X-Generator: Weblate 2.15-dev\n" #: ajax.php:16 ajax.php:33 export.php:191 schema_export.php:64 msgid "Bad type!" @@ -610,6 +610,9 @@ msgid "" "You were logged out from one server, to logout completely from phpMyAdmin, " "you need to logout from all servers." msgstr "" +"Você foi desconectado de apenas um servidor, para se desconectar " +"completamente do phpMyAdmin, você precisa desconectar-se de todos os " +"servidores." #: index.php:160 libraries/Footer.php:69 msgid "phpMyAdmin Demo Server" @@ -1196,10 +1199,8 @@ msgid "Total swap" msgstr "Swap total" #: js/messages.php:192 -#, fuzzy -#| msgid "Cached Swap" msgid "Cached swap" -msgstr "Swap retida" +msgstr "swap retida (em cache)" #: js/messages.php:193 #, fuzzy @@ -1540,22 +1541,16 @@ msgid "Chart" msgstr "Mapa de Resultados" #: js/messages.php:298 libraries/display_export.lib.php:903 -#, fuzzy -#| msgid "Database" msgctxt "Alias" msgid "Database" msgstr "Base de Dados" #: js/messages.php:299 libraries/display_export.lib.php:915 -#, fuzzy -#| msgid "Table" msgctxt "Alias" msgid "Table" msgstr "Tabela" #: js/messages.php:300 libraries/display_export.lib.php:926 -#, fuzzy -#| msgid "Column" msgctxt "Alias" msgid "Column" msgstr "Coluna" @@ -1647,8 +1642,6 @@ msgid "No files available on server for import!" msgstr "Não existem ficheiros disponíveis para importar no servidor!" #: js/messages.php:335 -#, fuzzy -#| msgid "Analyse Query" msgid "Analyse query" msgstr "Analisar pedido" @@ -1689,10 +1682,8 @@ msgid "Formatting SQL…" msgstr "Formatando SQL…" #: js/messages.php:350 -#, fuzzy -#| msgid "Bad parameters!" msgid "No parameters found!" -msgstr "Parâmetros inválidos!" +msgstr "Parâmetros não encontrados!" #: js/messages.php:354 #: templates/database/designer/aggregate_query_panel.phtml:63 @@ -1707,10 +1698,8 @@ msgid "Cancel" msgstr "Cancelar" #: js/messages.php:357 libraries/Header.php:447 -#, fuzzy -#| msgid "Change settings" msgid "Page-related settings" -msgstr "Configurações da página" +msgstr "Configurações relacionadas com a página" #: js/messages.php:358 libraries/config/FormDisplay.tpl.php:424 msgid "Apply" @@ -1726,10 +1715,8 @@ msgid "Request aborted!!" msgstr "Pedido anulado!!" #: js/messages.php:363 -#, fuzzy -#| msgid "Processing Request" msgid "Processing request" -msgstr "Processando Pedido" +msgstr "Processando o pedido" #: js/messages.php:364 msgid "Request failed!!" From 7f22e4f3da6dfc14b8b761b374309d1599dc7e09 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 22 Jun 2017 00:32:59 +1000 Subject: [PATCH 2/2] Fix #13383 "Create PHP code" is broken Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/Util.php | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48ca60e18b..d9586cb670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog - issue #13386 Avoid PHP errors with non existing configuration on OS X - issue #13388 Show only supported charsets for conversion - issue #13392 Fixed operation with session.auto_start enabled +- issue #13383 "Create PHP code" is broken 4.7.1 (2017-05-25) - issue #13132 Always execute tracking queries as controluser diff --git a/libraries/Util.php b/libraries/Util.php index babc312fb9..18120d5c26 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -1017,15 +1017,14 @@ class Util if (! empty($GLOBALS['show_as_php'])) { $new_line = '\\n"
' . "\n" . '    . "'; - $query_base = '$sql = \'' . $query_base; - $query_base = '
' . "\n"
-                    . htmlspecialchars(addslashes($query_base));
+                $query_base = htmlspecialchars(addslashes($query_base));
                 $query_base = preg_replace(
                     '/((\015\012)|(\015)|(\012))/',
                     $new_line,
                     $query_base
                 );
-                $query_base = '$sql  = \'' . $query_base . '"';
+                $query_base = '
' . "\n"
+                    . '$sql = "' . $query_base;
             } elseif ($query_too_big) {
                 $query_base = htmlspecialchars($query_base);
             } else {
@@ -1169,7 +1168,7 @@ class Util
 
             //Clean up the end of the PHP
             if (! empty($GLOBALS['show_as_php'])) {
-                $retval .= '\';' . "\n"
+                $retval .= '";' . "\n"
                     . '
';
             }
             $retval .= '';