From 5beca256a74af39bad75d7239c6c49d8736b74ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Cognard?= Date: Wed, 4 Jul 2018 11:47:58 +0200 Subject: [PATCH 1/3] #14452 Remove hash param in edit query URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Cognard (cherry picked from commit 5d0fae07a65cd31ec892201c298444ee4e0f0abd) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 192695dbdc..4da643b562 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -1072,7 +1072,7 @@ class Util if (! empty($cfg['SQLQuery']['Edit']) && empty($GLOBALS['show_as_php']) ) { - $edit_link .= Url::getCommon($url_params) . '#querybox'; + $edit_link .= Url::getCommon($url_params); $edit_link = ' [ ' . self::linkOrButton($edit_link, __('Edit')) . ' ]'; From 311a12f9d45ce7fcdc5465929e7446dd93a26033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 22 Aug 2018 23:08:03 -0300 Subject: [PATCH 2/3] Add ChangeLog entry for #14452 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 825a45ce36..224118ca78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.8.4 (not yet released) +- issue #14452 Remove hash param in edit query URL 4.8.3 (2018-08-22) - issue #14314 Error when naming a database '0' From 8930f5965874e48b0cd025e2ba5e67a4491d7abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 22 Aug 2018 21:46:53 +0000 Subject: [PATCH 3/3] Translated using Weblate (Portuguese (Brazil)) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 100.0% (3288 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pt_BR/ Signed-off-by: Maurício Meneghini Fauth --- po/pt_BR.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index bf5b913882..409da06be0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-01-31 20:39+0000\n" -"Last-Translator: RD WebDesign \n" +"PO-Revision-Date: 2018-08-23 02:09+0000\n" +"Last-Translator: Maurício Meneghini Fauth \n" "Language-Team: Portuguese (Brazil) \n" +"phpmyadmin/4-8/pt_BR/>\n" "Language: pt_BR\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.19-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -8417,7 +8417,7 @@ msgstr "Colunas" #: libraries/classes/Navigation/Nodes/NodeColumnContainer.php:35 msgctxt "Create new column" msgid "New" -msgstr "Nova coluna" +msgstr "Nova" #: libraries/classes/Navigation/Nodes/NodeDatabase.php:41 msgid "Database operations" @@ -8430,12 +8430,12 @@ msgstr "Exibir itens ocultos" #: libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php:36 msgctxt "Create new database" msgid "New" -msgstr "Novo BD" +msgstr "Novo" #: libraries/classes/Navigation/Nodes/NodeEventContainer.php:37 msgctxt "Create new event" msgid "New" -msgstr "Novo evento" +msgstr "Novo" #: libraries/classes/Navigation/Nodes/NodeFunctionContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeFunctionContainer.php:26 @@ -8447,12 +8447,12 @@ msgstr "Funções" #: libraries/classes/Navigation/Nodes/NodeFunctionContainer.php:35 msgctxt "Create new function" msgid "New" -msgstr "Nova função" +msgstr "Nova" #: libraries/classes/Navigation/Nodes/NodeIndexContainer.php:35 msgctxt "Create new index" msgid "New" -msgstr "Novo índice" +msgstr "Novo" #: libraries/classes/Navigation/Nodes/NodeProcedure.php:30 msgid "Procedure" @@ -8469,17 +8469,17 @@ msgstr "Procedimentos" #: libraries/classes/Rte/Footer.php:37 msgctxt "Create new procedure" msgid "New" -msgstr "Nova procedure" +msgstr "Novo" #: libraries/classes/Navigation/Nodes/NodeTableContainer.php:36 msgctxt "Create new table" msgid "New" -msgstr "Nova tabela" +msgstr "Nova" #: libraries/classes/Navigation/Nodes/NodeTriggerContainer.php:37 msgctxt "Create new trigger" msgid "New" -msgstr "Novo trigger" +msgstr "Novo" #: libraries/classes/Navigation/Nodes/NodeViewContainer.php:25 #: libraries/classes/Navigation/Nodes/NodeViewContainer.php:26 @@ -8491,7 +8491,7 @@ msgstr "Views" #: libraries/classes/Navigation/Nodes/NodeViewContainer.php:36 msgctxt "Create new view" msgid "New" -msgstr "Nova view" +msgstr "Nova" #: libraries/classes/Normalization.php:176 msgid "Make all columns atomic" @@ -14708,7 +14708,7 @@ msgstr "Novo nome da coluna" #: templates/privileges/add_user_fieldset.twig:2 msgctxt "Create new user" msgid "New" -msgstr "Novo usuário" +msgstr "Novo" #: templates/display/export/options_quick_export.twig:2 #: templates/display/export/options_output.twig:2