From a4252589af19b8cf98788293034d166e326b9cd8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 26 Aug 2019 09:43:01 -0400 Subject: [PATCH 1/3] Clarification Signed-off-by: Marc Delisle --- doc/config.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index d2b44114cf..b45ee26fa2 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -3031,9 +3031,9 @@ the files. :type: string :default: ``''`` - The name of the directory where dumps can be saved. + The name of the webserver directory where exported files can be saved. - If you want different directory for each user, %u will be replaced with + If you want a different directory for each user, %u will be replaced with the username. Please note that the directory must exist and has to be writable for From c7d9f25ab3e87b321d03950d10c7de59122b13a8 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Mon, 26 Aug 2019 20:03:44 +0000 Subject: [PATCH 2/3] Translated using Weblate (Interlingua) Currently translated at 75.6% (2499 of 3304 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ia/ Signed-off-by: Giovanni Sora --- po/ia.po | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/po/ia.po b/po/ia.po index 8d9cae1b75..9c5a3592e3 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-08-23 12:26+0200\n" -"PO-Revision-Date: 2019-07-30 00:41+0000\n" +"PO-Revision-Date: 2019-08-27 21:23+0000\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua \n" "Language: ia\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 3.8-dev\n" +"X-Generator: Weblate 3.9-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -2759,12 +2759,11 @@ msgid "Failed security key activation (%s)." msgstr "Le activation de clave de securitate (%s) falleva." #: js/messages.php:755 -#, fuzzy, php-format -#| msgid "Primary key already exists." +#, php-format msgctxt "" "The table already exists in the designer and can not be added once more." msgid "Table %s already exists!" -msgstr "Clave primari ja existe." +msgstr "Tabela %s ja existe!" #: js/messages.php:756 libraries/classes/InsertEdit.php:290 #: libraries/classes/Navigation/Nodes/NodeDatabaseChild.php:54 @@ -3922,6 +3921,9 @@ msgid "" "Values for options list for default transformations. These will be " "overwritten if transformation is filled in at table structure page." msgstr "" +"Valores per le lista de optiones per le transformationes predefinite. Istes " +"esseran superscribite si le transformationes es completate in le pagina de " +"structura." #: libraries/classes/Config/Descriptions.php:199 msgid "Default transformations for Substring" @@ -11815,7 +11817,7 @@ msgstr "Max.Connexiones concurrente" #: libraries/classes/Server/Status.php:261 msgid "Failed attempts" -msgstr "" +msgstr "Tentativas fallite" #: libraries/classes/Server/Status/Advisor.php:29 msgid "Instructions" @@ -12124,7 +12126,7 @@ msgstr "Commando" #: libraries/classes/Server/Status/Processes.php:93 msgid "Progress" -msgstr "" +msgstr "Progresso" #: libraries/classes/Server/Status/Processes.php:235 #: libraries/classes/Server/Status/Variables.php:47 templates/filter.twig:2 @@ -13940,13 +13942,15 @@ msgstr "" #: server_status_processes.php:33 #, php-format msgid "Thread %s was successfully killed." -msgstr "" +msgstr "Le thread %s ha essite terminate con successo." #: server_status_processes.php:39 #, php-format msgid "" "phpMyAdmin was unable to kill thread %s. It probably has already been closed." msgstr "" +"phpMyAdmin es incapace a terminar le thread %s. Illo probabilemente ja ha " +"essite terminate." #: server_status_queries.php:43 msgid "Not enough privilege to view query statistics." From aced4e1bb41f7cff0ce42b9a56b8f547f1a74929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 28 Aug 2019 17:16:48 -0300 Subject: [PATCH 3/3] Remove fieldset close tag when setting global privs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + libraries/classes/Server/Privileges.php | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c82e8901b..12b7414675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog - issue Update jQuery Validation to v1.19.1 - issue Update jQuery to v3.4.1 - issue Update js-cookie to v2.2.1 +- issue Remove fieldset closing tag when setting global privileges 4.9.0.1 (2019-06-04) - issue #14478 phpMyAdmin no longer streams the export data diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index a7ded8c4f7..c731bdcc93 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -878,12 +878,8 @@ class Privileges ) ); - $html_output = Template::get('privileges/resource_limits') + return Template::get('privileges/resource_limits') ->render(array('limits' => $limits)); - - $html_output .= '' . "\n"; - - return $html_output; } /**