From 7dda4946ed4f0803ebb2d2ebf32175d00e8b13f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Tue, 14 Nov 2017 19:30:59 +0000 Subject: [PATCH 1/4] Translated using Weblate (Estonian) Currently translated at 100.0% (3207 of 3207 strings) [CI skip] --- po/et.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/et.po b/po/et.po index 42b2483ddf..88c2791147 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-05 08:59+0000\n" +"PO-Revision-Date: 2017-11-15 19:45+0000\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian " "\n" @@ -2060,7 +2060,7 @@ msgstr "Peida otsingu kriteerium" #: js/messages.php:484 msgid "Show search criteria" -msgstr "Näita otsingu kriteeriumi" +msgstr "Kuva otsingu kriteeriumi" #: js/messages.php:485 msgid "Range search" @@ -2088,7 +2088,7 @@ msgstr "Peida 'leia ja asenda' kriteerium" #: js/messages.php:493 msgid "Show find and replace criteria" -msgstr "Kuva 'leia ja asenda' kriteeriumi" +msgstr "Kuva 'leia ja asenda' kriteerium" #: js/messages.php:497 msgid "Each point represents a data row." From c7eeb20ebebf36e6516cf4b4281a8f7d6996377d Mon Sep 17 00:00:00 2001 From: Aled Powell Date: Thu, 16 Nov 2017 14:57:59 +0000 Subject: [PATCH 2/4] Translated using Weblate (Welsh) Currently translated at 16.2% (522 of 3207 strings) [CI skip] --- po/cy.po | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/po/cy.po b/po/cy.po index 88a2c795b0..7ef131a268 100644 --- a/po/cy.po +++ b/po/cy.po @@ -7,34 +7,29 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2015-10-15 11:04+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Welsh \n" +"PO-Revision-Date: 2017-11-16 16:13+0000\n" +"Last-Translator: Aled Powell \n" +"Language-Team: Welsh " +"\n" "Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=(n==0) ? 0 : (n==1) ? 1 : (n==2) ? 2 : " "(n==3) ? 3 :(n==6) ? 4 : 5;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.18-dev\n" #: ajax.php:16 ajax.php:33 export.php:192 schema_export.php:64 -#, fuzzy -#| msgid "Bar type" msgid "Bad type!" -msgstr "Allforio" +msgstr "Math ddrwg!" #: changelog.php:39 license.php:34 -#, fuzzy, php-format -#| msgid "" -#| "The %s file is not available on this system, please visit www.phpmyadmin." -#| "net for more information." +#, php-format msgid "" "The %s file is not available on this system, please visit %s for more " "information." msgstr "" -"Dyw'r ffeil %s ddim ar gael ar y system hon, ewch i www.phpmyadmin.net am " +"Dyw'r ffeil %s ddim ar gael ar y system hon. Ewch i www.phpmyadmin.net am " "wybodaeth bellach." #: db_central_columns.php:108 @@ -42,16 +37,13 @@ msgid "The central list of columns for the current database is empty." msgstr "" #: db_central_columns.php:133 -#, fuzzy -#| msgid "Click to select" msgid "Click to sort." -msgstr "Pwyso i ddewis" +msgstr "Clicia i drefnu." #: db_central_columns.php:150 -#, fuzzy, php-format -#| msgid "Showing rows" +#, php-format msgid "Showing rows %1$s - %2$s." -msgstr "Yn dangos rhesi" +msgstr "Yn dangos rhesi %1$s i %2$s." #: db_datadict.php:59 libraries/operations.lib.php:36 msgid "Database comment" @@ -60,10 +52,8 @@ msgstr "Sylw cronfa ddata" #: db_datadict.php:106 libraries/plugins/schema/pdf/PdfRelationSchema.php:596 #: templates/columns_definitions/column_definitions_form.phtml:89 #: templates/table/structure/display_table_stats.phtml:5 -#, fuzzy -#| msgid "Table comments" msgid "Table comments:" -msgstr "Sylwadau tabl" +msgstr "Sylwadau tabl:" #: db_datadict.php:115 libraries/Index.php:686 #: libraries/insert_edit.lib.php:1636 @@ -137,7 +127,7 @@ msgstr "Math" #: templates/table/search/zoom_result_form.phtml:34 #: templates/table/structure/table_structure_header.phtml:11 msgid "Null" -msgstr "Null" +msgstr "Nyl" #: db_datadict.php:118 libraries/central_columns.lib.php:700 #: libraries/central_columns.lib.php:1385 @@ -166,7 +156,7 @@ msgstr "Diofyn" #: libraries/plugins/schema/pdf/PdfRelationSchema.php:635 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:658 msgid "Links to" -msgstr "Cysylltu i" +msgstr "Yn cysylltu gyda" #: db_datadict.php:122 libraries/config/messages.inc.php:161 #: libraries/config/messages.inc.php:177 libraries/config/messages.inc.php:215 From 5b71117936aee84f68bdcf6b756ba93f0f5c39ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 16 Nov 2017 16:13:56 +0000 Subject: [PATCH 3/4] Translated using Weblate (Welsh) Currently translated at 16.2% (522 of 3207 strings) [CI skip] --- po/cy.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/cy.po b/po/cy.po index 7ef131a268..8eafae6f87 100644 --- a/po/cy.po +++ b/po/cy.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-16 16:13+0000\n" -"Last-Translator: Aled Powell \n" +"PO-Revision-Date: 2017-11-16 16:14+0000\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Welsh " "\n" "Language: cy\n" @@ -29,8 +29,7 @@ msgid "" "The %s file is not available on this system, please visit %s for more " "information." msgstr "" -"Dyw'r ffeil %s ddim ar gael ar y system hon. Ewch i www.phpmyadmin.net am " -"wybodaeth bellach." +"Dyw'r ffeil %s ddim ar gael ar y system hon. Ewch i %s am wybodaeth bellach." #: db_central_columns.php:108 msgid "The central list of columns for the current database is empty." From facc53668908b6aa06805566ea1f8a277c168345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sat, 18 Nov 2017 13:42:56 +0100 Subject: [PATCH 4/4] Detect another way MySQL server needs SSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13436 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/dbi/DBIMysqli.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85db37fae0..06444922de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.7.6 (not yet released) - issue #13517 Fixed check all interaction with filtering - issue #13803 Add SJIS-win to default list of allowed charsets +- issue #13436 Improve detection that MySQL server needs SSL connection 4.7.5 (2017-10-23) - issue #13615 Avoid problems with browsing unknown query types diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index 16818694bc..0c9d5ca02b 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -144,15 +144,17 @@ class DBIMysqli implements DBIExtension if ($return_value === false || is_null($return_value)) { /* - * Switch to SSL if server asked us to do so + * Switch to SSL if server asked us to do so, unfortunately + * there are more ways MySQL server can tell this: * * - MySQL 8.0 and newer should return error 3159 - * - older use #2001 - SSL Connection is required. Please specify SSL options and retry. + * - #2001 - SSL Connection is required. Please specify SSL options and retry. + * - #9002 - SSL connection is required. Please specify SSL options and retry. */ $error_number = mysqli_connect_errno(); $error_message = mysqli_connect_error(); if (! $server['ssl'] && ($error_number == 3159 || - ($error_number == 2001 && stripos($error_message, 'SSL Connection is required') !== false)) + (($error_number == 2001 || $error_number == 9002) && stripos($error_message, 'SSL Connection is required') !== false)) ) { trigger_error( _('SSL connection enforced by server, automatically enabling it.'),